You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@quickstep.apache.org by ji...@apache.org on 2017/09/20 01:24:08 UTC

[4/8] incubator-quickstep git commit: Crash if block not found in the local storage in the single node.

Crash if block not found in the local storage in the single node.


Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/b1c3356a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/b1c3356a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/b1c3356a

Branch: refs/heads/fix-iwyu
Commit: b1c3356a19efef985ea87ae5e127f4ed2dd40ad7
Parents: c4f7614
Author: Zuyu Zhang <zu...@cs.wisc.edu>
Authored: Tue Sep 12 20:29:39 2017 -0500
Committer: Zuyu Zhang <zu...@cs.wisc.edu>
Committed: Tue Sep 12 20:29:39 2017 -0500

----------------------------------------------------------------------
 storage/StorageManager.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b1c3356a/storage/StorageManager.cpp
----------------------------------------------------------------------
diff --git a/storage/StorageManager.cpp b/storage/StorageManager.cpp
index 7eb132c..5924607 100644
--- a/storage/StorageManager.cpp
+++ b/storage/StorageManager.cpp
@@ -683,8 +683,6 @@ StorageManager::BlockHandle StorageManager::loadBlockOrBlob(
     loaded_handle.block_memory = block_buffer;
     loaded_handle.block_memory_size = num_slots;
   } else {
-    bool pull_succeeded = false;
-
 #ifdef QUICKSTEP_DISTRIBUTED
     const string domain_network_address = getPeerDomainNetworkAddress(BlockIdUtil::Domain(block));
     DLOG(INFO) << "Pulling Block " << BlockIdUtil::ToString(block) << " from " << domain_network_address;
@@ -693,11 +691,9 @@ StorageManager::BlockHandle StorageManager::loadBlockOrBlob(
     while (!client.Pull(block, numa_node, &loaded_handle)) {
       LOG(INFO) << "Retry pulling Block " << BlockIdUtil::ToString(block) << " from " << domain_network_address;
     }
-
-    pull_succeeded = true;
+#else
+    LOG(FATAL) << "Block not found from persistent storage: " << block;
 #endif
-
-    CHECK(pull_succeeded) << "Failed to pull Block " << BlockIdUtil::ToString(block) << " from remote peers.";
   }
 
 #ifdef QUICKSTEP_DISTRIBUTED