rgw: remove select_bucket_placement from RGWAccess interface.

RGWRados::create_bucket is the only user now, so make it private
and make the interface a little tighter.

(We are going to need to handle placement at some point in the future,
but the interface needs to be designed a lot more carefully than this
one [wasn't].)

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

diff --git a/src/rgw/rgw_access.h b/src/rgw/rgw_access.h
index c5c8a84fe2af5c195d6162875a78435707faee75..0008432f41aa5eba9228d212bc8adba14db5c6c4 100644 (file)
--- a/src/rgw/rgw_access.h
+++ b/src/rgw/rgw_access.h
@@ -64,7 +64,6 @@ public:
                             map<std::string, bufferlist>& attrs,
                             bool system_bucket, bool exclusive = true,
                             uint64_t auid = 0) = 0;
-  virtual int select_bucket_placement(string& bucket_name, rgw_bucket& bucket) { return 0; }
   virtual int add_bucket_placement(std::string& new_placement) { return 0; }
   virtual int create_pools(std::string& id, vector<string>& names, vector<int>& retcodes, int auid = 0) { return -ENOTSUP; }
   /** write an object to the storage device in the appropriate pool

diff --git a/src/rgw/rgw_rados.h b/src/rgw/rgw_rados.h
index 49ddea499ab8e583d386b76a6afabdb3d3a38b96..d93a7a1433ac007e4e3e586e1774c1366f8ef2c3 100644 (file)
--- a/src/rgw/rgw_rados.h
+++ b/src/rgw/rgw_rados.h
@@ -124,6 +124,9 @@ class RGWRados  : public RGWAccess
                  bool exclusive,
                  pair<string, bufferlist> *cmp_xattr);
   int delete_obj_impl(void *ctx, std::string& id, rgw_obj& src_obj, bool sync);
+
+  int select_bucket_placement(std::string& bucket_name, rgw_bucket& bucket);
+
 public:
   RGWRados() : lock("rados_timer_lock"), timer(NULL), watcher(NULL), watch_handle(0) {}
 
@@ -156,7 +159,6 @@ public:
                             map<std::string,bufferlist>& attrs,
                             bool system_bucket, bool exclusive = true,
                             uint64_t auid = 0);
-  virtual int select_bucket_placement(std::string& bucket_name, rgw_bucket& bucket);
   virtual int add_bucket_placement(std::string& new_pool);
   virtual int create_pools(std::string& id, vector<string>& names, vector<int>& retcodes, int auid = 0);