]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
PG: update same_acting_since when acting or up changes
authorJosh Durgin <josh.durgin@dreamhost.com>
Wed, 18 May 2011 00:36:39 +0000 (17:36 -0700)
committerSage Weil <sage.weil@dreamhost.com>
Wed, 18 May 2011 00:30:02 +0000 (17:30 -0700)
This is a hack since we currently use same_up_since to denote the beginning of an interval.
We should probably change this usaged or rename it to same_interval since.

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
src/osd/PG.cc

index f568c8741998c8898341a7f64f1ee1b227623964..8e5b5f4c8f4d6b9d3ebbe87008e0e9f8b92a59a3 100644 (file)
@@ -3427,7 +3427,7 @@ void PG::warm_restart(const OSDMap& lastmap, const vector<int>& newup, const vec
     i.acting = oldacting;
     i.up = oldup;
 
-    if (oldacting != acting) {
+    if (oldacting != acting || oldup != up) {
       info.history.same_acting_since = osdmap.get_epoch();
     }
     if (oldup != up) {