From: Samuel Just <sam.just@inktank.com>
Date: Thu, 10 Jan 2013 00:41:40 +0000 (-0800)
Subject: ReplicatedPG: compare nlinks to snapcolls
X-Git-Tag: v0.57~188^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e65ea70ea64025fbb0709ee8596bb2878be0bbdc;p=ceph.git

ReplicatedPG: compare nlinks to snapcolls

nlinks gives us the number of hardlinks to the object.
nlinks should be 1 + snapcolls.size().  This will allow
us to detect links which remain in an erroneous snap
collection.

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

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index d0fcc0dd14df..9c1ec7f648aa 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -7247,6 +7247,12 @@ bool ReplicatedPG::_report_snap_collection_errors(
 	<< std::endl;
     errors = true;
   }
+  if (nlinks != snapcolls.size() + 1) {
+    out << info.pgid << " osd." << osd << " unaccounted for links on object "
+	<< hoid << " snapcolls " << snapcolls << " nlinks " << nlinks
+	<< std::endl;
+    errors = true;
+  }
   return errors;
 }