Merge pull request ceph#4309 from prallabh/master

RGW: Make RADOS handles in RGW to be a configurable option Passed rgw teuthology suite run. Reviewed-by: Yehuda Sadeh <[email protected]>
areed · May 28, 2015 · 77e0084 · 77e0084
2 parents 729c5e1 + 7476e94
commit 77e0084
Show file tree

Hide file tree

Showing 5 changed files with 147 additions and 55 deletions.
diff --git a/src/common/config_opts.h b/src/common/config_opts.h
@@ -981,6 +981,7 @@ OPTION(rgw_op_thread_timeout, OPT_INT, 10*60)
 OPTION(rgw_op_thread_suicide_timeout, OPT_INT, 0)
 OPTION(rgw_thread_pool_size, OPT_INT, 100)
 OPTION(rgw_num_control_oids, OPT_INT, 8)
+OPTION(rgw_num_rados_handles, OPT_U32, 1)
 
 OPTION(rgw_zone, OPT_STR, "") // zone name
 OPTION(rgw_zone_root_pool, OPT_STR, ".rgw.root")    // pool where zone specific info is stored

diff --git a/src/rgw/rgw_gc.cc b/src/rgw/rgw_gc.cc
@@ -186,7 +186,7 @@ int RGWGC::process(int index, int max_secs)
         if (obj.pool != last_pool) {
           delete ctx;
           ctx = new IoCtx;
-	  ret = store->rados->ioctx_create(obj.pool.c_str(), *ctx);
+	  ret = store->get_rados_handle()->ioctx_create(obj.pool.c_str(), *ctx);
 	  if (ret < 0) {
 	    dout(0) << "ERROR: failed to create ioctx pool=" << obj.pool << dendl;
 	    continue;