]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ReplicatedPG: fix snapshot directory handling in snap_trimmer
authorSamuel Just <samuel.just@dreamhost.com>
Mon, 24 Oct 2011 17:40:38 +0000 (10:40 -0700)
committerSamuel Just <samuel.just@dreamhost.com>
Mon, 24 Oct 2011 23:54:13 +0000 (16:54 -0700)
Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
src/osd/ReplicatedPG.cc

index d5175a423cdcde76adc5c616a9a90dbef8b846e9..267c3b20f4aa93093138dbdb6c10c9980fac80e7 100644 (file)
@@ -933,7 +933,7 @@ ReplicatedPG::RepGather *ReplicatedPG::trim_object(const hobject_t &coid,
 
     if (oldsnaps[0] != snaps[0]) {
       t->collection_remove(coll_t(info.pgid, oldsnaps[0]), coid);
-      if (oldsnaps.size() > 1 && oldsnaps[snaps.size() - 1] != snaps[0])
+      if (oldsnaps.size() > 1 && oldsnaps[snaps.size() - 1] != snaps[0] && snaps.size() > 1)
        t->collection_add(coll_t(info.pgid, snaps[0]), coll, coid);
     }
     if (oldsnaps.size() > 1 && oldsnaps[oldsnaps.size()-1] != snaps[snaps.size()-1]) {