Merge branch 'master' into tck_heartbeat_interval_test

vesoft-inc · Sep 14, 2021 · 5616ecb · 5616ecb
2 parents 3064190 + 8060de8
commit 5616ecb
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 17 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -1,8 +1,12 @@
 ---
-name: Bug report	
+name: Bug report
 about: Help us to improve this project
+title: ''
+labels: bug
+assignees: ''
 
 ---
+
 **Please check the FAQ documentation before raising an issue**
 
 Please check the [FAQ](https://github.com/vesoft-inc/nebula/blob/master/docs/manual-EN/1.overview/2.quick-start/2.FAQ.md) documentation and old issues before raising an issue in case someone has asked the same question that you are asking.

diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,6 +1,9 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
+title: ''
+labels: feature req
+assignees: ''
 
 ---
 

diff --git a/src/meta/processors/job/JobManager.cpp b/src/meta/processors/job/JobManager.cpp
@@ -239,28 +239,27 @@ nebula::cpp2::ErrorCode JobManager::saveTaskStatus(TaskDescription& td,
   if (!jobExec) {
     LOG(WARNING) << folly::sformat("createMetaJobExecutor failed(), jobId={}", jobId);
     return nebula::cpp2::ErrorCode::E_TASK_REPORT_OUT_DATE;
-  } else {
-    if (!optJobDesc.getParas().empty()) {
-      auto spaceName = optJobDesc.getParas().back();
-      auto spaceIdRet = getSpaceId(spaceName);
-      if (!nebula::ok(spaceIdRet)) {
-        auto retCode = nebula::error(spaceIdRet);
-        LOG(INFO) << "Get spaceName " << spaceName
-                  << " failed, error: " << apache::thrift::util::enumNameSafe(retCode);
-        return retCode;
-      }
-
-      auto spaceId = nebula::value(spaceIdRet);
-      if (spaceId != -1) {
-        jobExec->setSpaceId(spaceId);
-      }
-    }
   }
 
   auto rcSave = save(td.taskKey(), td.taskVal());
   if (rcSave != nebula::cpp2::ErrorCode::SUCCEEDED) {
     return rcSave;
   }
+
+  if (!optJobDesc.getParas().empty()) {
+    auto spaceName = optJobDesc.getParas().back();
+    auto spaceIdRet = getSpaceId(spaceName);
+    if (!nebula::ok(spaceIdRet)) {
+      auto retCode = nebula::error(spaceIdRet);
+      LOG(WARNING) << "Get spaceName " << spaceName
+                   << " failed, error: " << apache::thrift::util::enumNameSafe(retCode);
+      return retCode;
+    } else {
+      auto spaceId = nebula::value(spaceIdRet);
+      jobExec->setSpaceId(spaceId);
+    }
+  }
+
   return jobExec->saveSpecialTaskStatus(req);
 }