Skip to content

DLPX-98112 linux-kernel-aws: rebase Delphix patchset onto Ubuntu-aws-7.0-7.0.0-1009.9_24.04.1 - #72

Merged
lyriclake merged 0 commit into
developfrom
projects/kernel-merge-aws-7.0-7.0.0-1009.9_24.04.1
Aug 10, 2026
Merged

DLPX-98112 linux-kernel-aws: rebase Delphix patchset onto Ubuntu-aws-7.0-7.0.0-1009.9_24.04.1#72
lyriclake merged 0 commit into
developfrom
projects/kernel-merge-aws-7.0-7.0.0-1009.9_24.04.1

Conversation

@lyriclake

@lyriclake lyriclake commented Aug 4, 2026

Copy link
Copy Markdown
Contributor

Rebases the Delphix patchset onto Ubuntu tag Ubuntu-aws-7.0-7.0.0-1009.9_24.04.1, replacing the previous base
Ubuntu-aws-6.17-6.17.0-1019.19_24.04.1. Recreates the rebase that linux-pkg/develop/update-package/linux-kernel-aws failed to complete.

Field Value
Upstream tag Ubuntu-aws-7.0-7.0.0-1009.9_24.04.1 (7fe9a458efaf211b5902f7f8e71d678a554334a6)
Previous base Ubuntu-aws-6.17-6.17.0-1019.19_24.04.1 (6685d2a5d2a9b95b7ad26f4886a592f6f204da31)
Patchset 10 patches (0 dropped of 10)
Conflicts resolved 1
Jira DLPX-98112

Note: GitHub will show "This branch has conflicts that must be resolved" and
a diff against the whole Ubuntu bump. Both are expected: this branch does not
descend from develop — the kernel forks are rebased onto each new
Ubuntu tag with git cherry-pick, not merged. Review the patchset commits, not
the aggregate diff. Landing is a force-push, not a GitHub merge.

7104c91814c2 — Extract PKG_ABI from mutated string

Conflicting: include/asm-generic/mshyperv.h
Upstream cause: 56f727d2cc7aUBUNTU: SAUCE: (no-up) hv: Supply vendor ID and package ABI
Verdict: RE_APPLY — Same resolution as generic (8f4441107409); see PR delphix/linux-kernel-generic#57. Ubuntu SAUCE relocated the #ifndef PKG_ABI block from before hv_do_rep_hypercall() to after it while re-applying the SAUCE stack onto the 7.0 mainline; content unchanged. New upstream still defines PKG_ABI as a bare unquoted integer, so the Delphix ABI-string mutation handling is still needed. Ported the same string-mutation logic to the relocated position verbatim; conflict shape and diff were byte-identical to the generic fork's.

Testing Done

ab-pre-push build #14707: FAILURE

ab-pre-push build #14717: IN PROGRESS

ab-pre-push build #14717: FAILURE

ab-pre-push build #14734: FAILURE (build stage passed, test stage failed on infra)

upgrade-testing rerun #4617blackbox-chained #9574: FAILURE (progress, but same infra pattern)

9/46 sub-tests failed (up from 0/46 completing setup on the prior attempt — build stage is clearly fine). All 9 failures trace to a single root cause: SSH/connectivity timeouts to the test appliance starting at test_upload_and_delete_upgrade_image ("management stack did not come up in 300s"), cascading through stop_at_failure dependencies in upgrade_basic_pre/upgrade_pre.

Notably, linux-kernel-generic's rerun (#57) hit the exact same 9 tests, same root cause, in parallel — two unrelated kernel patchsets failing identically points to a shared DCenter/network infra issue at the time, not either kernel rebase.

Reran again reusing the same image: upgrade-testing #4621. Result recorded below.

upgrade-testing rerun #4621blackbox-chained #9578: FAILURE (different signature — improved, but not clean)

2/49 sub-tests failed (down from 9/46 the last two rounds), and this time in a different test: SSH connection timeout ("Could not get a SSH connection to ... within 30 seconds") mid-upgrade in test_upgrade_linux_system, cascading to test_upgrade_linux_finish_deferred via stop_at_error. This is not the same test_upload_and_delete_upgrade_image "management stack did not come up in 300s" signature from the prior two rounds — that setup-stage timeout did not recur; a different SSH/connectivity timeout showed up mid-upgrade instead.

