Merge branch 'master' into lwh

vesoft-inc · Mar 24, 2022 · 41e5739 · 41e5739
2 parents 2d15039 + 46e1527
commit 41e5739
Show file tree

Hide file tree

Showing 18 changed files with 255 additions and 371 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -62,14 +62,6 @@ jobs:
   docker:
     name: build docker image
     runs-on: [self-hosted, nebula]
-    strategy:
-      fail-fast: false
-      matrix:
-        service:
-          - graphd
-          - metad
-          - storaged
-          - tools
     steps:
       - uses: webiny/action-post-run@2.0.1
         with:
@@ -84,10 +76,38 @@ jobs:
       - uses: docker/build-push-action@v2
         with:
           context: .
-          file: ./docker/Dockerfile.${{ matrix.service }}
+          file: ./docker/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          tags: |
+            vesoft/nebula-graphd:nightly
+          target: graphd
+          push: true
+      - uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          tags: |
+            vesoft/nebula-storaged:nightly
+          target: storaged
+          push: true
+      - uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          tags: |
+            vesoft/nebula-metad:nightly
+          target: metad
+          push: true
+      - uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./docker/Dockerfile
           platforms: linux/amd64,linux/arm64
           tags: |
-            vesoft/nebula-${{ matrix.service }}:nightly
+            vesoft/nebula-tools:nightly
+          target: tools
           push: true
 
   coverage:

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -161,7 +161,7 @@ jobs:
             ;;
           esac
         working-directory: tests/
-        timeout-minutes: 2
+        timeout-minutes: 4
       - name: Pytest
         run: |
           make RM_DIR=false DEBUG=false J=${{ steps.cmake.outputs.j }} test
@@ -270,7 +270,7 @@ jobs:
         run: |
           make standalone-up
         working-directory: tests/
-        timeout-minutes: 60
+        timeout-minutes: 4
       - name: TCK
         run: |
           make RM_DIR=false DEBUG=false J=${{ steps.cmake.outputs.j }} standalone-tck

diff --git a/.github/workflows/rc.yml b/.github/workflows/rc.yml
@@ -68,14 +68,6 @@ jobs:
   docker_build:
     name: docker-build
     runs-on: [self-hosted, nebula]
-    strategy:
-      fail-fast: false
-      matrix:
-        service:
-          - graphd
-          - metad
-          - storaged
-          - tools
     steps:
       - uses: webiny/action-post-run@2.0.1
         with:
@@ -101,15 +93,62 @@ jobs:
       - uses: docker/build-push-action@v2
         with:
           context: .
-          file: ./docker/Dockerfile.${{ matrix.service }}
+          file: ./docker/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          tags: |
+            ${{ secrets.HARBOR_REGISTRY }}/vesoft/nebula-graphd:${{ steps.tagname.outputs.tag }}
+            ${{ secrets.HARBOR_REGISTRY }}/vesoft/nebula-graphd:${{ steps.tagname.outputs.majorver }}
+            ${{ steps.docker.outputs.tag }}
+          push: true
+          target: graphd
+          build-args: |
+            BRANCH=${{ steps.tagname.outputs.tag }}
+            VERSION=${{ steps.tagname.outputs.tagnum }}
+
+      - uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          tags: |
+            ${{ secrets.HARBOR_REGISTRY }}/vesoft/nebula-storaged:${{ steps.tagname.outputs.tag }}
+            ${{ secrets.HARBOR_REGISTRY }}/vesoft/nebula-storaged:${{ steps.tagname.outputs.majorver }}
+            ${{ steps.docker.outputs.tag }}
+          push: true
+          target: storaged
+          build-args: |
+            BRANCH=${{ steps.tagname.outputs.tag }}
+            VERSION=${{ steps.tagname.outputs.tagnum }}
+
+      - uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          tags: |
+            ${{ secrets.HARBOR_REGISTRY }}/vesoft/nebula-metad:${{ steps.tagname.outputs.tag }}
+            ${{ secrets.HARBOR_REGISTRY }}/vesoft/nebula-metad:${{ steps.tagname.outputs.majorver }}
+            ${{ steps.docker.outputs.tag }}
+          push: true
+          target: metad
+          build-args: |
+            BRANCH=${{ steps.tagname.outputs.tag }}
+            VERSION=${{ steps.tagname.outputs.tagnum }}
+      
+      - uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./docker/Dockerfile
           platforms: linux/amd64,linux/arm64
           tags: |
