From: Samuel Just <sam.just@inktank.com>
Date: Mon, 18 Jun 2012 16:26:12 +0000 (-0700)
Subject: PG: reg_last_pg_scrub on pg resurrection
X-Git-Tag: v0.48argonaut~40
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0d8970fc813b33e7c6ba2484fbc43cce947d3f4d;p=ceph.git

PG: reg_last_pg_scrub on pg resurrection

This may solve the unreg_last_pg_scrub assert.

see #2453.

Signed-off-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 2e6013edf71..1b97618ee3c 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -3621,6 +3621,7 @@ void PG::start_peering_interval(const OSDMapRef lastmap,
     dout(10) << *this << " canceling deletion!" << dendl;
     deleting = false;
     osd->remove_wq.dequeue(this);
+    osd->reg_last_pg_scrub(info.pgid, info.history.last_scrub_stamp);
   }
     
   if (role != oldrole) {