From: Samuel Just <samuel.just@dreamhost.com>
Date: Thu, 3 Feb 2011 18:31:47 +0000 (-0800)
Subject: ReplicatedPG:snap_trimmer should return if !clean or !active or !primary
X-Git-Tag: v0.24.3~10
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=7a02070b741d3482ff6b28827c1eb274a2134486;p=ceph.git

ReplicatedPG:snap_trimmer should return if !clean or !active or !primary

The PG may become !clean or !active while in the osd snap_trim_wq.

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 5f8567f75121a..eb7358e6cf45a 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -525,8 +525,8 @@ void ReplicatedPG::do_sub_op_reply(MOSDSubOpReply *r)
 
 bool ReplicatedPG::snap_trimmer()
 {
-  assert(is_primary() && is_clean());
   lock();
+  if (!(is_primary() && is_clean() && is_active())) return true;
   dout(10) << "snap_trimmer start, purged_snaps " << info.purged_snaps << dendl;
 
   interval_set<snapid_t> s;