-            ${{ secrets.HARBOR_REGISTRY }}/vesoft/nebula-${{ matrix.service }}:${{ steps.tagname.outputs.tag }}
-            ${{ secrets.HARBOR_REGISTRY }}/vesoft/nebula-${{ matrix.service }}:${{ steps.tagname.outputs.majorver }}
+            ${{ secrets.HARBOR_REGISTRY }}/vesoft/nebula-tools:${{ steps.tagname.outputs.tag }}
+            ${{ secrets.HARBOR_REGISTRY }}/vesoft/nebula-tools:${{ steps.tagname.outputs.majorver }}
             ${{ steps.docker.outputs.tag }}
           push: true
+          target: tools
           build-args: |
             BRANCH=${{ steps.tagname.outputs.tag }}
+            VERSION=${{ steps.tagname.outputs.tagnum }}
 
   test:
     name: test

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,11 +1,13 @@
 FROM vesoft/nebula-dev:centos7 as builder
 
 ARG BRANCH=master
-
+ARG VERSION=
 COPY . /home/nebula/BUILD
 
 RUN cd /home/nebula/BUILD/package \
-  && ./package.sh -n OFF -b ${BRANCH} -c OFF
+  && [[ -z "${VERSION}" ]] \
+  && ./package.sh -n OFF -b ${BRANCH} -t RelWithDebInfo -s TRUE -c OFF \
+  || ./package.sh -n OFF -v ${VERSION} -b ${BRANCH} -t RelWithDebInfo -s TRUE -c OFF 
 
 FROM centos:7 as graphd
 

diff --git a/docker/Dockerfile.graphd b/docker/Dockerfile.graphd
diff --git a/docker/Dockerfile.metad b/docker/Dockerfile.metad
diff --git a/docker/Dockerfile.storaged b/docker/Dockerfile.storaged
diff --git a/docker/Dockerfile.tools b/docker/Dockerfile.tools
diff --git a/docker/README.md b/docker/README.md
@@ -2,7 +2,7 @@
 
 Following docker images will be ready in production.
 
