From: Yehuda Sadeh <yehuda@redhat.com>
Date: Wed, 16 Jan 2019 03:28:11 +0000 (-0800)
Subject: rgw: user info json encoding preserves storage_class state
X-Git-Tag: v14.1.0~314^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6206786c52ec28b01f7ebd6552729524d0d0cc24;p=ceph.git

rgw: user info json encoding preserves storage_class state

This is needed for meta sync. Otherwise one zone would have storage_class
not set, and the other zone would have it set.

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

diff --git a/src/rgw/rgw_json_enc.cc b/src/rgw/rgw_json_enc.cc
index 34ca5dd60946..e9030ad8308a 100644
--- a/src/rgw/rgw_json_enc.cc
+++ b/src/rgw/rgw_json_enc.cc
@@ -484,7 +484,7 @@ void RGWUserInfo::dump(Formatter *f) const
     encode_json("system", (bool)system, f);
   }
   encode_json("default_placement", default_placement.name, f);
-  encode_json("default_storage_class", default_placement.get_storage_class(), f);
+  encode_json("default_storage_class", default_placement.storage_class, f);
   encode_json("placement_tags", placement_tags, f);
   encode_json("bucket_quota", bucket_quota, f);
   encode_json("user_quota", user_quota, f);