Merge branch 'master' into push_dowm_limit_sample

vesoft-inc · Sep 14, 2021 · 14fe287 · 14fe287
2 parents 6f5b4ae + 14b3cc4
commit 14fe287
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -5,7 +5,7 @@ ARG BRANCH=master
 COPY . /home/nebula/BUILD
 
 RUN cd /home/nebula/BUILD/package \
-  && ./package.sh -v $(git rev-parse --short HEAD) -n OFF -b ${BRANCH}
+  && ./package.sh -n OFF -b ${BRANCH}
 
 FROM centos:7 as graphd
 
@@ -15,8 +15,8 @@ COPY --from=builder /home/nebula/BUILD/pkg-build/cpack_output/nebula-*-graph.rpm
 WORKDIR /usr/local/nebula
 
 RUN rpm -ivh *.rpm \
-    && mkdir -p ./{logs,data,pids} \
-    && rm -rf *.rpm
+  && mkdir -p ./{logs,data,pids} \
+  && rm -rf *.rpm
 
 EXPOSE 9669 19669 19670
 

diff --git a/docker/Dockerfile.graphd b/docker/Dockerfile.graphd
@@ -5,7 +5,7 @@ COPY . /home/nebula/BUILD
 ARG BRANCH=master
 
 RUN cd /home/nebula/BUILD/package \
-  && ./package.sh -v $(git rev-parse --short HEAD) -n OFF -b ${BRANCH} -g OFF
+  && ./package.sh -n OFF -b ${BRANCH} -g OFF
 
 FROM centos:7
 

diff --git a/docker/Dockerfile.metad b/docker/Dockerfile.metad
@@ -5,7 +5,7 @@ ARG BRANCH=master
 COPY . /home/nebula/BUILD
 
 RUN cd /home/nebula/BUILD/package \
-  && ./package.sh -v $(git rev-parse --short HEAD) -n OFF -b ${BRANCH}
+  && ./package.sh -n OFF -b ${BRANCH}
 
 FROM centos:7
 

diff --git a/docker/Dockerfile.storaged b/docker/Dockerfile.storaged
@@ -5,7 +5,7 @@ ARG BRANCH=master
 COPY . /home/nebula/BUILD
 
 RUN cd /home/nebula/BUILD/package \
-  && ./package.sh -v $(git rev-parse --short HEAD) -n OFF -b ${BRANCH}
+  && ./package.sh -n OFF -b ${BRANCH}
 
 FROM centos:7
 

diff --git a/docker/Dockerfile.tools b/docker/Dockerfile.tools
@@ -5,7 +5,7 @@ ARG BRANCH=master
 COPY . /home/nebula/BUILD
 
 RUN cd /home/nebula/BUILD/package \
-  && ./package.sh -v $(git rev-parse --short HEAD) -n OFF -b ${BRANCH}
+  && ./package.sh -n OFF -b ${BRANCH}
 
 FROM centos:7
 

diff --git a/package/package.sh b/package/package.sh
@@ -3,7 +3,7 @@
 #  Package nebula as deb/rpm package
 #
 # introduce the args
-#   -v: The version of package, the version should be match tag name, default value is the `commitId`
+#   -v: The version of package, the version should be match tag name, default value is null
 #   -n: Package to one or multi-packages, `ON` means one package, `OFF` means multi packages, default value is `ON`
 #   -s: Whether to strip the package, default value is `FALSE`
 #   -b: Branch, default master

diff --git a/src/meta/processors/job/JobManager.cpp b/src/meta/processors/job/JobManager.cpp
@@ -247,15 +247,15 @@ nebula::cpp2::ErrorCode JobManager::saveTaskStatus(TaskDescription& td,
   }
 
   if (!optJobDesc.getParas().empty()) {
+    GraphSpaceID spaceId = -1;
     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);
+      spaceId = nebula::value(spaceIdRet);
       jobExec->setSpaceId(spaceId);
     }
   }