Remove the legacy code related to graph manager and make default user 'graphscope' in graphscope-store image

.github/workflows/ci.yml

@@ -416,8 +416,7 @@ jobs:
     - name: Clean
       if: always()
       run: |
-        sudo docker rmi -f registry.cn-hongkong.aliyuncs.com/graphscope/graphscope:${{ github.sha }} \
-            registry.cn-hongkong.aliyuncs.com/graphscope/maxgraph_standalone_manager:${{ github.sha }} || true
+        sudo docker rmi -f registry.cn-hongkong.aliyuncs.com/graphscope/graphscope:${{ github.sha }} || true
         helm uninstall graphscope || true
         kubectl delete pod graphscope-test-rpc-service --wait=false || true
 
@@ -519,9 +518,6 @@ jobs:
         echo "source ~/.cargo/env" >> ~/.bashrc
         source ~/.bashrc
         rustup component add rustfmt
-        sudo yum update -y
-        sudo yum install -y xz
-        sudo ln -s /bin/true /bin/apt-get
 
     - uses: actions/checkout@v2.3.2
 

.github/workflows/docker_nightly.yml

@@ -17,11 +17,6 @@ jobs:
         cd ${GITHUB_WORKSPACE}
         sudo make graphscope
 
-    - name: Build interactive_manager image
-      run: |
-        cd ${GITHUB_WORKSPACE}
-        sudo make interactive_manager
-
     - name: Build graphscope-store image
       run: |
         cd ${GITHUB_WORKSPACE}
@@ -32,7 +27,6 @@ jobs:
         short_sha=$(git rev-parse --short HEAD)
         echo "SHORT_SHA=${short_sha}" >> $GITHUB_ENV
         echo "GS_IMAGE=graphscope/graphscope:${short_sha}" >> $GITHUB_ENV
-        echo "GIE_MANAGER_IMAGE=graphscope/maxgraph_standalone_manager:${short_sha}" >> $GITHUB_ENV
 
     - name: Kubernetes test
       env:
@@ -53,21 +47,16 @@ jobs:
         echo ${{ secrets.ALIYUN_TOKEN }} | sudo docker login --username=grape_dev registry.cn-hongkong.aliyuncs.com --password-stdin
         sudo docker tag graphscope/graphscope:${SHORT_SHA} \
                         registry.cn-hongkong.aliyuncs.com/graphscope/graphscope:nightly
-        sudo docker tag graphscope/maxgraph_standalone_manager:${SHORT_SHA} \
-                        registry.cn-hongkong.aliyuncs.com/graphscope/maxgraph_standalone_manager:nightly
         sudo docker tag graphscope/graphscope-store:${SHORT_SHA} \
                         registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-store:nightly
 
         sudo docker push registry.cn-hongkong.aliyuncs.com/graphscope/graphscope:nightly
-        sudo docker push registry.cn-hongkong.aliyuncs.com/graphscope/maxgraph_standalone_manager:nightly
         sudo docker push registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-store:nightly
 
     - name: Clean
       if: always()
       run: |
         sudo docker rmi -f graphscope/graphscope:${SHORT_SHA} \
-            graphscope/maxgraph_standalone_manager:${SHORT_SHA} \
             graphscope/graphscope-store:${SHORT_SHA} \
             registry.cn-hongkong.aliyuncs.com/graphscope/graphscope:nightly \
-            registry.cn-hongkong.aliyuncs.com/graphscope/maxgraph_standalone_manager:nightly \
             registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-store:nightly || true

.github/workflows/graphscope-store.Dockerfile

@@ -1,13 +1,9 @@
-FROM registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-runtime:latest-root-user
+FROM registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-runtime:latest
 
-RUN mkdir -p /home/maxgraph/{bin,conf}
 COPY ./opt/graphscope/ /usr/local/
-COPY ./maxgraph /home/maxgraph/maxgraph
+COPY ./maxgraph /usr/local/maxgraph
 COPY ./ready_probe.sh /tmp/ready_probe.sh