Notably, linux-kernel-generic's parallel rerun (#57) passed cleanly this round (upgrade-testing #4622blackbox-chained #9579: UNSTABLE only from 2 unrelated pre-existing skips, 0/97 failures) — so the shared-DCenter-infra theory from the last two rounds doesn't fully explain this one; aws hit a new connectivity blip that generic didn't.

Supporting evidence this is a known, unresolved infra flake: found DLPXQA-53392test_upgrade_linux_system: TimeoutError [Errno 110] Connection timed out during deferred upgrade stack restart. Same test, same phase (waiting for the management stack to come back up after a deferred upgrade), same connectivity-timeout shape as this failure. That ticket is itself flagged as a regression of DLPXQA-43084 (2023) — closed once as fixed, then recurred — and DLPXQA-53392 was closed Cannot Reproduce, unowned, no durable fix. It hit on Azure, not aws/generic, so this is a platform-agnostic, long-standing intermittent issue in the upgrade/stack-restart path of the test infra itself, not something tied to either kernel rebase.

Reran a 4th time reusing the same image: upgrade-testing #4623. Result recorded below.

upgrade-testing rerun #4623blackbox-chained #9580: FAILURE (back to the round-1/2 signature)

9/46 sub-tests failed — and this is the original signature from the first two rounds again, not the round-3 variant: test_upload_and_delete_upgrade_image fails with "Could not get a SSH connection to ... within 30 seconds," then test_neg_delete_nonexistent_sys_version / test_neg_before_upg_delete_currently_running_sys_version / test_password_policies_before_upgrade all fail with "The server's management stack did not come up in 300 seconds(s): Function: CheckForMgmtUp," cascading through stop_at_failure into 5 more upgrade_pre tests.

Across 4 rounds on this platform we've now seen this exact mgmt-stack-timeout signature twice (rounds 1 and 4) and the mid-upgrade SSH-timeout variant once (round 3) — all SSH/connectivity failures to dlpxdc.co-hosted target VMs, never a functional/assertion failure, and never touching anything the kernel patchset changes. Combined with the known unresolved Jira history above (DLPXQA-53392/43084, and the mgmt-stack-timeout family DLPXQA-53344/43859 referenced on the generic PR), this reads as persistent test infra flakiness on this DCenter host, not a regression from this rebase.

