Fix arguments to RemoteContainsBlob RPC

HDFGroup · Mar 10, 2021 · 0b6e9d6 · 0b6e9d6
1 parent b2d988a
commit 0b6e9d6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/metadata_management.cc b/src/metadata_management.cc
@@ -245,8 +245,11 @@ std::string LocalGetBlobNameFromId(SharedMemoryContext *context,
   MetadataManager *mdm = GetMetadataManagerFromContext(context);
   std::string blob_name = ReverseGetFromStorage(mdm, blob_id.as_int,
                                                 kMapType_Blob);
-  std::string result =
-    blob_name.substr(sizeof(BucketID) * 2, std::string::npos);
+
+  std::string result;
+  if (blob_name.size() > kBucketIdStringSize) {
+    result = blob_name.substr(kBucketIdStringSize, std::string::npos);
+  }
 
   return result;
 }
@@ -688,7 +691,7 @@ bool ContainsBlob(SharedMemoryContext *context, RpcContext *rpc,
       result = LocalContainsBlob(context, bucket_id, blob_id);
     } else {
       result = RpcCall<bool>(rpc, target_node, "RemoteContainsBlob", bucket_id,
-                             blob_name);
+                             blob_id);
     }
   }
 

diff --git a/src/rpc_thallium.cc b/src/rpc_thallium.cc
@@ -348,9 +348,8 @@ void ThalliumStartRpcServer(SharedMemoryContext *context, RpcContext *rpc,
     req.respond(result);
   };
 
-  auto rpc_get_blob_name_from_id = [context](const request &req, BlobID
-                                             blob_id) {
-    std::string result = LocalGetBlobNameFromId(context, blob_id);
+  auto rpc_get_blob_name_from_id = [context](const request &req, BlobID id) {
+    std::string result = LocalGetBlobNameFromId(context, id);
 
     req.respond(result);
   };