Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nautilus: mgr/DaemonServer: fix pg merge checks #34354

Merged
merged 1 commit into from Apr 8, 2020

Conversation

smithfarm
Copy link
Contributor

backport tracker: https://tracker.ceph.com/issues/44711


backport of #34067
parent tracker: https://tracker.ceph.com/issues/44684

this backport was staged using ceph-backport.sh version 15.1.1.389
find the latest version at https://github.com/ceph/ceph/blob/master/src/script/ceph-backport.sh

Add an explicit check that the PG acting for the source and target
match before merging.

Fixes: https://tracker.ceph.com/issues/44684
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 1700d18)
@smithfarm smithfarm added this to the nautilus milestone Apr 1, 2020
@smithfarm smithfarm added the core label Apr 1, 2020
@smithfarm
Copy link
Contributor Author

166/168 Test #127: mgr-dashboard-frontend-unittests ........***Failed  875.90 sec

@smithfarm
Copy link
Contributor Author

jenkins test make check

@smithfarm smithfarm added the nautilus-batch-1 nautilus point releases label Apr 2, 2020
@yuriw
Copy link
Contributor

yuriw commented Apr 3, 2020

@yuriw yuriw merged commit 8affdb4 into ceph:nautilus Apr 8, 2020
@smithfarm smithfarm deleted the wip-44711-nautilus branch April 9, 2020 09:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants