rgw: don't remove on-disk bucket object in rgw_user::rgw_remove_bucket

This is the same object that rgw_rados removes from the root pool now.
And since nobody calls rgw_remove_bucket_info, kill it.
(Hopefully we can kill all of the pi_buckets functions soon.)

While we're at it, rename rgw_remove_bucket to rgw_remove_user_bucket_info,
since that's what it does.

Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 966ef7398d101527635bcf177b128e5b33f91fdc..f06f8ba0dc85b14222fb8d27bac01a143ea46fe3 100644 (file)
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -998,7 +998,7 @@ int main(int argc, char **argv)
        return -EINVAL;
       }
       //cout << "bucket is linked to user '" << owner.get_id() << "'.. unlinking" << std::endl;
-      r = rgw_remove_bucket(owner.get_id(), bucket, false);
+      r = rgw_remove_user_bucket_info(owner.get_id(), bucket, false);
       if (r < 0) {
        cerr << "could not unlink policy from user '" << owner.get_id() << "'" << std::endl;
        return r;
@@ -1017,7 +1017,7 @@ int main(int argc, char **argv)
       return usage();
     }
 
-    int r = rgw_remove_bucket(user_id, bucket, false);
+    int r = rgw_remove_user_bucket_info(user_id, bucket, false);
     if (r < 0)
       cerr << "error unlinking bucket " <<  cpp_strerror(-r) << std::endl;
     return -r;

diff --git a/src/rgw/rgw_bucket.cc b/src/rgw/rgw_bucket.cc
index 3c5b6794a310ef13a4fc41428d7030621b5ba33f..f1dbc5687c0f7451991d725560fbe8cfd7f17954 100644 (file)
--- a/src/rgw/rgw_bucket.cc
+++ b/src/rgw/rgw_bucket.cc
@@ -73,14 +73,6 @@ int rgw_get_bucket_info_id(uint64_t bucket_id, RGWBucketInfo& info)
   return rgw_get_bucket_info(bucket_string, info);
 }
 
-int rgw_remove_bucket_info(string& bucket_name)
-{
-  string uid;
-  rgw_obj obj(pi_buckets, bucket_name);
-  int ret = rgwstore->delete_obj(NULL, uid, obj);
-  return ret;
-}
-
 static int generate_preallocated_pools(vector<string>& pools, int num)
 {
   vector<string> names;

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 5c4a9eb45d38dcb80b3577091d127cd5b1bdc30b..485104738228a7623e3c68ce5b0798db091e6daa 100644 (file)
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -483,7 +483,7 @@ void RGWCreateBucket::execute()
 
   ret = rgw_add_bucket(s->user.user_id, s->bucket);
   if (ret && !existed && ret != -EEXIST)   /* if it exists (or previously existed), don't remove it! */
-    rgw_remove_bucket(s->user.user_id, s->bucket, false);
+    rgw_remove_user_bucket_info(s->user.user_id, s->bucket, false);
 
   if (ret == -EEXIST)
     ret = 0;
@@ -508,7 +508,7 @@ void RGWDeleteBucket::execute()
     ret = rgwstore->delete_bucket(s->user.user_id, s->bucket, false);
 
     if (ret == 0) {
-      ret = rgw_remove_bucket(s->user.user_id, s->bucket, false);
+      ret = rgw_remove_user_bucket_info(s->user.user_id, s->bucket, false);
       if (ret < 0) {
         RGW_LOG(0) << "WARNING: failed to remove bucket: ret=" << ret << dendl;
       }

diff --git a/src/rgw/rgw_user.cc b/src/rgw/rgw_user.cc
index e891eb610e16dbd004f0e6de153ae492d6f7cf91..6e4dcc78ab676d6e5083976616f1a96e62f3306f 100644 (file)
--- a/src/rgw/rgw_user.cc
+++ b/src/rgw/rgw_user.cc
@@ -343,7 +343,7 @@ int rgw_add_bucket(string user_id, rgw_bucket& bucket)
   return ret;
 }
 
-int rgw_remove_bucket(string user_id, rgw_bucket& bucket, bool purge_data)
+int rgw_remove_user_bucket_info(string user_id, rgw_bucket& bucket, bool purge_data)
 {
   int ret;
 
@@ -370,10 +370,6 @@ int rgw_remove_bucket(string user_id, rgw_bucket& bucket, bool purge_data)
     }
   }
 
-  if (ret == 0) {
-    ret = rgw_remove_bucket_info(bucket.name);
-  }
-
   if (ret == 0 && purge_data) {
     vector<rgw_bucket> buckets_vec;
     buckets_vec.push_back(bucket);

diff --git a/src/rgw/rgw_user.h b/src/rgw/rgw_user.h
index da898987b6c55cfb6d96284575140f4398c81401..0d6e713f74446a2c8df8be227936b6818f6f4782 100644 (file)
--- a/src/rgw/rgw_user.h
+++ b/src/rgw/rgw_user.h
@@ -137,7 +137,7 @@ extern int rgw_read_user_buckets(string user_id, RGWUserBuckets& buckets, bool n
 extern int rgw_write_buckets_attr(string user_id, RGWUserBuckets& buckets);
 
 extern int rgw_add_bucket(string user_id, rgw_bucket& bucket);
-extern int rgw_remove_bucket(string user_id, rgw_bucket& bucket, bool purge_data);
+extern int rgw_remove_user_bucket_info(string user_id, rgw_bucket& bucket, bool purge_data);
 
 /*
  * remove the different indexes