[release-4.7]Bug 1958873: Fix disk replacement during second replacement #9083

afreen23 · 2021-05-31T12:02:20Z

This is the manual cherry-picked PR to incorporate the fix merged in the following PRs:
#8864 ---> cherry-pick commit
#8880 ---> cherry-pick commit
#9025 ---> cherry-pick commit
4.8 verified BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1957756

…ement ready" before I clicked on "start replacement" Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1957756 Added check for same node and same disk name to avoid collisions. Signed-off-by: Afreen Rahman <afrahman@redhat.com> (cherry picked from commit 266ce6f)

- key is `node` but we are fetching `nodeName`. - removed the check for metrics map since it's redundant. - updated check for the replaced device based on osd, path, deviceID, serial and node combination. Signed-off-by: Afreen Rahman <afrahman@redhat.com> (cherry picked from commit 55f1202)

openshift-ci · 2021-05-31T12:02:24Z

@afreen23: This pull request references Bugzilla bug 1957756, which is invalid:

expected the bug to target the "4.7.z" release, but it targets "4.8.0" instead
expected the bug to be in one of the following states: NEW, ASSIGNED, ON_DEV, POST, POST, but it is ON_QA instead
expected Bugzilla bug 1957756 to depend on a bug targeting a release in 4.8.0 and in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but no dependents were found

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

[release-4.7]Bug 1957756: Fix disk replacement during second replacement

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/test-infra repository.

openshift-ci · 2021-05-31T12:03:41Z

@afreen23: This pull request references Bugzilla bug 1958873, which is invalid:

expected dependent Bugzilla bug 1957756 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is ON_QA instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

[release-4.7]Bug 1958873: Fix disk replacement during second replacement

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/test-infra repository.

The PR 8880 added checking for a replaced disk in the list page but we missed out adding in disk replacemnet modal as well. When more templates are present for same disk then disk name cant be used, hence removed disk name usage in replacementMap (cherry picked from commit c1d4d0e)

afreen23 · 2021-05-31T13:59:55Z

/bugzilla refresh

openshift-ci · 2021-05-31T14:00:06Z

@afreen23: This pull request references Bugzilla bug 1958873, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

6 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.7.z) matches configured target release for branch (4.7.z)
bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
dependent bug Bugzilla bug 1957756 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE))
dependent Bugzilla bug 1957756 targets the "4.8.0" release, which is one of the valid target releases: 4.8.0
bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Bugzilla (ratamir@redhat.com), skipping review request.

In response to this:

/bugzilla refresh

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/test-infra repository.

openshift-ci · 2021-05-31T14:06:58Z

@afreen23: This pull request references Bugzilla bug 1958873, which is valid.

6 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.7.z) matches configured target release for branch (4.7.z)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
dependent bug Bugzilla bug 1957756 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE))
dependent Bugzilla bug 1957756 targets the "4.8.0" release, which is one of the valid target releases: 4.8.0
bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Bugzilla (ratamir@redhat.com), skipping review request.

In response to this:

[release-4.7]Bug 1958873: Fix disk replacement during second replacement

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/test-infra repository.

afreen23 · 2021-05-31T14:07:48Z

Tested on 4.7 OCS and it is working fine.

openshift-ci · 2021-05-31T14:08:41Z

@afreen23: This pull request references Bugzilla bug 1958873, which is valid.

6 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.7.z) matches configured target release for branch (4.7.z)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
dependent bug Bugzilla bug 1957756 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE))
dependent Bugzilla bug 1957756 targets the "4.8.0" release, which is one of the valid target releases: 4.8.0
bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Bugzilla (ratamir@redhat.com), skipping review request.

In response to this:

[release-4.7]Bug 1958873: Fix disk replacement during second replacement

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/test-infra repository.

openshift-ci · 2021-05-31T14:13:32Z

@afreen23: This pull request references Bugzilla bug 1958873, which is valid.

6 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.7.z) matches configured target release for branch (4.7.z)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
dependent bug Bugzilla bug 1957756 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE))
dependent Bugzilla bug 1957756 targets the "4.8.0" release, which is one of the valid target releases: 4.8.0
bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Bugzilla (ratamir@redhat.com), skipping review request.

