From: Josh Durgin <josh.durgin@dreamhost.com>
Date: Wed, 18 May 2011 00:36:39 +0000 (-0700)
Subject: PG: update same_acting_since when acting or up changes
X-Git-Tag: v0.28~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a22511db2240fe043b827fe08dfc6f9b42fece51;p=ceph.git

PG: update same_acting_since when acting or up changes

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>
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index f568c8741998c..8e5b5f4c8f4d6 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -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) {