]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5a6cb3d) | patch
osd/OSDMap: respect temp primary without temp acting 1319/head
authorSamuel Just <sam.just@inktank.com>
Wed, 26 Feb 2014 06:48:18 +0000 (22:48 -0800)
committerSamuel Just <sam.just@inktank.com>
Wed, 26 Feb 2014 07:09:57 +0000 (23:09 -0800)
commit1040d1b08a50f4698fa546e6e61b825121bf6247
treee8fca8002463c3ec4cd086048c82be9f0c34b552tree | snapshot
parent5a6cb3da201ce503b4aef1744c3dc15511d15a13commit | diff
osd/OSDMap: respect temp primary without temp acting

be2748c6d540891f2e1a62e7034cb44f7d04bf18 ensured that
if the temp acting mapping contains only CRUSH_ITEM_NONE,
that the acting_primary is left at -1.  However, even if
acting.empty(), we need to respect a temp_primary mapping.
Thus, use _acting_primary unless acting.empty() &&
acting_primary == -1.

Bug introduced in be2748c6d540891f2e1a62e7034cb44f7d04bf18.
Signed-off-by: Samuel Just <sam.just@inktank.com>
src/osd/OSDMap.cc diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.