]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
RGW: Fix duplicate tag removal during GC 15912/head
authorJens Rosenboom <j.rosenboom@x-ion.de>
Mon, 26 Jun 2017 11:14:06 +0000 (11:14 +0000)
committerJens Rosenboom <j.rosenboom@x-ion.de>
Mon, 26 Jun 2017 11:14:06 +0000 (11:14 +0000)
We need to remove all processed tags before we fetch a new batch of tags
for removal, otherwise some tags might get processed twice.

Fixes: http://tracker.ceph.com/issues/20107
Signed-off-by: Jens Rosenboom <j.rosenboom@x-ion.de>
src/rgw/rgw_gc.cc

index c4ad79c18f6f2e154146532b849d3ac2594615b0..67b8a5c33dfcccec377a1c571e5d489e85d6c987 100644 (file)
@@ -222,6 +222,10 @@ int RGWGC::process(int index, int max_secs)
         }
       }
     }
+    if (!remove_tags.empty()) {
+      RGWGC::remove(index, remove_tags);
+      remove_tags.clear();
+    }
   } while (truncated);
 
 done: