Merge branch 'wip-rgw-pools'

Conflicts:
	src/rgw/rgw_bucket.cc
	src/rgw/rgw_main.cc

diff --cc src/rgw/rgw_admin.cc
Simple merge

diff --cc src/rgw/rgw_fs.cc
Simple merge

diff --cc src/rgw/rgw_log.cc
index 817893e8d0024452a5e6143e28cc17823cd74fd7,cb8c5aa00c77ddfa06a866852f8c14c9a51c5628..90a3eec98efe21774eb3ffdb3f5a490b313ea99e
--- 1/src/rgw/rgw_log.cc
--- 2/src/rgw/rgw_log.cc
+++ b/src/rgw/rgw_log.cc
@@@ -3,10 -3,7 +3,9 @@@
  #include "rgw_log.h"
  #include "rgw_acl.h"
  #include "rgw_access.h"
- #include "rgw_bucket.h"
  
 +#define DOUT_SUBSYS rgw
 +
  static rgw_bucket log_bucket(RGW_LOG_POOL_NAME);
  
  static void set_param_str(struct req_state *s, const char *name, string& str)

diff --cc src/rgw/rgw_main.cc
index 071c7c4e0e2507dabff28a8297778c7955f35ddd,9355671c7019a6573d21dc3d13041167d5741fdc..d8d440dd0cb1bcc40ee5eb71f4478920413eec79
--- 1/src/rgw/rgw_main.cc
--- 2/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@@ -221,19 -218,9 +220,9 @@@ done
    FCGX_Finish_r(fcgx);
    delete fcgx;
  
 -  RGW_LOG(0) << "====== req done fcgx=" << hex << fcgx << dec << " http_status=" << http_ret << " ======" << dendl;
 +  dout(0) << "====== req done fcgx=" << hex << fcgx << dec << " http_status=" << http_ret << " ======" << dendl;
  }
  
- class C_RGWMaintenanceTick : public Context {
-   SafeTimer *timer;
- public:
-   C_RGWMaintenanceTick(SafeTimer *t) : timer(t) {}
-   void finish(int r) {
-     rgw_bucket_maintain_pools();
-     dout(20) << "C_RGWMaintenanceTick::finish()" << dendl;
-     timer->add_event_after(g_conf->rgw_maintenance_tick_interval, new C_RGWMaintenanceTick(timer));
-   }
- };
  /*
   * start up the RADOS connection and then handle HTTP messages as they come in
   */

diff --cc src/rgw/rgw_op.cc
index 2583930baefbeef105eaf2edc75cef8ed5c8157b,79b79322257fb618e7548333c57af911201d1964..6416921bfe0a9383e829fe74243b06e854225439
--- 1/src/rgw/rgw_op.cc
--- 2/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@@ -237,9 -234,9 +236,9 @@@ int read_acls(struct req_state *s, boo
  
    if (s->bucket_name_str.size()) {
      RGWBucketInfo bucket_info;
-     ret = rgw_get_bucket_info(s->bucket_name_str, bucket_info);
+     ret = rgwstore->get_bucket_info(s->bucket_name_str, bucket_info);
      if (ret < 0) {
 -      RGW_LOG(0) << "couldn't get bucket from bucket_name (name=" << s->bucket_name_str << ")" << dendl;
 +      dout(0) << "couldn't get bucket from bucket_name (name=" << s->bucket_name_str << ")" << dendl;
        return ret;
      }
      s->bucket = bucket_info.bucket;
@@@ -468,15 -465,12 +467,12 @@@ void RGWCreateBucket::execute(
  
    attrs[RGW_ATTR_ACL] = aclbl;
  
-   ret = rgw_bucket_allocate_pool(s->bucket_name_str, s->bucket);
-   if (ret < 0)
-     goto done;
- 
-   ret = rgw_create_bucket(s->user.user_id, s->bucket_name_str, s->bucket, attrs, true,
-                         s->user.auid);
+   s->bucket.name = s->bucket_name_str;
+   ret = rgwstore->create_bucket(s->user.user_id, s->bucket, attrs, false,
+                                 true, s->user.auid);
    /* continue if EEXIST and create_bucket will fail below.  this way we can recover
     * from a partial create by retrying it. */
 -  RGW_LOG(0) << "rgw_create_bucket returned ret=" << ret << " bucket=" << s->bucket << dendl;
 +  dout(0) << "rgw_create_bucket returned ret=" << ret << " bucket=" << s->bucket << dendl;
  
    if (ret && ret != -EEXIST)   
      goto done;

diff --cc src/rgw/rgw_rados.cc
index 72544242f41d4906153aa003b1241a3b6db21d84,f17f863c283ff7749d82e28e7f383643ceafdc72..74a954cef5d3ddd3f233fb0418500fbdfca78ce6
--- 1/src/rgw/rgw_rados.cc
--- 2/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@@ -18,9 -20,8 +20,10 @@@ using namespace librados
  #include <vector>
  #include <list>
  #include <map>
+ #include "auth/Crypto.h" // get_random_bytes()
  
 +#define DOUT_SUBSYS rgw
 +
  using namespace std;
  
  Rados *rados = NULL;

diff --cc src/rgw/rgw_tools.cc
index 076cb2f2bd67883f4ff37e6c62622b84a7175abf,e58d92659b4dc940dcc6f5ad4e11496545e78529..f6f660876c4567f7aeb379b321c43c7973ce19c3
--- 1/src/rgw/rgw_tools.cc
--- 2/src/rgw/rgw_tools.cc
+++ b/src/rgw/rgw_tools.cc
@@@ -7,10 -7,7 +7,9 @@@
  #include "rgw_common.h"
  #include "rgw_access.h"
  #include "rgw_tools.h"
- #include "rgw_bucket.h"
  
 +#define DOUT_SUBSYS rgw
 +
  #define READ_CHUNK_LEN (16 * 1024)
  
  int rgw_put_obj(string& uid, rgw_bucket& bucket, string& oid, const char *data, size_t size)

diff --cc src/rgw/rgw_user.cc
index d1d94c23056d76d1f25f1361c83cddf8684c3d3f,2b9436f9b63fc9e8f833985f04f4164146d9d08d..af864c29452d97e228bf21f7baad14fcfb3b65e2
--- 1/src/rgw/rgw_user.cc
--- 2/src/rgw/rgw_user.cc
+++ b/src/rgw/rgw_user.cc
@@@ -9,10 -9,7 +9,9 @@@
  
  #include "include/types.h"
  #include "rgw_user.h"
- #include "rgw_bucket.h"
  
 +#define DOUT_SUBSYS rgw
 +
  using namespace std;
  
  static rgw_bucket ui_key_bucket(USER_INFO_POOL_NAME);