From: Yehuda Sadeh <yehuda@redhat.com>
Date: Wed, 24 May 2017 18:47:05 +0000 (-0700)
Subject: cls/rgw: remove unused field in reshard entry
X-Git-Tag: ses5-milestone6~8^2~7^2~18
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=aa3f71d6b140d82445ecd1d4c1a25cde239de0f4;p=ceph.git

cls/rgw: remove unused field in reshard entry

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---

diff --git a/src/cls/rgw/cls_rgw_types.cc b/src/cls/rgw/cls_rgw_types.cc
index cfb2f5340071..5ea50f12f6cc 100644
--- a/src/cls/rgw/cls_rgw_types.cc
+++ b/src/cls/rgw/cls_rgw_types.cc
@@ -583,7 +583,6 @@ void cls_rgw_reshard_entry::dump(Formatter *f) const
   encode_json("tenant", tenant, f);
   encode_json("bucket_name", bucket_name, f);
   encode_json("bucket_id", bucket_id, f);
-  encode_json("old_instance_id", old_instance_id, f);
   encode_json("new_instance_id", new_instance_id, f);
   encode_json("old_num_shards", old_num_shards, f);
   encode_json("new_num_shards", new_num_shards, f);
@@ -598,7 +597,6 @@ void cls_rgw_reshard_entry::generate_test_instances(list<cls_rgw_reshard_entry*>
   ls.back()->tenant = "tenant";
   ls.back()->bucket_name = "bucket1""";
   ls.back()->bucket_id = "bucket_id";
-  ls.back()->old_instance_id = "old_instance_id";
   ls.back()->new_instance_id = "new_instance_id";
   ls.back()->old_num_shards = 8;
   ls.back()->new_num_shards = 64;
diff --git a/src/cls/rgw/cls_rgw_types.h b/src/cls/rgw/cls_rgw_types.h
index 48d68da26334..59b22b50827a 100644
--- a/src/cls/rgw/cls_rgw_types.h
+++ b/src/cls/rgw/cls_rgw_types.h
@@ -1072,7 +1072,6 @@ struct cls_rgw_reshard_entry
   string tenant;
   string bucket_name;
   string bucket_id;
-  string old_instance_id;
   string new_instance_id;
   uint32_t old_num_shards;
   uint32_t new_num_shards;
@@ -1085,7 +1084,6 @@ struct cls_rgw_reshard_entry
     ::encode(tenant, bl);
     ::encode(bucket_name, bl);
     ::encode(bucket_id, bl);
-    ::encode(old_instance_id, bl);
     ::encode(new_instance_id, bl);
     ::encode(old_num_shards, bl);
     ::encode(new_num_shards, bl);
@@ -1098,7 +1096,6 @@ struct cls_rgw_reshard_entry
     ::decode(tenant, bl);
     ::decode(bucket_name, bl);
     ::decode(bucket_id, bl);
-    ::decode(old_instance_id, bl);
     ::decode(new_instance_id, bl);
     ::decode(old_num_shards, bl);
     ::decode(new_num_shards, bl);