fix GIE deployment

Signed-off-by: Lei Wang <[email protected]>
GraphScope · Jun 12, 2024 · 3f3edf9 · 3f3edf9
1 parent a20d5be
commit 3f3edf9
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/charts/gart/templates/gie_frontend/deployment.yaml b/charts/gart/templates/gie_frontend/deployment.yaml
@@ -26,7 +26,7 @@ spec:
         - |
           cd /home/graphscope/GART &&
           export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python &&
-          ./scripts/update_gie_schema.py {{ $etcd_service }} {{ .Values.dataconfig.etcdPrefix }} {{ .Release.Namespace }} {{ include "gart.fullname" . }}-gie-executor {{ .Values.gie_frontend.gremlinPort }} {{ .Values.dataconfig.subgraphNum}} {{ include "gart.fullname" . }}-gie-executor-service {{ .Values.gie_executor.GAIA_RPC_PORT}} &&
+          ./scripts/update_gie_schema.py {{ $etcd_service }} {{ .Values.dataconfig.etcdPrefix }} {{ .Release.Namespace }} {{ include "gart.writer.fullname" . }} {{ .Values.gie_frontend.gremlinPort }} {{ .Values.dataconfig.subgraphNum}} {{ include "gart.fullname" . }}-gie-executor-service {{ .Values.gie_executor.GAIA_RPC_PORT}} &&
           cd /home/graphscope/GraphScope/interactive_engine/compiler &&
           make run &&
           sleep infinity

diff --git a/charts/gart/templates/writer/statefulset.yaml b/charts/gart/templates/writer/statefulset.yaml
@@ -84,15 +84,20 @@ spec:
             containerPort: {{ .Values.gie_executor.GAIA_RPC_PORT }}
           - name: gaia-engine
             containerPort: {{ .Values.gie_executor.ENGINE_PORT }}
-            command: ["/bin/bash", "-c"]
-            args:
-            - |
-              cd /home/graphscope/GART &&
-              export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib &&
-              ./scripts/update_gie_executor_config.py $((${HOSTNAME##*-} + 0)) {{ .Values.dataconfig.subgraphNum }} {{ .Values.gie_executor.GAIA_RPC_PORT }} {{ .Release.Namespace }} {{ include "gart.fullname" . }}-gie-executor {{ include "gart.fullname" . }}-gie-executor-service {{ .Values.gie_executor.ENGINE_PORT}} &&
-              cd /home/graphscope/GraphScope/interactive_engine/executor/assembly/grin_gart &&
-              ./target/release/grin_executor ../../../assembly/src/conf/graphscope/log4rs.yml /home/graphscope/gie-executor-config.properties &&
-              sleep infinity
+        command: ["/bin/bash", "-c"]
+        args:
+        - |
+          echo "subgraph id: $((${HOSTNAME##*-} + 0))" &&
+          cd /home/graphscope/GART &&
+          export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib &&
+          ./scripts/update_gie_executor_config.py $((${HOSTNAME##*-} + 0)) {{ .Values.dataconfig.subgraphNum }} {{ .Values.gie_executor.GAIA_RPC_PORT }} {{ .Release.Namespace }} {{ include "gart.writer.fullname" . }} {{ include "gart.fullname" . }}-gie-executor-service {{ .Values.gie_executor.ENGINE_PORT}} &&
+          sleep infinity &&
+          cd /home/graphscope/GraphScope/interactive_engine/executor/assembly/grin_gart &&
+          ./target/release/grin_executor ../../../assembly/src/conf/graphscope/log4rs.yml /home/graphscope/gie-executor-config.properties &&
+          sleep infinity
+        volumeMounts:
+        - name: shared-socket
+          mountPath: /tmp/shared
       {{- end }}
 
 
diff --git a/k8s/dockerfiles/interactive.Dockerfile b/k8s/dockerfiles/interactive.Dockerfile
@@ -138,4 +138,7 @@ RUN git clone https://github.com/doudoubobo/GraphScope.git -b v0.1.4 /home/graph
 RUN cd /home/graphscope/GraphScope/interactive_engine/executor/assembly/grin_gart && \
 cargo build --release
 
+WORKDIR /home/graphscope
+RUN git clone https://github.com/GraphScope/GART.git
+
 ENV PATH=${PATH}:/home/graphscope/.local/bin
diff --git a/scripts/update_gie_schema.py b/scripts/update_gie_schema.py
@@ -14,6 +14,8 @@
 rpc_service_name = sys.argv[7]
 rpc_service_port = sys.argv[8]
 
+server_size = int(server_size)
+
 if not etcd_endpoint.startswith(("http://", "https://")):
     etcd_endpoint = "http://" + etcd_endpoint
 parsed_url = urlparse(etcd_endpoint)