Merge pull request ceph#26491 from ceph/revert-25926-wip-rgw-lc-prefix

Revert "rgw: lifcycle: don't reject compound rules with empty prefix"
atta · Feb 18, 2019 · 104edd0 · 104edd0
2 parents a941e28 + 2874167
commit 104edd0
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/src/rgw/rgw_lc.cc b/src/rgw/rgw_lc.cc
@@ -126,14 +126,8 @@ bool RGWLifecycleConfiguration::_add_rule(const LCRule& rule)
   if (rule.get_filter().has_tags()){
     op.obj_tags = rule.get_filter().get_tags();
   }
-
-  /* prefix is optional, update prefix map only if prefix...exists */
-  if (!prefix.empty()) {
-    auto ret = prefix_map.emplace(std::move(prefix), std::move(op));
-    return ret.second;
-  }
-
-  return true;
+  auto ret = prefix_map.emplace(std::move(prefix), std::move(op));
+  return ret.second;
 }
 
 int RGWLifecycleConfiguration::check_and_add_rule(const LCRule& rule)