From: Jens Rosenboom <j.rosenboom@x-ion.de>
Date: Mon, 26 Jun 2017 11:14:06 +0000 (+0000)
Subject: RGW: Fix duplicate tag removal during GC
X-Git-Tag: ses5-milestone8~1^2~20^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8eeee2b78d6f4176fb20c2b1499e3237ee229bf4;p=ceph.git

RGW: Fix duplicate tag removal during GC

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>
---

diff --git a/src/rgw/rgw_gc.cc b/src/rgw/rgw_gc.cc
index c4ad79c18f6..67b8a5c33df 100644
--- a/src/rgw/rgw_gc.cc
+++ b/src/rgw/rgw_gc.cc
@@ -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: