rados_create: add id parameter

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>

diff --git a/src/include/rados/librados.h b/src/include/rados/librados.h
index 33cd30bfa5718d59e8f53816d2c1d8d31b673a06..3d01eca5e106cffe62b49249d5326b5af07cdb22 100644 (file)
--- a/src/include/rados/librados.h
+++ b/src/include/rados/librados.h
@@ -51,7 +51,7 @@ struct rados_statfs_t {
 void rados_version(int *major, int *minor, int *extra);
 
 /* initialization */
-int rados_create(rados_t *cluster);
+int rados_create(rados_t *cluster, const char * const id);
 
 /* Connect to the cluster */
 int rados_connect(rados_t cluster);

diff --git a/src/librados.cc b/src/librados.cc
index 2f8b93ecca334b7997e8ef3942daa683729185ab..0e9cd71c544bdfd6903f74015f33d21f5c6ce326 100644 (file)
--- a/src/librados.cc
+++ b/src/librados.cc
@@ -2352,7 +2352,7 @@ void Rados::set_notify_timeout(pool_t pool, uint32_t timeout)
 static Mutex rados_init_mutex("rados_init");
 static int rados_initialized = 0;
 
-extern "C" int rados_create(rados_t *pcluster)
+extern "C" int rados_create(rados_t *pcluster, const char * const id)
 {
   rados_init_mutex.Lock();
   if (!rados_initialized) {
@@ -2360,6 +2360,8 @@ extern "C" int rados_create(rados_t *pcluster)
     vector<const char*> args;
     env_to_vec(args);
 
+    if (id)
+      g_conf.id = strdup(id);
     common_init(args, "librados", STARTUP_FLAG_INIT_KEYS);
 
     ++rados_initialized;