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

mon/OSDMonitor: tolerate upgrade from post-kraken dev cluster #14442

Merged
merged 1 commit into from Apr 23, 2017

Conversation

Projects
None yet
5 participants
@liewegas
Copy link
Member

liewegas commented Apr 10, 2017

If the 'creating' pgs key is missing, move on without crashing.

Signed-off-by: Sage Weil sage@redhat.com

@liewegas liewegas added the mon label Apr 10, 2017

@liewegas liewegas requested a review from tchaikov Apr 10, 2017

@liewegas

This comment has been minimized.

Copy link
Member Author

liewegas commented Apr 10, 2017

@tchaikov this affects my test cluster

std::lock_guard<std::mutex> l(creating_pgs_lock);
creating_pgs.decode(p);
dout(7) << __func__ << " loading creating_pgs e" << creating_pgs.last_scan_epoch << dendl;
if (bl.length()) {

This comment has been minimized.

Copy link
@tchaikov

tchaikov Apr 11, 2017

Contributor

or we can compare the return code of get() with -ENOENT.

@yuriw

This comment has been minimized.

Copy link
Contributor

yuriw commented Apr 17, 2017

test this please

@jdurgin

This comment has been minimized.

Copy link
Member

jdurgin commented Apr 17, 2017

github's web ui conflict resolver made a merge commit - should be resolved manually

mon/OSDMonitor: tolerate upgrade from post-kraken dev cluster
If the 'creating' pgs key is missing, move on without crashing.

Signed-off-by: Sage Weil <sage@redhat.com>

@liewegas liewegas force-pushed the liewegas:wip-midkraken-upgrade branch from 651a808 to 32b1b04 Apr 17, 2017

@liewegas

This comment has been minimized.

Copy link
Member Author

liewegas commented Apr 17, 2017

rebased

@liewegas liewegas merged commit 0d368d2 into ceph:master Apr 23, 2017

2 of 3 checks passed

default Build finished.
Details
Signed-off-by all commits in this PR are signed
Details
Unmodifed Submodules submodules for project are unmodified
Details
@liewegas

This comment has been minimized.

@liewegas liewegas deleted the liewegas:wip-midkraken-upgrade branch Apr 23, 2017

@theanalyst theanalyst referenced this pull request Apr 25, 2017

Merged

Wip v12.0.2 #103

@smithfarm

This comment has been minimized.

Copy link
Contributor

smithfarm commented Apr 25, 2017

@liewegas

This comment has been minimized.

Copy link
Member Author

liewegas commented Apr 25, 2017

yeah

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.