From: Yehuda Sadeh <yehuda@hq.newdream.net>
Date: Wed, 11 Jan 2012 21:05:47 +0000 (-0800)
Subject: rgw-admin: clean up unused commands
X-Git-Tag: v0.40~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e2c02543c7efd6060e26440e7cd190629f345975;p=ceph.git

rgw-admin: clean up unused commands
---

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index deb7e611810..ccdb3bd822a 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -44,9 +44,8 @@ void _usage()
   cerr << "  bucket link                link bucket to specified user\n";
   cerr << "  bucket unlink              unlink bucket from specified user\n";
   cerr << "  bucket stats               returns bucket statistics\n";
+  cerr << "  bucket info                show bucket information\n";
   cerr << "  pool add                   add an existing pool to those which can store buckets\n";
-  cerr << "  pool info                  show pool information\n";
-  cerr << "  pool create                generate pool information (requires bucket)\n";
   cerr << "  policy                     read bucket/object policy\n";
   cerr << "  log list                   list log objects\n";
   cerr << "  log show                   dump a log from specific object or (bucket + date\n";
@@ -117,8 +116,6 @@ enum {
   OPT_BUCKET_STATS,
   OPT_POLICY,
   OPT_POOL_ADD,
-  OPT_POOL_INFO,
-  OPT_POOL_CREATE,
   OPT_LOG_LIST,
   OPT_LOG_SHOW,
   OPT_LOG_RM,
@@ -253,10 +250,6 @@ static int get_cmd(const char *cmd, const char *prev_cmd, bool *need_more)
   } else if (strcmp(prev_cmd, "pool") == 0) {
     if (strcmp(cmd, "add") == 0)
       return OPT_POOL_ADD;
-    if (strcmp(cmd, "info") == 0)
-      return OPT_POOL_INFO;
-    if (strcmp(cmd, "create") == 0)
-      return OPT_POOL_CREATE;
   }
 
   return -EINVAL;
@@ -1180,79 +1173,33 @@ next:
     rgwstore->add_bucket_placement(pool_name);
   }
 
-  if (opt_cmd == OPT_POOL_INFO) {
-     if (bucket_name.empty() && bucket_id < 0) {
-       cerr << "either bucket or bucket-id needs to be specified" << std::endl;
-       return usage();
-     }
-     formatter->reset();
-     formatter->open_object_section("pool_info");
-     formatter->dump_int("id", bucket_id);
-     formatter->dump_string("bucket", bucket_info.bucket.name.c_str());
-     formatter->dump_string("pool", bucket_info.bucket.pool.c_str());
-     formatter->dump_string("owner", bucket_info.owner.c_str());
-     formatter->close_section();
-     formatter->flush(cout);
-     cout << std::endl;
-   }
-
-   if (opt_cmd == OPT_BUCKET_STATS) {
-     if (bucket_name.empty() && bucket_id < 0 && user_id.empty()) {
-       cerr << "either bucket or bucket-id or uid needs to be specified" << std::endl;
-       return usage();
-     }
-     formatter->reset();
-     if (user_id.empty()) {
-       bucket_stats(bucket, formatter);
-     } else {
-       RGWUserBuckets buckets;
-       if (rgw_read_user_buckets(user_id, buckets, false) < 0) {
-	 cerr << "could not get buckets for uid " << user_id << std::endl;
-       } else {
-	 formatter->open_array_section("buckets");
-	 map<string, RGWBucketEnt>& m = buckets.get_buckets();
-	 for (map<string, RGWBucketEnt>::iterator iter = m.begin(); iter != m.end(); ++iter) {
-	   RGWBucketEnt obj = iter->second;
-	   bucket_stats(obj.bucket, formatter);
-	 }
-	 formatter->close_section();
-       }
-     }
-     formatter->flush(cout);
-     cout << std::endl;
-   }
-
-   if (opt_cmd == OPT_POOL_CREATE) {
- #if 0
-     if (bucket_name.empty())
-       return usage();
-     string no_object;
-     int ret;
-     bufferlist bl;
-     rgw_obj obj(bucket, no_object);
-
-     ret = rgwstore->get_attr(NULL, obj, RGW_ATTR_ACL, bl);
-     if (ret < 0) {
-       dout(0) << "can't read bucket acls: " << ret << dendl;
-       return ret;
-     }
-     RGWAccessControlPolicy policy;
-     bufferlist::iterator iter = bl.begin();
-     policy.decode(iter);
-
-     RGWBucketInfo info;
-     info.bucket = bucket;
-     info.owner = policy.get_owner().get_id();
-
-    ret = rgw_store_bucket_info_id(bucket.bucket_id, info);
-    if (ret < 0) {
-      dout(0) << "can't store pool info: bucket_id=" << bucket.bucket_id << " ret=" << ret << dendl;
-      return ret;
+  if (opt_cmd == OPT_BUCKET_STATS) {
+    if (bucket_name.empty() && bucket_id < 0 && user_id.empty()) {
+      cerr << "either bucket or bucket-id or uid needs to be specified" << std::endl;
+      return usage();
     }
-#endif
+    formatter->reset();
+    if (user_id.empty()) {
+      bucket_stats(bucket, formatter);
+    } else {
+      RGWUserBuckets buckets;
+      if (rgw_read_user_buckets(user_id, buckets, false) < 0) {
+	cerr << "could not get buckets for uid " << user_id << std::endl;
+      } else {
+	formatter->open_array_section("buckets");
+	map<string, RGWBucketEnt>& m = buckets.get_buckets();
+	for (map<string, RGWBucketEnt>::iterator iter = m.begin(); iter != m.end(); ++iter) {
+	  RGWBucketEnt obj = iter->second;
+	  bucket_stats(obj.bucket, formatter);
+	}
+	formatter->close_section();
+      }
+    }
+    formatter->flush(cout);
+    cout << std::endl;
   }
 
- if (opt_cmd == OPT_USER_SUSPEND || opt_cmd == OPT_USER_ENABLE) {
+  if (opt_cmd == OPT_USER_SUSPEND || opt_cmd == OPT_USER_ENABLE) {
     string id;
     __u8 disable = (opt_cmd == OPT_USER_SUSPEND ? 1 : 0);