]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: fix compilation after rebase
authorYehuda Sadeh <yehuda@redhat.com>
Tue, 28 Jan 2020 18:34:02 +0000 (10:34 -0800)
committerYehuda Sadeh <yehuda@redhat.com>
Tue, 28 Jan 2020 18:34:02 +0000 (10:34 -0800)
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
src/rgw/rgw_admin.cc

index 4d0c382d8041cbc57a5562343860a5c0dd403ff7..ca57f56f2db783a1b08968c349c3ea002cabb743 100644 (file)
@@ -5501,10 +5501,11 @@ int main(int argc, const char **argv)
   else if (opt_cmd == OPT::USER_SUSPEND)
     user_op.set_suspension(true);
 
-  if (!placement_id.empty() || !storage_class.empty()) {
+  if (!placement_id.empty() ||
+      (opt_storage_class && !opt_storage_class->empty())) {
     rgw_placement_rule target_rule;
     target_rule.name = placement_id;
-    target_rule.storage_class = storage_class;
+    target_rule.storage_class = *opt_storage_class;
     if (!store->svc()->zone->get_zone_params().valid_placement(target_rule)) {
       cerr << "NOTICE: invalid dest placement: " << target_rule.to_str() << std::endl;
       return EINVAL;