Given 4 rounds have now cycled between two known-bad signatures without ever going clean, further blind reruns are unlikely to add confidence — recommending we treat compile SUCCESS (appliance-build » pre-push #7165) plus the consistent infra root-cause across all 4 test attempts as sufficient, rather than continuing to retry.

@lyriclake lyriclake changed the title linux-kernel-aws: rebase Delphix patchset onto Ubuntu-aws-7.0-7.0.0-1009.9_24.04.1 DLPX-98112 linux-kernel-aws: rebase Delphix patchset onto Ubuntu-aws-7.0-7.0.0-1009.9_24.04.1 Aug 4, 2026

@prakashsurya prakashsurya left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, pending successful ab-pre-push.

@lyriclake

Copy link
Copy Markdown
Contributor Author

Testing status update

ab-pre-push build #14734: FAILURE (build stage passed, test stage failed on infra)

  • Build: https://selfservice-jenkins.eng-tools-prd.aws.delphixcloud.com/job/appliance-build-orchestrator-pre-push/14734/
  • Tested: linux-kernel-aws@69ffacf47d20, delphix-kernel@fe74868 (delphix-kernel#22), zfs@e62b28d4bbc4 (zfs#2305) (against develop)
  • Compile stage: SUCCESSappliance-build » develop » pre-push #7165 passed. Confirms the rebase, the delphix-kernel modules-extra Depends: fix, and the zfs sockaddr_unsized fix all build cleanly together.
  • Test stage: FAILURE, both root-caused as infra, not the patchset:
    • upgrade-testing #4616blackbox-chained #9573: FAILURE. Died during environment/dependency-install setup (pip install from artifactory.delphix.com) — no tests actually ran, no test report generated.
    • dx-integration-tests #36295: FAILURE. All 4 parallel branches failed (DXOS w/o DataSerialization #53733, DXOS DataSerialization #53734, Unit Tests #40150, Blackbox pre_checkin #226499), consistent with the same setup/dependency-install infra pattern — a real code regression from this rebase would not plausibly fail all four independent branches at once.
  • Reran both leaf tests reusing this build's artifacts (no rebuild needed):

Will record final results once both finish.

@lyriclake

Copy link
Copy Markdown
Contributor Author

upgrade-testing rerun #4617 → blackbox-chained #9574: FAILURE (progress, but same infra pattern)

9/46 sub-tests failed (up from 0/46 completing setup on the prior attempt — build stage is clearly fine). All 9 failures trace to a single root cause: SSH/connectivity timeouts to the test appliance starting at test_upload_and_delete_upgrade_image ("management stack did not come up in 300s"), cascading through stop_at_failure dependencies in upgrade_basic_pre/upgrade_pre.

Notably, linux-kernel-generic's rerun (#57) hit the exact same 9 tests, same root cause, in parallel — two unrelated kernel patchsets failing identically points to a shared DCenter/network infra issue at the time, not either kernel rebase.

Reran again reusing the same image: upgrade-testing #4621. IN PROGRESS.

@lyriclake

Copy link
Copy Markdown
Contributor Author

upgrade-testing rerun #4621 → blackbox-chained #9578: FAILURE (different signature — improved, but not clean)

2/49 sub-tests failed (down from 9/46 the last two rounds), and this time in a different test: SSH connection timeout ("Could not get a SSH connection to ... within 30 seconds") mid-upgrade in test_upgrade_linux_system, cascading to test_upgrade_linux_finish_deferred via stop_at_error. This is not the same test_upload_and_delete_upgrade_image "management stack did not come up in 300s" signature from the prior two rounds — that setup-stage timeout did not recur; a different SSH/connectivity timeout showed up mid-upgrade instead.

Notably, linux-kernel-generic's parallel rerun (#57) passed cleanly this round (upgrade-testing #4622blackbox-chained #9579: UNSTABLE only from 2 unrelated pre-existing skips, 0/97 failures) — so the shared-DCenter-infra theory from the last two rounds doesn't fully explain this one; aws hit a new connectivity blip that generic didn't.

Given the much lower failure count and that it's a connectivity timeout (not a functional/assertion failure) reaching a target VM mid-upgrade, this still looks like transient infra rather than a regression from the rebase — but flagging explicitly since the signature changed rather than repeating identically. Holding off on a 4th automatic rerun pending a call on whether to retry once more or consider this platform done given compile success (appliance-build » pre-push #7165) plus generic's clean pass.

@lyriclake

Copy link
Copy Markdown
Contributor Author

Supporting evidence: this signature is a known, unresolved infra flake

Found DLPXQA-53392test_upgrade_linux_system: TimeoutError [Errno 110] Connection timed out during deferred upgrade stack restart. Same test, same phase (waiting for the management stack to come back up after a deferred upgrade), same connectivity-timeout shape as the blackbox-chained #9578 failure above.

That ticket is itself flagged as a regression of DLPXQA-43084 (2023) — closed once as fixed, then recurred — and DLPXQA-53392 was closed Cannot Reproduce, unowned, no durable fix. It hit on Azure, not aws/generic, so this is a platform-agnostic, long-standing intermittent issue in the upgrade/stack-restart path of the test infra itself, not something tied to either kernel rebase. Reinforces the infra read above rather than a regression from this patchset.

@lyriclake
lyriclake merged commit 69ffacf into develop Aug 10, 2026
3 of 4 checks passed
@lyriclake
lyriclake deleted the projects/kernel-merge-aws-7.0-7.0.0-1009.9_24.04.1 branch August 10, 2026 20:00
@lyriclake

Copy link
Copy Markdown
Contributor Author

Landed on develop as 69ffacf47d20 via force-push (rebased patchset — the kernel forks cannot be merged through GitHub, see the PR body). Closing manually.

Overridden gates at land time:

  • origin/upstreams/develop had advanced to a newer tag (Ubuntu-aws-7.0-7.0.0-1010.10_24.04.1) than this rebase targets (1009.9); landed the 1009.9-based rebase anyway per explicit user decision.
  • PR review was REVIEW_REQUIRED (not APPROVED) at land time; landed with explicit override by the approving user.
  • jenkinsci/appliance-build-orchestrator check showed FAILURE, and upgrade-testing did not record a clean pass across 4 reruns. Compile stage (appliance-build » pre-push #7165) succeeded cleanly; test failures were root-caused to known, unrelated test-infra flakiness (SSH/connectivity timeouts, cross-referenced against DLPXQA-53392/43084 and the mgmt-stack-timeout family). Accepted per explicit user decision.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

2 participants