From 251fd5042732314f3d29e828a8b6059903795a8d Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Wed, 16 Mar 2011 13:38:58 -0700 Subject: [PATCH] rados_create_internal calls keyring_init --- src/librados.cc | 1 + src/rgw/rgw_main.cc | 1 + 2 files changed, 2 insertions(+) diff --git a/src/librados.cc b/src/librados.cc index b7a0c859dfc62..212c6d0aaf92b 100644 --- a/src/librados.cc +++ b/src/librados.cc @@ -2628,6 +2628,7 @@ extern "C" int rados_create_internal(rados_t *pcluster, md_config_t *conf) } rados_init_mutex.Unlock(); librados::RadosClient *radosp = new librados::RadosClient; + keyring_init(&g_conf); *pcluster = (void *)radosp; return 0; } diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc index 82f99375820c3..86b52295e399a 100644 --- a/src/rgw/rgw_main.cc +++ b/src/rgw/rgw_main.cc @@ -65,6 +65,7 @@ int main(int argc, const char **argv) env_to_vec(args); common_init(args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_DAEMON, 0); + if (!RGWAccess::init_storage_provider("rados", &g_conf)) { cerr << "Couldn't init storage provider (RADOS)" << std::endl; return 5; //EIO -- 2.39.5