In response to this:

[release-4.7]Bug 1958873: Fix disk replacement during second replacement

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/test-infra repository.

openshift-ci · 2021-05-31T14:14:18Z

@afreen23: This pull request references Bugzilla bug 1958873, which is valid.

6 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.7.z) matches configured target release for branch (4.7.z)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
dependent bug Bugzilla bug 1957756 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE))
dependent Bugzilla bug 1957756 targets the "4.8.0" release, which is one of the valid target releases: 4.8.0
bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Bugzilla (ratamir@redhat.com), skipping review request.

In response to this:

[release-4.7]Bug 1958873: Fix disk replacement during second replacement

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/test-infra repository.

afreen23 · 2021-05-31T16:51:12Z

/test e2e-gcp-console
ceph tests failing due to #9073

GowthamShanmugam · 2021-05-31T17:43:30Z

/lgtm

openshift-ci · 2021-05-31T17:43:44Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: afreen23, GowthamShanmugam

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

The pull request process is described here

Needs approval from an approver in each of these files:

~~frontend/packages/ceph-storage-plugin/OWNERS~~ [afreen23]

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

openshift-bot · 2021-05-31T17:55:33Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-05-31T18:08:33Z

/retest

Please review the full test history for this PR and help us cut down flakes.

afreen23 · 2021-06-03T21:50:49Z

/hold cancel
/test ceph-storage-plugin
/test e2e-gcp-console

afreen23 · 2021-06-04T07:02:00Z

/test e2e-gcp-console

afreen23 · 2021-06-04T10:02:37Z

/test e2e-gcp-console

afreen23 · 2021-06-04T11:23:35Z

/retest

afreen23 · 2021-06-04T16:54:43Z

/retest

openshift-bot · 2021-06-04T17:18:26Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-06-04T18:48:10Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-06-04T19:00:09Z

/retest

Please review the full test history for this PR and help us cut down flakes.

afreen23 · 2021-06-05T09:56:49Z

/test e2e-gcp-console

openshift-bot · 2021-06-05T10:21:07Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-06-05T12:58:08Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-06-05T14:10:09Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-06-05T15:11:08Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-06-05T15:59:08Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-06-05T16:11:08Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-06-05T16:23:08Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-06-05T16:59:08Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-06-05T17:11:07Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-06-05T19:23:07Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-06-05T19:47:08Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-06-05T21:23:07Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-06-06T00:35:08Z

/retest

Please review the full test history for this PR and help us cut down flakes.

afreen23 · 2021-06-06T18:15:12Z

/test e2e-gcp-console

afreen23 · 2021-06-07T05:37:26Z

/test e2e-gcp-console

openshift-ci · 2021-06-07T09:44:48Z

@afreen23: All pull requests linked via external trackers have merged:

openshift/console#9083

Bugzilla bug 1958873 has been moved to the MODIFIED state.

In response to this:

[release-4.7]Bug 1958873: Fix disk replacement during second replacement

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/test-infra repository.

afreen23 · 2021-06-07T10:32:54Z

/cherrypick release-4.6

openshift-cherrypick-robot · 2021-06-07T10:33:47Z

@afreen23: #9083 failed to apply on top of branch "release-4.6":

Applying: Bug 1957756 - Device Replacemet UI, The status of the disk is "replacement ready" before I clicked on "start replacement"
Using index info to reconstruct a base tree...
M	frontend/packages/ceph-storage-plugin/src/components/attached-devices-mode/lso-disk-inventory/disk-replacement-modal.tsx
M	frontend/packages/ceph-storage-plugin/src/components/attached-devices-mode/lso-disk-inventory/ocs-disks-list.tsx
M	frontend/packages/ceph-storage-plugin/src/components/attached-devices-mode/lso-disk-inventory/ocs-kebab-options.tsx
Falling back to patching base and 3-way merge...
Auto-merging frontend/packages/ceph-storage-plugin/src/components/attached-devices-mode/lso-disk-inventory/ocs-kebab-options.tsx
CONFLICT (content): Merge conflict in frontend/packages/ceph-storage-plugin/src/components/attached-devices-mode/lso-disk-inventory/ocs-kebab-options.tsx
Auto-merging frontend/packages/ceph-storage-plugin/src/components/attached-devices-mode/lso-disk-inventory/ocs-disks-list.tsx
CONFLICT (content): Merge conflict in frontend/packages/ceph-storage-plugin/src/components/attached-devices-mode/lso-disk-inventory/ocs-disks-list.tsx
Auto-merging frontend/packages/ceph-storage-plugin/src/components/attached-devices-mode/lso-disk-inventory/disk-replacement-modal.tsx
CONFLICT (content): Merge conflict in frontend/packages/ceph-storage-plugin/src/components/attached-devices-mode/lso-disk-inventory/disk-replacement-modal.tsx
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bug 1957756 - Device Replacemet UI, The status of the disk is "replacement ready" before I clicked on "start replacement"
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-4.6

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/test-infra repository.

