Skip to content

OADP-7061: [oadp-1.5] DM controller refactor for cancel (cherry-pick #8952) - #565

Open
kaovilai wants to merge 1 commit into
openshift:oadp-1.5from
kaovilai:cherry-pick-8952-to-oadp-1.5
Open

OADP-7061: [oadp-1.5] DM controller refactor for cancel (cherry-pick #8952)#565
kaovilai wants to merge 1 commit into
openshift:oadp-1.5from
kaovilai:cherry-pick-8952-to-oadp-1.5

Conversation

@kaovilai

@kaovilai kaovilai commented Aug 27, 2026

Copy link
Copy Markdown
Member

Cherry-pick of velero-io#8952 to oadp-1.5, via cherry-pick of the resolved backport velero-io#10423.

Fixes velero-io#8534: node-agent pod restart no longer cancels all in-flight DataUploads/DataDownloads across all nodes — the DM controllers are refactored to tolerate cancel requests in more cases (node restart, node drain).

Fixes OADP-7061

Merge conflicts in pkg/controller/data_download_controller.go, data_download_controller_test.go, and data_upload_controller.go resolved by adopting upstream's if/else form (the OADP branch had cosmetically refactored those into switch/case; functionally identical) to minimize future rebase drift. Verified: go build ./pkg/... clean, go test ./pkg/controller/... -run 'DataUpload|DataDownload' passes.

Note

Responses generated with Claude

…or-for-cancel

DM controller refactor for cancel

(cherry picked from commit 7db3eea)
Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>
(cherry picked from commit f8986a7)
@coderabbitai

coderabbitai Bot commented Aug 27, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: 75233757-ceb2-4181-8e15-341c322ccef9

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

Comment @coderabbitai help to get the list of available commands.

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 27, 2026
@openshift-ci

openshift-ci Bot commented Aug 27, 2026

Copy link
Copy Markdown

@kaovilai: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@kaovilai kaovilai changed the title [oadp-1.5] DM controller refactor for cancel (cherry-pick #8952) OADP-7953: [oadp-1.5] DM controller refactor for cancel (cherry-pick #8952) Aug 27, 2026
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Aug 27, 2026
@openshift-ci-robot

openshift-ci-robot commented Aug 27, 2026

Copy link
Copy Markdown

@kaovilai: This pull request references OADP-7953 which is a valid jira issue.

Details

In response to this:

Cherry-pick of velero-io#8952 to oadp-1.5, via cherry-pick of the resolved backport velero-io#10423.

Fixes velero-io#8534: node-agent pod restart no longer cancels all in-flight DataUploads/DataDownloads across all nodes — the DM controllers are refactored to tolerate cancel requests in more cases (node restart, node drain).

Fixes OADP-7953

Merge conflicts in pkg/controller/data_download_controller.go, data_download_controller_test.go, and data_upload_controller.go resolved by adopting upstream's if/else form (the OADP branch had cosmetically refactored those into switch/case; functionally identical) to minimize future rebase drift. Verified: go build ./pkg/... clean, go test ./pkg/controller/... -run 'DataUpload|DataDownload' passes.

[!Note]
Responses generated with Claude

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@kaovilai kaovilai changed the title OADP-7953: [oadp-1.5] DM controller refactor for cancel (cherry-pick #8952) OADP-7061: [oadp-1.5] DM controller refactor for cancel (cherry-pick #8952) Aug 27, 2026
@openshift-ci-robot

openshift-ci-robot commented Aug 27, 2026

Copy link
Copy Markdown

@kaovilai: This pull request references OADP-7061 which is a valid jira issue.

Details

In response to this:

Cherry-pick of velero-io#8952 to oadp-1.5, via cherry-pick of the resolved backport velero-io#10423.

Fixes velero-io#8534: node-agent pod restart no longer cancels all in-flight DataUploads/DataDownloads across all nodes — the DM controllers are refactored to tolerate cancel requests in more cases (node restart, node drain).

Fixes OADP-7061

Merge conflicts in pkg/controller/data_download_controller.go, data_download_controller_test.go, and data_upload_controller.go resolved by adopting upstream's if/else form (the OADP branch had cosmetically refactored those into switch/case; functionally identical) to minimize future rebase drift. Verified: go build ./pkg/... clean, go test ./pkg/controller/... -run 'DataUpload|DataDownload' passes.

[!Note]
Responses generated with Claude

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci

openshift-ci Bot commented Sep 1, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kaovilai, sseago

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@weshayutin

Copy link
Copy Markdown

/hold

@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 4, 2026
@weshayutin

Copy link
Copy Markdown

/hold in case a customer hits the issue

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

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants