Merge pull request ceph#1319 from ceph/wip-primary-temp-fix

osd/OSDMap: respect temp primary without temp acting Reviewed-by: Greg Farnum <[email protected]>
dano · Feb 26, 2014 · 82aba4b · 82aba4b
2 parents 5a6cb3d + 1040d1b
commit 82aba4b
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
@@ -1557,7 +1557,9 @@ void OSDMap::_pg_to_up_acting_osds(pg_t pg, vector<int> *up, int *up_primary,
   _get_temp_osds(*pool, pg, &_acting, &_acting_primary);
   if (_acting.empty()) {
     _acting = _up;
-    _acting_primary = _up_primary;
+    if (_acting_primary == -1) {
+      _acting_primary = _up_primary;
+    }
   }
   if (up)
     up->swap(_up);