osd: load_pgs: we need to handle the case where an upgrade from earlier versions which ignored non-existent pgs resurrects a pg with a prehistoric osdmap #4556
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Prior to giant, we would skip pgs in load_pgs which were not present in the current osdmap. Those pgs would eventually refer to very old osdmaps, which we no longer have causing the assertion failure in 11429 once the osd is finally upgraded to a version which does not skip the pgs. Instead, if we do not have the map for the pg epoch, complain to the osd log and skip the pg. Fixes: 11429 Signed-off-by: Samuel Just <sjust@redhat.com> (cherry picked from commit fbfd50d) Conflicts: src/osd/OSD.cc resolved by add a new comment line
$ commit=6bb24c4 ; picked_from=$(git show --no-patch --pretty=%b $commit | perl -ne 'print if(s/.*cherry picked from commit (\w+).*/$1/)') ; diff -u --ignore-matching-lines '^[^+-]' <(git show $picked_from) <(git show $commit)
--- /dev/fd/63 2015-05-12 23:44:17.785047014 +0200
+++ /dev/fd/62 2015-05-12 23:44:17.785047014 +0200
@@ -45,6 +50,7 @@
+ } else {
+ pg = _open_lock_pg(osdmap, pgid);
+ }
- // there can be no waiters here, so we don't call wake_pg_waiters
++ // there can be no waiters here, so we don't call wake_pg_waiters
// read pg state, log
+ pg->read_state(store, bl);
|
|
@xinxinsh could you update the conflict resolution with the diff above ? It's simpler than explaining and less error prone :-) |
xinxinsh
force-pushed
the
wip-11429-firefly
branch
from
6bb24c4
to
019b28b
Compare
|
updated 2015-05-13 5:50 GMT+08:00 Loic Dachary notifications@github.com:
|
|
@athanatos does this backport look good to merge ? It passed a run of the firefly rados suite ( see http://tracker.ceph.com/issues/11090#rados for details ) including 11429.yaml at ceph/ceph-qa-suite#435 |
ghost
pushed a commit
that referenced
this pull request
May 15, 2015
OSD::load_pgs: we need to handle the case where an upgrade from earlier versions which ignored non-existent pgs resurrects a pg with a prehistoric osdmap Reviewed-by: Samuel Just <sjust@redhat.com>
ghost
merged commit 
ghost
changed the title
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
http://tracker.ceph.com/issues/11429