Merge branch 'main' into ir_call_procedure

alibaba · Jul 6, 2023 · 4191359 · 4191359
2 parents c4ff771 + 6ed05f0
commit 4191359
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/.github/workflows/gss.yml b/.github/workflows/gss.yml
@@ -167,7 +167,7 @@ jobs:
 
         minikube image load ${{ env.GSS_IMAGE }}:${SHORT_SHA}
 
-    - uses: dashanji/kubernetes-log-export-action@v4
+    - uses: dashanji/kubernetes-log-export-action@v5
       env:
         SHOW_TIMESTAMPS: 'true'
         OUTPUT_DIR: ${{ github.workspace }}/helm-installation-logs
@@ -241,8 +241,9 @@ jobs:
         cd ${GITHUB_WORKSPACE}/python
         python3 -m pytest -s -vvv graphscope/tests/kubernetes/test_store_service.py -k test_demo_after_restart
 
-    - uses: dashanji/kubernetes-log-export-action@v4
+    - uses: dashanji/kubernetes-log-export-action@v5
       env:
+        OUTPUT_DIR: ${{ github.workspace }}/helm-installation-logs
         MODE: stop
 
     - name: upload the k8s logs to artifact

diff --git a/.github/workflows/k8s-ci.yml b/.github/workflows/k8s-ci.yml
@@ -431,7 +431,7 @@ jobs:
           minikube image load graphscope/learning:${SHORT_SHA}
           echo "loaded learning"
 
-      - uses: dashanji/kubernetes-log-export-action@v4
+      - uses: dashanji/kubernetes-log-export-action@v5
         env:
           SHOW_TIMESTAMPS: 'true'
           OUTPUT_DIR: ${{ github.workspace }}/k8s-ci-helm-installation-logs
@@ -459,14 +459,15 @@ jobs:
 
           python3 -m pytest -s -vvv ./graphscope/tests/kubernetes/test_demo_script.py -k test_helm_installation
 
-      - uses: dashanji/kubernetes-log-export-action@v4
+      - uses: dashanji/kubernetes-log-export-action@v5
         env:
+          OUTPUT_DIR: ${{ github.workspace }}/k8s-ci-helm-installation-logs
           MODE: stop
 
       - name: Delete Helm Cluster
         run: helm delete graphscope
 
-      - uses: dashanji/kubernetes-log-export-action@v4
+      - uses: dashanji/kubernetes-log-export-action@v5
         env:
           SHOW_TIMESTAMPS: 'true'
           OUTPUT_DIR: ${{ github.workspace }}/k8s-ci-demo-script-test-logs
@@ -525,8 +526,9 @@ jobs:
           # Check the result file have successfully written to the given location
           # hdfs dfs -test -e /ldbc_sample/res.csv_0 && hdfs dfs -test -e /ldbc_sample/res.csv_1
 
-      - uses: dashanji/kubernetes-log-export-action@v4
+      - uses: dashanji/kubernetes-log-export-action@v5
         env:
+          OUTPUT_DIR: ${{ github.workspace }}/k8s-ci-demo-script-test-logs
           MODE: stop
 
       - name: Upload the k8s logs to artifact
@@ -688,7 +690,7 @@ jobs:
           # install python gremlin client
           pip install gremlinpython
 
-      - uses: dashanji/kubernetes-log-export-action@v4
+      - uses: dashanji/kubernetes-log-export-action@v5
         env:
           SHOW_TIMESTAMPS: 'true'
           OUTPUT_DIR: ${{ github.workspace }}/k8s-failover-logs
@@ -713,8 +715,9 @@ jobs:
           # run failover test
           cd ${GITHUB_WORKSPACE}/interactive_engine/compiler && ./ir_k8s_failover_ci.sh default test-gie-standalone 2 1
 
-      - uses: dashanji/kubernetes-log-export-action@v4
+      - uses: dashanji/kubernetes-log-export-action@v5
         env:
+          OUTPUT_DIR: ${{ github.workspace }}/k8s-failover-logs
           MODE: stop
 
       - name: upload the k8s logs to artifact

diff --git a/analytical_engine/java/pom.xml b/analytical_engine/java/pom.xml
@@ -95,7 +95,7 @@
     <maven.javadoc.version>3.4.0</maven.javadoc.version>
     <javadoc.output.directory>grape-jdk-javadoc</javadoc.output.directory>
     <javadoc.output.destDir>grape-jdk-javadoc</javadoc.output.destDir>
-    <grpc.version>1.47.0</grpc.version>
+    <grpc.version>1.53.0</grpc.version>
     <protobuf.version>3.19.2</protobuf.version>
     <protoc.version>3.19.2</protoc.version>
     <javax.annotation.version>1.3.2</javax.annotation.version>

diff --git a/interactive_engine/compiler/src/main/java/com/alibaba/graphscope/GraphServer.java b/interactive_engine/compiler/src/main/java/com/alibaba/graphscope/GraphServer.java
@@ -88,7 +88,9 @@ public void start() throws Exception {
                             "dbms.connector.bolt.listen_address",
                             ":" + FrontendConfig.NEO4J_BOLT_SERVER_PORT.get(this.configs),
                             "dbms.connector.bolt.advertised_address",
-                            ":" + FrontendConfig.NEO4J_BOLT_SERVER_PORT.get(this.configs)),
+                            ":" + FrontendConfig.NEO4J_BOLT_SERVER_PORT.get(this.configs),
+                            "dbms.transaction.timeout",
+                            FrontendConfig.QUERY_EXECUTION_TIMEOUT_MS.get(this.configs) + "ms"),
                     false);
         }
     }