corrected provider locking to avoid deadlock during rescaling

8eed3d03 · Matthieu Dorier · 618481a6 · 8eed3d03 · 8eed3d03
Commit 8eed3d03 authored Mar 07, 2019 by Matthieu Dorier
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 102 additions and 67 deletions

src/sdskv-server.cc src/sdskv-server.cc +101 -66

test/sdskv-migrate-test.cc test/sdskv-migrate-test.cc +1 -1

No files found.
--- a/src/sdskv-server.cc
+++ b/src/sdskv-server.cc
--- a/test/sdskv-migrate-test.cc
+++ b/test/sdskv-migrate-test.cc
@@ -174,7 +174,7 @@ int main(int argc, char *argv[])
    ret = sdskv_migrate_all_keys(kvphA, db_idA, sdskv_svr_addr_strB,
            mplex_idB, db_idB, SDSKV_REMOVE_ORIGINAL);
    if(ret != SDSKV_SUCCESS) {
-        fprintf(stderr, "Error: sdskv_migrate_all_keys() failed\n");
+        fprintf(stderr, "Error: sdskv_migrate_all_keys() failed (ret = %d)\n", ret);
        sdskv_provider_handle_release(kvphA);
        sdskv_provider_handle_release(kvphB);
        margo_addr_free(mid, svr_addrA);