Merge/migrations

admin/admin.cc

@@ -212,10 +212,10 @@ admin :: migrate_data(const char* space_from, const char* space_to,
     size_t total_sz = sizeof(uint32_t) * 2 + space_from_sz + space_to_sz;
     std::vector<char> buf(total_sz);
     char* pos = &buf[0];
-    pos = e::pack64be(space_from_sz, pos);
+    pos = e::pack32be(space_from_sz, pos);
     memcpy(pos, space_from, space_from_sz);
     pos += space_from_sz;
-    pos = e::pack64be(space_to_sz, pos);
+    pos = e::pack32be(space_to_sz, pos);
     memcpy(pos, space_to, space_to_sz);
 
     int64_t cid = m_coord.rpc("migrate", &buf[0], total_sz,
@@ -233,6 +233,12 @@ admin :: migrate_data(const char* space_from, const char* space_to,
     }
 }
 
+uint16_t
+admin :: num_ongoing_migrations(const char* space_name)
+{
+    return m_coord.config()->num_ongoing_migrations(space_name);
+}
+
 int
 admin :: validate_space(const char* description,
                         hyperdex_admin_returncode* status)

admin/admin.h

@@ -74,6 +74,9 @@ class admin
                             const char** spaces);
         int64_t migrate_data(const char* space_from, const char* space_to,
                              enum hyperdex_admin_returncode* status);
+        // Return the number of ongoing migrations from or to the given space
+        uint16_t num_ongoing_migrations(const char* space_name);
+
         // manage servers
         int64_t server_register(uint64_t token, const char* address,
                                 enum hyperdex_admin_returncode* status);

admin/c.cc

@@ -215,6 +215,14 @@ hyperdex_admin_migrate_data(struct hyperdex_admin* _adm,
     );
 }
 
+HYPERDEX_API uint16_t
+hyperdex_admin_num_ongoing_migrations(struct hyperdex_admin* _adm,
+                                      const char* space_name)
+{
+    hyperdex::admin* adm = reinterpret_cast<hyperdex::admin*>(_adm);
+    return adm->num_ongoing_migrations(space_name);
+}
+
 HYPERDEX_API int64_t
 hyperdex_admin_server_register(struct hyperdex_admin* _adm,
                                uint64_t token,

bindings/python/_hyperdex_admin.c

@@ -0,0 +1 @@
+#error Do not use this file, it is the result of a failed Cython compilation.