From: Mark Nelson <mnelson@redhat.com>
Date: Mon, 26 Aug 2019 11:16:31 +0000 (-0400)
Subject: rgw/rgw_reshard: Don't dump RGWBucketReshard JSON in process_single_logshard
X-Git-Tag: v15.1.0~1689^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cc27e353cb821dcba6f1a484bf2ea65a0c109778;p=ceph.git

rgw/rgw_reshard: Don't dump RGWBucketReshard JSON in process_single_logshard

Signed-off-by: Mark Nelson <mnelson@redhat.com>
---

diff --git a/src/rgw/rgw_reshard.cc b/src/rgw/rgw_reshard.cc
index 5ff1e6309aee..a9a1b9f2b945 100644
--- a/src/rgw/rgw_reshard.cc
+++ b/src/rgw/rgw_reshard.cc
@@ -993,11 +993,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 << ":" <<