]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw/rgw_reshard: Don't dump RGWBucketReshard JSON in process_single_logshard 31683/head
authorMark Nelson <mnelson@redhat.com>
Mon, 26 Aug 2019 11:16:31 +0000 (07:16 -0400)
committerNathan Cutler <ncutler@suse.com>
Fri, 15 Nov 2019 21:27:54 +0000 (22:27 +0100)
Signed-off-by: Mark Nelson <mnelson@redhat.com>
(cherry picked from commit cc27e353cb821dcba6f1a484bf2ea65a0c109778)

src/rgw/rgw_reshard.cc

index fffa34797746368ed008ac7b890271417493b762..ca58c757cc9ad23ae5cdba5680c603aab6959268 100644 (file)
@@ -1013,11 +1013,8 @@ int RGWReshard::process_single_logshard(int logshard_num)
        }
 
        RGWBucketReshard br(store, bucket_info, attrs, nullptr);
-
-       Formatter* formatter = new JSONFormatter(false);
-       auto formatter_ptr = std::unique_ptr<Formatter>(formatter);
-       ret = br.execute(entry.new_num_shards, max_entries, true, nullptr,
-                        formatter, this);
+       ret = br.execute(entry.new_num_shards, max_entries, false, nullptr,
+                        nullptr, this);
        if (ret < 0) {
          ldout (store->ctx(), 0) <<  __func__ <<
            "ERROR in reshard_bucket " << entry.bucket_name << ":" <<