Afreen Rahman added 2 commits May 30, 2021 18:05

openshift-ci bot added bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels May 31, 2021

openshift-ci bot requested review from bipuladh and cloudbehl May 31, 2021 12:02

openshift-ci bot added component/ceph Related to ceph-storage-plugin approved Indicates a PR has been approved by an approver from all required OWNERS files. labels May 31, 2021

afreen23 changed the title ~~[release-4.7]Bug 1957756: Fix disk replacement during second replacement~~ [release-4.7]Bug 1958873: Fix disk replacement during second replacement May 31, 2021

afreen23 force-pushed the release-4.7 branch from 7c77210 to b4da6c8 Compare May 31, 2021 13:35

openshift-ci bot added the kind/i18n Indicates issue or PR relates to internationalization or has content that needs to be translated label May 31, 2021

openshift-ci bot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels May 31, 2021

openshift-ci bot assigned GowthamShanmugam May 31, 2021

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 31, 2021

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 3, 2021

openshift-merge-robot merged commit c353865 into openshift:release-4.7 Jun 7, 2021

spadgett added this to the v4.7.z milestone Jun 8, 2021

[release-4.7]Bug 1958873: Fix disk replacement during second replacement #9083

[release-4.7]Bug 1958873: Fix disk replacement during second replacement #9083

Conversation

afreen23 commented May 31, 2021 • edited

openshift-ci bot commented May 31, 2021

openshift-ci bot commented May 31, 2021

afreen23 commented May 31, 2021

openshift-ci bot commented May 31, 2021

openshift-ci bot commented May 31, 2021

afreen23 commented May 31, 2021

openshift-ci bot commented May 31, 2021

openshift-ci bot commented May 31, 2021

openshift-ci bot commented May 31, 2021

afreen23 commented May 31, 2021

GowthamShanmugam commented May 31, 2021

openshift-ci bot commented May 31, 2021

openshift-bot commented May 31, 2021

openshift-bot commented May 31, 2021

afreen23 commented Jun 3, 2021

afreen23 commented Jun 4, 2021

afreen23 commented Jun 4, 2021

afreen23 commented Jun 4, 2021

afreen23 commented Jun 4, 2021

openshift-bot commented Jun 4, 2021

openshift-bot commented Jun 4, 2021

openshift-bot commented Jun 4, 2021

afreen23 commented Jun 5, 2021

openshift-bot commented Jun 5, 2021

openshift-bot commented Jun 5, 2021

openshift-bot commented Jun 5, 2021

openshift-bot commented Jun 5, 2021

openshift-bot commented Jun 5, 2021

openshift-bot commented Jun 5, 2021

openshift-bot commented Jun 5, 2021

openshift-bot commented Jun 5, 2021

openshift-bot commented Jun 5, 2021

openshift-bot commented Jun 5, 2021

openshift-bot commented Jun 5, 2021

openshift-bot commented Jun 5, 2021

openshift-bot commented Jun 6, 2021

afreen23 commented Jun 6, 2021

afreen23 commented Jun 7, 2021

openshift-ci bot commented Jun 7, 2021

afreen23 commented Jun 7, 2021

openshift-cherrypick-robot commented Jun 7, 2021

afreen23 commented May 31, 2021 •

edited