-COPY ./interactive_engine/bin/giectl /home/maxgraph/bin/giectl
-COPY ./interactive_engine/conf/*  /home/maxgraph/conf/
+COPY ./interactive_engine/bin/giectl /usr/local/bin/giectl
+COPY ./interactive_engine/conf/*  /usr/local/conf/
 
-ENV GRAPHSCOPE_HOME=/home/maxgraph
-ENV GRAPHSCOPE_RUNTIME=/tmp/graphscope
-
-WORKDIR /home/maxgraph/
+ENV GRAPHSCOPE_HOME=/usr/local

README-zh.md

@@ -322,8 +322,7 @@ GraphScope 包含一个 [Dockerfile](k8s/graphscope.Dockerfile)，可以构建 D
 # ./scripts/prepare_dev.sh
 
 make graphscope
-make interactive_manager
-# by default, the built image is tagged as graphscope/graphscope:SHORTSHA and graphscope/maxgraph_standalone_manager:SHORTSHA
+# by default, the built image is tagged as graphscope/graphscope:SHORTSHA
 ```
 
 ### 构建客户端 Python 包
@@ -351,7 +350,7 @@ python3 setup.py install
 ./scripts/test.sh --all
 
 # run all test cases on your built image
-./scripts/test.sh --all --gs_image graphscope/graphscope:SHORTSHA --gie_manager_image graphscope/maxgraph_standalone_manager:SHORTSHA
+./scripts/test.sh --all --gs_image graphscope/graphscope:SHORTSHA
 
 # or run the selected cases on a certain module. e.g.,
 ./scripts/test.sh --python

README.md

@@ -328,8 +328,7 @@ a `runtime-base` image. To build images with latest version of GraphScope, go to
 # ./scripts/prepare_dev.sh
 
 make graphscope
-make interactive_manager
-# by default, the built image is tagged as graphscope/graphscope:SHORTSHA and graphscope/maxgraph_standalone_manager:SHORTSHA
+# by default, the built image is tagged as graphscope/graphscope:SHORTSHA
 ```
 
 ### Building client library
@@ -364,7 +363,7 @@ You may run the whole test suite with commands:
 ./scripts/test.sh --all
 
 # run all test cases on your built image
-./scripts/test.sh --all --gs_image graphscope/graphscope:SHORTSHA --gie_manager_image graphscope/maxgraph_standalone_manager:SHORTSHA
+./scripts/test.sh --all --gs_image graphscope/graphscope:SHORTSHA
 
 # or run the selected cases on a certain module. e.g.,
 ./scripts/test.sh --python

charts/graphscope-store/templates/coordinator/statefulset.yaml

@@ -68,16 +68,16 @@ spec:
 
             [[ `hostname` =~ -([0-9]+)$ ]] || exit 1
             ordinal=${BASH_REMATCH[1]}
-            sed -e "s/ROLE/$(ROLE)/g" \
-                -e "s/INDEX/${ordinal}/g" \
-                -e "s/KAFKA_SERVERS/$(KAFKA_SERVERS)/g" \
-                -e "s/FRONTEND/$(DNS_NAME_PREFIX_FRONTEND)/g" \
-                -e "s/INGESTOR/$(DNS_NAME_PREFIX_INGESTOR)/g" \
-                -e "s/COORDINATOR/$(DNS_NAME_PREFIX_COORDINATOR)/g" \
-                -e "s/STORE/$(DNS_NAME_PREFIX_STORE)/g" \
-                -e "s@LOG4RS_CONFIG@${GRAPHSCOPE_HOME}/conf/log4rs.yml@g" \
-            /etc/graphscope-store/my.cnf.tpl > /etc/graphscope-store/my.cnf
-            LOG_NAME=graphscope-store.log /home/maxgraph/bin/giectl maxgraph /etc/graphscope-store/my.cnf coordinator
+            sudo sed -e "s/ROLE/$(ROLE)/g" \
+                     -e "s/INDEX/${ordinal}/g" \
+                     -e "s/KAFKA_SERVERS/$(KAFKA_SERVERS)/g" \
+                     -e "s/FRONTEND/$(DNS_NAME_PREFIX_FRONTEND)/g" \
+                     -e "s/INGESTOR/$(DNS_NAME_PREFIX_INGESTOR)/g" \
+                     -e "s/COORDINATOR/$(DNS_NAME_PREFIX_COORDINATOR)/g" \
+                     -e "s/STORE/$(DNS_NAME_PREFIX_STORE)/g" \
+                     -e "s@LOG4RS_CONFIG@${GRAPHSCOPE_HOME}/conf/log4rs.yml@g" \
+            /etc/graphscope-store/my.cnf.tpl | sudo tee /etc/graphscope-store/my.cnf
+            LOG_NAME=graphscope-store.log ${GRAPHSCOPE_HOME}/bin/giectl maxgraph /etc/graphscope-store/my.cnf coordinator
             tail -f /dev/null
           env:
             - name: DEBUG

charts/graphscope-store/templates/frontend/statefulset.yaml

@@ -68,18 +68,18 @@ spec:
 
             [[ `hostname` =~ -([0-9]+)$ ]] || exit 1
             ordinal=${BASH_REMATCH[1]}
-            sed -e "s/GRAPH_NAME/$(GRAPH_NAME)/g" \
-                -e "s/ROLE/$(ROLE)/g" \
-                -e "s/INDEX/${ordinal}/g" \
-                -e "s/KAFKA_SERVERS/$(KAFKA_SERVERS)/g" \
-                -e "s/FRONTEND/$(DNS_NAME_PREFIX_FRONTEND)/g" \
-                -e "s/INGESTOR/$(DNS_NAME_PREFIX_INGESTOR)/g" \
-                -e "s/COORDINATOR/$(DNS_NAME_PREFIX_COORDINATOR)/g" \
-                -e "s/STORE/$(DNS_NAME_PREFIX_STORE)/g" \
-                -e "s@LOG4RS_CONFIG@${GRAPHSCOPE_HOME}/conf/log4rs.yml@g" \
-            /etc/graphscope-store/my.cnf.tpl > /etc/graphscope-store/my.cnf
+            sudo sed -e "s/GRAPH_NAME/$(GRAPH_NAME)/g" \
+                     -e "s/ROLE/$(ROLE)/g" \
+                     -e "s/INDEX/${ordinal}/g" \
+                     -e "s/KAFKA_SERVERS/$(KAFKA_SERVERS)/g" \
+                     -e "s/FRONTEND/$(DNS_NAME_PREFIX_FRONTEND)/g" \
+                     -e "s/INGESTOR/$(DNS_NAME_PREFIX_INGESTOR)/g" \
+                     -e "s/COORDINATOR/$(DNS_NAME_PREFIX_COORDINATOR)/g" \
+                     -e "s/STORE/$(DNS_NAME_PREFIX_STORE)/g" \
+                     -e "s@LOG4RS_CONFIG@${GRAPHSCOPE_HOME}/conf/log4rs.yml@g" \
+            /etc/graphscope-store/my.cnf.tpl | sudo tee /etc/graphscope-store/my.cnf
 
-            LOG_NAME=graphscope-store.log /home/maxgraph/bin/giectl maxgraph /etc/graphscope-store/my.cnf $(EXECUTOR)
+            LOG_NAME=graphscope-store.log ${GRAPHSCOPE_HOME}/bin/giectl maxgraph /etc/graphscope-store/my.cnf $(EXECUTOR)
             tail -f /dev/null
           env:
             - name: DEBUG

charts/graphscope-store/templates/ingestor/statefulset.yaml

@@ -68,18 +68,18 @@ spec:
 
             [[ `hostname` =~ -([0-9]+)$ ]] || exit 1
             ordinal=${BASH_REMATCH[1]}
-            sed -e "s/GRAPH_NAME/$(GRAPH_NAME)/g" \
-                -e "s/ROLE/$(ROLE)/g" \
-                -e "s/INDEX/${ordinal}/g" \
-                -e "s/KAFKA_SERVERS/$(KAFKA_SERVERS)/g" \
-                -e "s/FRONTEND/$(DNS_NAME_PREFIX_FRONTEND)/g" \
-                -e "s/INGESTOR/$(DNS_NAME_PREFIX_INGESTOR)/g" \
-                -e "s/COORDINATOR/$(DNS_NAME_PREFIX_COORDINATOR)/g" \
-                -e "s/STORE/$(DNS_NAME_PREFIX_STORE)/g" \
-                -e "s@LOG4RS_CONFIG@${GRAPHSCOPE_HOME}/conf/log4rs.yml@g" \
-            /etc/graphscope-store/my.cnf.tpl > /etc/graphscope-store/my.cnf
+            sudo sed -e "s/GRAPH_NAME/$(GRAPH_NAME)/g" \
+                     -e "s/ROLE/$(ROLE)/g" \
+                     -e "s/INDEX/${ordinal}/g" \
+                     -e "s/KAFKA_SERVERS/$(KAFKA_SERVERS)/g" \
+                     -e "s/FRONTEND/$(DNS_NAME_PREFIX_FRONTEND)/g" \
+                     -e "s/INGESTOR/$(DNS_NAME_PREFIX_INGESTOR)/g" \
+                     -e "s/COORDINATOR/$(DNS_NAME_PREFIX_COORDINATOR)/g" \
+                     -e "s/STORE/$(DNS_NAME_PREFIX_STORE)/g" \
+                     -e "s@LOG4RS_CONFIG@${GRAPHSCOPE_HOME}/conf/log4rs.yml@g" \
+            /etc/graphscope-store/my.cnf.tpl | sudo tee /etc/graphscope-store/my.cnf
 
-            LOG_NAME=graphscope-store.log /home/maxgraph/bin/giectl maxgraph /etc/graphscope-store/my.cnf ingestor
+            LOG_NAME=graphscope-store.log ${GRAPHSCOPE_HOME}/bin/giectl maxgraph /etc/graphscope-store/my.cnf ingestor
             tail -f /dev/null
           env:
             - name: DEBUG

charts/graphscope-store/templates/store/statefulset.yaml

@@ -68,18 +68,18 @@ spec:
 
             [[ `hostname` =~ -([0-9]+)$ ]] || exit 1
             ordinal=${BASH_REMATCH[1]}
-            sed -e "s/GRAPH_NAME/$(GRAPH_NAME)/g" \
-                -e "s/ROLE/$(ROLE)/g" \
-                -e "s/INDEX/${ordinal}/g" \
-                -e "s/KAFKA_SERVERS/$(KAFKA_SERVERS)/g" \
-                -e "s/FRONTEND/$(DNS_NAME_PREFIX_FRONTEND)/g" \
-                -e "s/INGESTOR/$(DNS_NAME_PREFIX_INGESTOR)/g" \
-                -e "s/COORDINATOR/$(DNS_NAME_PREFIX_COORDINATOR)/g" \
-                -e "s/STORE/$(DNS_NAME_PREFIX_STORE)/g" \
-                -e "s@LOG4RS_CONFIG@${GRAPHSCOPE_HOME}/conf/log4rs.yml@g" \
-            /etc/graphscope-store/my.cnf.tpl > /etc/graphscope-store/my.cnf
+            sudo sed -e "s/GRAPH_NAME/$(GRAPH_NAME)/g" \
+                     -e "s/ROLE/$(ROLE)/g" \
+                     -e "s/INDEX/${ordinal}/g" \
+                     -e "s/KAFKA_SERVERS/$(KAFKA_SERVERS)/g" \
+                     -e "s/FRONTEND/$(DNS_NAME_PREFIX_FRONTEND)/g" \
+                     -e "s/INGESTOR/$(DNS_NAME_PREFIX_INGESTOR)/g" \
+                     -e "s/COORDINATOR/$(DNS_NAME_PREFIX_COORDINATOR)/g" \
+                     -e "s/STORE/$(DNS_NAME_PREFIX_STORE)/g" \
+                     -e "s@LOG4RS_CONFIG@${GRAPHSCOPE_HOME}/conf/log4rs.yml@g" \
+            /etc/graphscope-store/my.cnf.tpl | sudo tee /etc/graphscope-store/my.cnf
 
-            LOG_NAME=graphscope-store.log /home/maxgraph/bin/giectl maxgraph /etc/graphscope-store/my.cnf $(EXECUTOR)
+            LOG_NAME=graphscope-store.log ${GRAPHSCOPE_HOME}/bin/giectl maxgraph /etc/graphscope-store/my.cnf $(EXECUTOR)
             tail -f /dev/null
           env:
             - name: DEBUG