[release-4.22] OCPBUGS-89322: cluster-restore.sh: move extra /var/lib/etcd files to backup#1632
Conversation
When cluster-restore.sh runs the restore-pod path, it moves member/ and revision.json to /var/lib/etcd-backup, deletes etcd_perf*, then exits if anything remains in /var/lib/etcd. Extra files (perf artifacts, stray snapshots, etc.) cause DR restore to fail before the restore pod starts. Add backup_remaining_etcd_data_dir_contents() to move all remaining top-level entries to /var/lib/etcd-backup instead of failing. Fixes: ETCD-704 Related: https://access.redhat.com/solutions/6958920
Move leftover /var/lib/etcd entries to extra-data-dir-contents/ so staged snapshot.db, revision.json, and member/ are not overwritten. Co-authored-by: Cursor <cursoragent@cursor.com>
…ing_etcd_data_dir_contents via etcd-common-tools per review feedback. Behavior unchanged.
…ll backup_remaining_etcd_data_dir_contents before rm -rf so leftover files are moved to extra-data-dir-contents/ instead of deleted.
|
@openshift-cherrypick-robot: Ignoring requests to cherry-pick non-bug issues: ETCD-704 DetailsIn response to this:
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. |
|
/cherry-pick release-4.21 |
|
@apurvanisal5: once the present PR merges, I will cherry-pick it on top of DetailsIn response to this:
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. |
|
/jira refresh |
openshift-ci-robot
added
the
jira/valid-reference
|
@apurvanisal5: This pull request references ETCD-704 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target either version "4.22." or "openshift-4.22.", but it targets "openshift-5.0" instead. DetailsIn response to this:
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. |
|
/verified by @apurvanisal5 |
openshift-ci-robot
added
the
verified
|
@apurvanisal5: This PR has been marked as verified by DetailsIn response to this:
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. |
|
🤖 Automated labeling by agent on behalf of @tjungblu This is an automated bot PR. Adding required Tide labels: /approve This action was performed by an automated agent. If this is incorrect, please review and adjust manually. |
openshift-ci
Bot
added
the
backport-risk-assessed
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: tjungblu The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
Bot
added
the
approved
|
/lgtm |
|
@openshift-cherrypick-robot: The following tests failed, say
Full PR test history. Your PR dashboard. DetailsInstructions 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. |
|
/retitle [release-4.22] OCPBUGS-89322: cluster-restore.sh: move extra /var/lib/etcd files to backup |
openshift-ci
Bot
changed the title
|
@apurvanisal5: This pull request references ETCD-704 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target either version "4.22." or "openshift-4.22.", but it targets "openshift-5.0" instead. DetailsIn response to this:
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-robot
added
the
jira/invalid-bug
|
@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-89322, which is invalid:
Comment The bug has been updated to refer to the pull request using the external bug tracker. DetailsIn response to this:
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. |
|
/jira refresh |
|
@apurvanisal5: This pull request references Jira Issue OCPBUGS-89322, which is invalid:
Comment DetailsIn response to this:
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. |
4 participants
This is an automated cherry-pick of #1628
/assign apurvanisal5