Merge branch 'master' into fix-compile-oom

vesoft-inc · Oct 14, 2021 · b840467 · b840467
2 parents ef8f958 + e1ff44f
commit b840467
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/graph/service/GraphService.cpp b/src/graph/service/GraphService.cpp
@@ -41,13 +41,16 @@ Status GraphService::init(std::shared_ptr<folly::IOThreadPoolExecutor> ioExecuto
   bool loadDataOk = metaClient_->waitForMetadReady(3);
   if (!loadDataOk) {
     // Resort to retrying in the background
-    LOG(WARNING) << "Failed to wait for meta service ready synchronously.";
+    LOG(ERROR) << "Failed to wait for meta service ready synchronously.";
+    return Status::Error("Failed to wait for meta service ready synchronously.");
   }
 
   sessionManager_ = std::make_unique<GraphSessionManager>(metaClient_.get(), hostAddr);
   auto initSessionMgrStatus = sessionManager_->init();
   if (!initSessionMgrStatus.ok()) {
-    LOG(WARNING) << "Failed to initialize session manager: " << initSessionMgrStatus.toString();
+    LOG(ERROR) << "Failed to initialize session manager: " << initSessionMgrStatus.toString();
+    return Status::Error("Failed to initialize session manager: %s",
+                         initSessionMgrStatus.toString().c_str());
   }
 
   queryEngine_ = std::make_unique<QueryEngine>();