fix(interactive): Refine Query Timeout Configuration in GIE Doc

charts/gie-standalone/templates/frontend/statefulset.yaml

@@ -117,8 +117,8 @@ spec:
               value: {{ .Values.extraConfig | quote }}
             - name: WORKER_NUM
               value: {{ .Values.pegasusWorkerNum | quote }}
-            - name: TIMEOUT
-              value: {{ .Values.pegasusTimeout | quote }}
+            - name: QUERY_TIMEOUT
+              value: {{ .Values.queryExecutionTimeoutMS | quote }}
             - name: BATCH_SIZE
               value: {{ .Values.pegasusBatchSize | quote }}
             - name: OUTPUT_CAPACITY

charts/gie-standalone/values.yaml

@@ -36,8 +36,6 @@ htapLoaderConfig: "v6d_modern_loader.json"
 ## Pegasus Config
 pegasusWorkerNum: 2
 
-pegasusTimeout: 240000
-
 pegasusBatchSize: 1024
 
 pegasusOutputCapacity: 16
@@ -46,6 +44,8 @@ frontendQueryPerSecondLimit: 2147483647
 
 gremlinScriptLanguageName: "antlr_gremlin_traversal"
 
+queryExecutionTimeoutMS: 3000000
+
 ## need by vineyard in distributed env
 etcdEndpoint: "etcd-for-vineyard.default.svc.cluster.local:2379"
 

docs/interactive_engine/dev_and_test.md

@@ -105,7 +105,6 @@ $GIE_TEST_HOME/bin/gaia_executor $GIE_TEST_HOME/conf/log4rs.yml $GIE_TEST_HOME/c
 ## Pegasus service config
 # a.k.a. thread num
 pegasus.worker.num = 1
-pegasus.timeout = 240000
 pegasus.batch.size = 1024
 pegasus.output.capacity = 16
 
@@ -126,6 +125,9 @@ neo4j.bolt.server.port = 7687
 # disable authentication if username or password is not set
 # auth.username = default
 # auth.password = default
+
+# set total execution time for a query
+query.execution.timeout.ms: 3000000
 ```
 
 6. Start the `frontend`:

docs/interactive_engine/getting_started.md

@@ -98,8 +98,8 @@ The number 6 is printed, which is the number of vertices in modern graph.
 You could pass additional key-value pairs to customize the startup configuration of GIE, for example:
 
 ```python
-# Set the timeout value to 10 min
-g = gs.interactive(graph, params={'query.execution.timeout.ms': 600000})
+# set total execution time for a query to 3000s
+g = gs.interactive(graph, params={'query.execution.timeout.ms': 3000000})
 ```
 
 ## What's the Next

docs/storage_engine/groot.md

@@ -75,6 +75,7 @@ helm status demo
 | frontend.replicaCount | Number of Frontend | 1 |
 | frontend.service.type | Kubernetes Service type of frontend | NodePort |
 | frontend.query.per.second.limit | the maximum qps can be handled by frontend service | 2147483647 (without limitation) |
+| query.execution.timeout.ms | the total execution time for a query | 3000000 |
 
 
 If Groot is launched with the default configuration, then two Store Pods, one Frontend Pod, and one Coordinator Pod will be started. The number of Coordinator nodes is fixed to 1.

interactive_engine/compiler/set_properties.sh

@@ -16,7 +16,7 @@
 
 worker_num="pegasus.worker.num: $WORKER_NUM";
 
-timeout="pegasus.timeout: $TIMEOUT"
+query_timeout="query.execution.timeout.ms: $QUERY_TIMEOUT"
 
 batch_size="pegasus.batch.size: $BATCH_SIZE";
 
@@ -47,6 +47,6 @@ done
 
 graph_schema="graph.schema: $GRAPH_SCHEMA"
 
-properties="$worker_num\n$timeout\n$batch_size\n$output_capacity\n$hosts\n$server_num\n$graph_schema\n$gremlin_server_port\n$cypher_server_port\n$frontend_query_per_second_limit\n$gremlin_script_language_name\n$graph_physical_opt"
+properties="$worker_num\n$query_timeout\n$batch_size\n$output_capacity\n$hosts\n$server_num\n$graph_schema\n$gremlin_server_port\n$cypher_server_port\n$frontend_query_per_second_limit\n$gremlin_script_language_name\n$graph_physical_opt"
 
 echo -e $properties > ./conf/ir.compiler.properties

interactive_engine/compiler/src/main/java/com/alibaba/graphscope/common/config/PegasusConfig.java

@@ -31,7 +31,4 @@ public class PegasusConfig {
 
     public static final Config<String> PEGASUS_HOSTS =
             Config.stringConfig("pegasus.hosts", "localhost:8080");
-
-    public static final Config<Long> PEGASUS_GRPC_TIMEOUT =
-            Config.longConfig("pegasus.grpc.timeout", 6000000L);
 }