-- [vesoft/nebula-graphd](https://hub.docker.com/r/vesoft/nebula-graphd): nebula-graphd service built with `Dockerfile.graphd`
-- [vesoft/nebula-metad](https://hub.docker.com/r/vesoft/nebula-metad): nebula-metad service built with `Dockerfile.metad`
-- [vesoft/nebula-storaged](https://hub.docker.com/r/vesoft/nebula-storaged): nebula-storaged service built with `Dockerfile.storaged`
-- [vesoft/nebula-tools](https://hub.docker.com/r/vesoft/nebula-tools): nebula tools built with `Dockerfile.tools`, including db_dump, meta_dump and db_upgrader
+- [vesoft/nebula-graphd](https://hub.docker.com/r/vesoft/nebula-graphd): nebula-graphd service built with `Dockerfile` and target `graphd`
+- [vesoft/nebula-metad](https://hub.docker.com/r/vesoft/nebula-metad): nebula-metad service built with `Dockerfile` and target `metad`
+- [vesoft/nebula-storaged](https://hub.docker.com/r/vesoft/nebula-storaged): nebula-storaged service built with `Dockerfile` and target `storaged`
+- [vesoft/nebula-tools](https://hub.docker.com/r/vesoft/nebula-tools): nebula tools built with `Dockerfile` and target `tools`, including db_dump, meta_dump and db_upgrader
diff --git a/src/clients/storage/InternalStorageClient.cpp b/src/clients/storage/InternalStorageClient.cpp
@@ -64,7 +64,8 @@ void InternalStorageClient::chainUpdateEdge(cpp2::UpdateEdgeRequest& reversedReq
   }
   auto resp = getResponse(
       evb,
-      std::make_pair(leader, chainReq),
+      leader,
+      chainReq,
       [](cpp2::InternalStorageServiceAsyncClient* client, const cpp2::ChainUpdateEdgeRequest& r) {
         return client->future_chainUpdateEdge(r);
       });
@@ -102,7 +103,8 @@ void InternalStorageClient::chainAddEdges(cpp2::AddEdgesRequest& directReq,
   cpp2::ChainAddEdgesRequest chainReq = makeChainAddReq(directReq, termId, optVersion);
   auto resp = getResponse(
       evb,
-      std::make_pair(leader, chainReq),
+      leader,
+      chainReq,
       [](cpp2::InternalStorageServiceAsyncClient* client, const cpp2::ChainAddEdgesRequest& r) {
         return client->future_chainAddEdges(r);
       });
@@ -158,7 +160,8 @@ void InternalStorageClient::chainDeleteEdges(cpp2::DeleteEdgesRequest& req,
   chainReq.term_ref() = termId;
   auto resp = getResponse(
       evb,
-      std::make_pair(leader, chainReq),
+      leader,
+      chainReq,
       [](cpp2::InternalStorageServiceAsyncClient* client, const cpp2::ChainDeleteEdgesRequest& r) {
         return client->future_chainDeleteEdges(r);
       });

diff --git a/src/clients/storage/StorageClient.cpp b/src/clients/storage/StorageClient.cpp
@@ -352,8 +352,6 @@ folly::Future<StatusOr<storage::cpp2::UpdateResponse>> StorageClient::updateVert
     return folly::makeFuture<StatusOr<storage::cpp2::UpdateResponse>>(cbStatus.status());
   }
 
-  std::pair<HostAddr, cpp2::UpdateVertexRequest> request;
-
   DCHECK(!!metaClient_);
   auto status = metaClient_->partsNum(param.space);
   if (!status.ok()) {
@@ -370,7 +368,6 @@ folly::Future<StatusOr<storage::cpp2::UpdateResponse>> StorageClient::updateVert
   if (!host.ok()) {
     return folly::makeFuture<StatusOr<storage::cpp2::UpdateResponse>>(host.status());
   }
-  request.first = std::move(host).value();
   cpp2::UpdateVertexRequest req;
   req.space_id_ref() = param.space;
   req.vertex_id_ref() = vertexId;
@@ -383,10 +380,10 @@ folly::Future<StatusOr<storage::cpp2::UpdateResponse>> StorageClient::updateVert
   if (condition.size() > 0) {
     req.condition_ref() = std::move(condition);
   }
-  request.second = std::move(req);
 
   return getResponse(param.evb,
-                     std::move(request),
+                     host.value(),
+                     req,
                      [](ThriftClientType* client, const cpp2::UpdateVertexRequest& r) {
                        return client->future_updateVertex(r);
                      });
@@ -405,8 +402,6 @@ folly::Future<StatusOr<storage::cpp2::UpdateResponse>> StorageClient::updateEdge
     return folly::makeFuture<StatusOr<storage::cpp2::UpdateResponse>>(cbStatus.status());
   }
 
-  std::pair<HostAddr, cpp2::UpdateEdgeRequest> request;
-
   DCHECK(!!metaClient_);
   auto status = metaClient_->partsNum(space);
   if (!status.ok()) {
@@ -423,7 +418,6 @@ folly::Future<StatusOr<storage::cpp2::UpdateResponse>> StorageClient::updateEdge
   if (!host.ok()) {
     return folly::makeFuture<StatusOr<storage::cpp2::UpdateResponse>>(host.status());
   }
-  request.first = std::move(host).value();
   cpp2::UpdateEdgeRequest req;
   req.space_id_ref() = space;
   req.edge_key_ref() = edgeKey;
@@ -435,10 +429,10 @@ folly::Future<StatusOr<storage::cpp2::UpdateResponse>> StorageClient::updateEdge
   if (condition.size() > 0) {
     req.condition_ref() = std::move(condition);
   }
-  request.second = std::move(req);
 
   return getResponse(param.evb,
-                     std::move(request),
+                     host.value(),
+                     req,
                      [useExperimentalFeature = param.useExperimentalFeature](
                          ThriftClientType* client, const cpp2::UpdateEdgeRequest& r) {
                        return useExperimentalFeature ? client->future_chainUpdateEdge(r)
@@ -449,7 +443,6 @@ folly::Future<StatusOr<storage::cpp2::UpdateResponse>> StorageClient::updateEdge
 folly::Future<StatusOr<cpp2::GetUUIDResp>> StorageClient::getUUID(GraphSpaceID space,
                                                                   const std::string& name,
                                                                   folly::EventBase* evb) {
-  std::pair<HostAddr, cpp2::GetUUIDReq> request;
   DCHECK(!!metaClient_);
   auto status = metaClient_->partsNum(space);
   if (!status.ok()) {
@@ -466,15 +459,13 @@ folly::Future<StatusOr<cpp2::GetUUIDResp>> StorageClient::getUUID(GraphSpaceID s
   if (!host.ok()) {
     return folly::makeFuture<StatusOr<storage::cpp2::GetUUIDResp>>(host.status());
   }
-  request.first = std::move(host).value();
   cpp2::GetUUIDReq req;
   req.space_id_ref() = space;
   req.part_id_ref() = part;
   req.name_ref() = name;
-  request.second = std::move(req);
 
   return getResponse(
-      evb, std::move(request), [](ThriftClientType* client, const cpp2::GetUUIDReq& r) {
+      evb, host.value(), req, [](ThriftClientType* client, const cpp2::GetUUIDReq& r) {
         return client->future_getUUID(r);
       });
 }