librados: add missing implementations for C service daemon API methods

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

diff --git a/src/librados/librados.cc b/src/librados/librados.cc
index ee045133e69076655c908648a6a2481db1434d90..f7683cdc19305020e7057d904af00a9419768dab 100644 (file)
--- a/src/librados/librados.cc
+++ b/src/librados/librados.cc
@@ -3293,6 +3293,42 @@ CEPH_RADOS_API int rados_inconsistent_pg_list(rados_t cluster, int64_t pool_id,
   return retval;
 }
 
+
+static void dict_to_map(const char *dict,
+                        std::map<std::string, std::string>* dict_map)
+{
+  while (*dict != '\0') {
+    const char* key = dict;
+    dict += strlen(key) + 1;
+    const char* value = dict;
+    dict += strlen(value) + 1;
+    (*dict_map)[key] = value;
+  }
+}
+
+CEPH_RADOS_API int rados_service_register(rados_t cluster, const char *service,
+                                          const char *daemon,
+                                          const char *metadata_dict)
+{
+  librados::RadosClient *client = (librados::RadosClient *)cluster;
+
+  std::map<std::string, std::string> metadata;
+  dict_to_map(metadata_dict, &metadata);
+
+  return client->service_daemon_register(service, daemon, metadata);
+}
+
+CEPH_RADOS_API int rados_service_update_status(rados_t cluster,
+                                               const char *status_dict)
+{
+  librados::RadosClient *client = (librados::RadosClient *)cluster;
+
+  std::map<std::string, std::string> status;
+  dict_to_map(status_dict, &status);
+
+  return client->service_daemon_update_status(status);
+}
+
 static void do_out_buffer(bufferlist& outbl, char **outbuf, size_t *outbuflen)
 {
   if (outbuf) {

diff --git a/src/test/librados/service.cc b/src/test/librados/service.cc
index ec1ce9a09807319c2bd89d73eecb339935103dd2..7c3e56aeb75b2b49e66d82c41dd5ee1328c286e2 100644 (file)
--- a/src/test/librados/service.cc
+++ b/src/test/librados/service.cc
@@ -11,6 +11,63 @@
 
 using namespace librados;
 
+TEST(LibRadosService, RegisterEarly) {
+  rados_t cluster;
+  ASSERT_EQ(0, rados_create(&cluster, "admin"));
+  ASSERT_EQ(0, rados_conf_read_file(cluster, NULL));
+  ASSERT_EQ(0, rados_conf_parse_env(cluster, NULL));
+
+  string name = string("pid") + stringify(getpid());
+  ASSERT_EQ(0, rados_service_register(cluster, "laundry", name.c_str(),
+                                      "foo\0bar\0this\0that\0"));
+  ASSERT_EQ(-EEXIST, rados_service_register(cluster, "laundry", name.c_str(),
+                                            "foo\0bar\0this\0that\0"));
+
+  ASSERT_EQ(0, rados_connect(cluster));
+  sleep(5);
+  rados_shutdown(cluster);
+}
+
+TEST(LibRadosService, RegisterLate) {
+  rados_t cluster;
+  ASSERT_EQ(0, rados_create(&cluster, "admin"));
+  ASSERT_EQ(0, rados_conf_read_file(cluster, NULL));
+  ASSERT_EQ(0, rados_conf_parse_env(cluster, NULL));
+  ASSERT_EQ(0, rados_connect(cluster));
+
+  string name = string("pid") + stringify(getpid());
+  ASSERT_EQ(0, rados_service_register(cluster, "laundry", name.c_str(),
+                                      "foo\0bar\0this\0that\0"));
+  ASSERT_EQ(-EEXIST, rados_service_register(cluster, "laundry", name.c_str(),
+                                            "foo\0bar\0this\0that\0"));
+  rados_shutdown(cluster);
+}
+
+TEST(LibRadosService, Status) {
+  rados_t cluster;
+  ASSERT_EQ(0, rados_create(&cluster, "admin"));
+  ASSERT_EQ(0, rados_conf_read_file(cluster, NULL));
+  ASSERT_EQ(0, rados_conf_parse_env(cluster, NULL));
+
+  ASSERT_EQ(-ENOTCONN, rados_service_update_status(cluster,
+                                                   "testing\0testing\0"));
+
+  ASSERT_EQ(0, rados_connect(cluster));
+  string name = string("pid") + stringify(getpid());
+  ASSERT_EQ(0, rados_service_register(cluster, "laundry", name.c_str(),
+                                      "foo\0bar\0this\0that\0"));
+
+  for (int i=0; i<20; ++i) {
+    char buffer[1024];
+    snprintf(buffer, sizeof(buffer), "%s%c%s%c%s%c%d%c",
+             "testing", '\0', "testing", '\0',
+             "count", '\0', i, '\0');
+    ASSERT_EQ(0, rados_service_update_status(cluster, buffer));
+    sleep(1);
+  }
+  rados_shutdown(cluster);
+}
+
 TEST(LibRadosServicePP, RegisterEarly) {
   Rados cluster;
   cluster.init("admin");