]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cls/rgw: fix timespan comparison
authorYehuda Sadeh <yehuda@redhat.com>
Thu, 9 Jun 2016 19:59:35 +0000 (12:59 -0700)
committerAbhishek Lekshmanan <abhishek@suse.com>
Thu, 14 Jul 2016 08:06:58 +0000 (10:06 +0200)
Fixes: http://tracker.ceph.com/issues/16220
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit e0a07f70f7740a66ffa2646e0a57e8bdc0285373)

src/cls/rgw/cls_rgw.cc

index a29ad7bf03ac8d983d5e636e7eb50ab2e589bb1a..146da9c55a6d932a736646a578e06b54b7238fb7 100644 (file)
@@ -1912,7 +1912,7 @@ int rgw_dir_suggest_changes(cls_method_context_t hctx, bufferlist *in, bufferlis
                 cur_disk.pending_map.begin();
       while(iter != cur_disk.pending_map.end()) {
         map<string, struct rgw_bucket_pending_info>::iterator cur_iter=iter++;
-        if (cur_time > (cur_iter->second.timestamp + tag_timeout)) {
+        if (cur_time > (cur_iter->second.timestamp + timespan(tag_timeout))) {
           cur_disk.pending_map.erase(cur_iter);
         }
       }