Skip to content

Commit

Permalink
Remove the legacy code related to graph manager and make default user…
Browse files Browse the repository at this point in the history
… 'graphscope' in graphscope-store image (#748)

* Fix nightly dockerfile

* Fix permission problem of graphscope-store image when using non-root user
  • Loading branch information
lidongze0629 committed Sep 1, 2021
1 parent e686143 commit 1e602fc
Show file tree
Hide file tree
Showing 20 changed files with 71 additions and 133 deletions.
6 changes: 1 addition & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
11 changes: 0 additions & 11 deletions .github/workflows/docker_nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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:
Expand All @@ -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
14 changes: 5 additions & 9 deletions .github/workflows/graphscope-store.Dockerfile
Original file line number Diff line number Diff line change
@@ -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
5 changes: 2 additions & 3 deletions README-zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 包
Expand Down Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
20 changes: 10 additions & 10 deletions charts/graphscope-store/templates/coordinator/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 /usr/local/bin/giectl maxgraph /etc/graphscope-store/my.cnf coordinator
tail -f /dev/null
env:
- name: DEBUG
Expand Down
22 changes: 11 additions & 11 deletions charts/graphscope-store/templates/frontend/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 /usr/local/bin/giectl maxgraph /etc/graphscope-store/my.cnf $(EXECUTOR)
tail -f /dev/null
env:
- name: DEBUG
Expand Down
22 changes: 11 additions & 11 deletions charts/graphscope-store/templates/ingestor/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 /usr/local/bin/giectl maxgraph /etc/graphscope-store/my.cnf ingestor
tail -f /dev/null
env:
- name: DEBUG
Expand Down
22 changes: 11 additions & 11 deletions charts/graphscope-store/templates/store/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 /usr/local/bin/giectl maxgraph /etc/graphscope-store/my.cnf $(EXECUTOR)
tail -f /dev/null
env:
- name: DEBUG
Expand Down
27 changes: 12 additions & 15 deletions k8s/graphscope-store.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,19 @@ ENV NETWORKX=$NETWORKX
ARG profile=debug
ENV profile=$profile

COPY . /root/gs
COPY ./interactive_engine/deploy/docker/dockerfile/maven.settings.xml /root/.m2/settings.xml
COPY . /home/graphscope/gs
COPY ./interactive_engine/deploy/docker/dockerfile/maven.settings.xml /home/graphscope/.m2/settings.xml

RUN wget --no-verbose https://golang.org/dl/go1.15.5.linux-amd64.tar.gz && \
tar -C /usr/local -xzf go1.15.5.linux-amd64.tar.gz && \
RUN sudo chown -R graphscope:graphscope /home/graphscope/gs /home/graphscope/.m2 && \
wget --no-verbose https://golang.org/dl/go1.15.5.linux-amd64.tar.gz && \
sudo tar -C /usr/local -xzf go1.15.5.linux-amd64.tar.gz && \
curl -sf -L https://static.rust-lang.org/rustup.sh | \
sh -s -- -y --profile minimal --default-toolchain 1.54.0 && \
echo "source ~/.cargo/env" >> ~/.bashrc \
&& source ~/.bashrc \
&& rustup component add rustfmt \
&& echo "build with profile: $profile" \
&& cd /root/gs/interactive_engine \
&& cd /home/graphscope/gs/interactive_engine \
&& export CMAKE_PREFIX_PATH=/opt/graphscope \
&& export LIBRARY_PATH=$LIBRARY_PATH:/opt/graphscope/lib \
&& export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/graphscope/lib \
Expand All @@ -35,13 +36,9 @@ FROM registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-runtime:latest

COPY ./k8s/ready_probe.sh /tmp/ready_probe.sh
COPY --from=builder /opt/graphscope /usr/local/
COPY --from=builder /root/gs/interactive_engine/distribution/target/maxgraph.tar.gz /tmp/maxgraph.tar.gz
RUN mkdir -p /home/maxgraph \
&& tar -zxf /tmp/maxgraph.tar.gz -C /home/maxgraph
RUN mkdir -p /home/maxgraph/{bin,conf}
COPY --from=builder /root/gs/interactive_engine/bin/giectl /home/maxgraph/bin/giectl
COPY --from=builder /root/gs/interactive_engine/conf/* /home/maxgraph/conf/

ENV GRAPHSCOPE_HOME=/home/maxgraph
ENV GRAPHSCOPE_RUNTIME=/tmp/graphscope
WORKDIR /home/maxgraph/
COPY --from=builder /home/graphscope/gs/interactive_engine/distribution/target/maxgraph.tar.gz /tmp/maxgraph.tar.gz
RUN sudo tar -zxf /tmp/maxgraph.tar.gz -C /usr/local
COPY --from=builder /home/graphscope/gs/interactive_engine/bin/giectl /usr/local/bin/giectl
COPY --from=builder /home/graphscope/gs/interactive_engine/conf/* /usr/local/conf/

ENV GRAPHSCOPE_HOME=/usr/local
2 changes: 1 addition & 1 deletion k8s/graphscope.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# the result image includes all runtime stuffs of graphscope, with analytical engine,
# learning engine and interactive engine installed.

ARG BASE_VERSION=latest
ARG BASE_VERSION=v0.2.6
FROM registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-vineyard:$BASE_VERSION as builder

SHELL ["/usr/bin/scl", "enable", "devtoolset-7"]
Expand Down
2 changes: 0 additions & 2 deletions proto/types.proto
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,6 @@ enum ParamKey {

DISTRIBUTED = 27;
SCHEMA_PATH = 31;
GIE_GREMLIN_SERVER_CPU = 32;
GIE_GREMLIN_SERVER_MEM = 33;
GIE_GREMLIN_ENGINE_PARAMS = 34;
GIE_GREMLIN_QUERY_MESSAGE = 35;
GIE_GREMLIN_REQUEST_OPTIONS = 36;
Expand Down
8 changes: 0 additions & 8 deletions python/graphscope/client/session.py
Original file line number Diff line number Diff line change
Expand Up @@ -1206,10 +1206,6 @@ def set_option(**kwargs):
- k8s_mars_worker_mem
- k8s_mars_scheduler_cpu
- k8s_mars_scheduler_mem
- k8s_gie_gremlin_server_cpu
Minimum number of CPU cores request for gremlin pod. Defaults to 0.5.
- k8s_gie_gremlin_server_mem
Minimum number of memory request for gremlin pod. Defaults to '512Mi'.
- with_mars
- enable_gaia
- k8s_volumes
Expand Down Expand Up @@ -1265,10 +1261,6 @@ def get_option(key):
- k8s_mars_worker_mem
- k8s_mars_scheduler_cpu
- k8s_mars_scheduler_mem
- k8s_gie_gremlin_server_cpu
Minimum number of CPU cores request for gremlin pod. Defaults to 0.5.
- k8s_gie_gremlin_server_mem
Minimum number of memory request for gremlin pod. Defaults to '512Mi'.
- with_mars
- enable_gaia
- k8s_volumes
Expand Down
4 changes: 0 additions & 4 deletions python/graphscope/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,6 @@ class GSConfig(object):
k8s_etcd_cpu = 1.0
k8s_etcd_mem = "512Mi"

# GIE gremlin server resource configuration
k8s_gie_gremlin_server_cpu = 0.5
k8s_gie_gremlin_server_mem = "512Mi"

# vineyard resource configuration
k8s_vineyard_daemonset = "none"
k8s_vineyard_cpu = 0.2
Expand Down
6 changes: 1 addition & 5 deletions python/graphscope/framework/dag_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -925,7 +925,7 @@ def graph_to_dataframe(graph, selector=None, vertex_range=None):
return op


def create_interactive_query(graph, engine_params, cpu, mem, enable_gaia):
def create_interactive_query(graph, engine_params, enable_gaia):
"""Create a interactive engine that query on the :code:`graph`
Args:
Expand All @@ -934,15 +934,11 @@ def create_interactive_query(graph, engine_params, cpu, mem, enable_gaia):
engine_params (dict, optional):
Configuration to startup the interactive engine. See detail in:
`interactive_engine/deploy/docker/dockerfile/executor.vineyard.properties`
cpu (float): The number of CPU cores for gremlin server.
mem (str): The number of mem for gremlin server.
Returns:
An op to create a interactive engine based on a graph.
"""
config = {}
config[types_pb2.GIE_GREMLIN_SERVER_CPU] = utils.f_to_attr(cpu)
config[types_pb2.GIE_GREMLIN_SERVER_MEM] = utils.s_to_attr(mem)
if engine_params is not None:
config[types_pb2.GIE_GREMLIN_ENGINE_PARAMS] = utils.s_to_attr(
json.dumps(engine_params)
Expand Down
3 changes: 0 additions & 3 deletions python/graphscope/interactive/query.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
from gremlin_python.driver.driver_remote_connection import DriverRemoteConnection
from gremlin_python.process.anonymous_traversal import traversal

from graphscope.config import GSConfig as gs_config
from graphscope.framework.dag import DAGNode
from graphscope.framework.dag_utils import close_interactive_query
from graphscope.framework.dag_utils import create_interactive_query
Expand Down Expand Up @@ -139,8 +138,6 @@ def __init__(self, session, graph, engine_params=None, enable_gaia=False):
self._op = create_interactive_query(
self._graph,
self._engine_params,
gs_config.k8s_gie_gremlin_server_cpu,
gs_config.k8s_gie_gremlin_server_mem,
enable_gaia,
)
# add op to dag
Expand Down
4 changes: 1 addition & 3 deletions python/tests/kubernetes/test_demo_script.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@
from graphscope.framework.graph import Graph
from graphscope.framework.loader import Loader

graphscope.set_option(
show_log=True, k8s_gie_gremlin_server_cpu=1.0, k8s_gie_gremlin_server_mem="4Gi"
)
graphscope.set_option(show_log=True)
logger = logging.getLogger("graphscope")


Expand Down
4 changes: 1 addition & 3 deletions python/tests/kubernetes/test_with_gaia.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@
from graphscope.config import GSConfig as gs_config
from graphscope.dataset.modern_graph import load_modern_graph

graphscope.set_option(
show_log=True, k8s_gie_gremlin_server_cpu=1.0, k8s_gie_gremlin_server_mem="4Gi"
)
graphscope.set_option(show_log=True)
logger = logging.getLogger("graphscope")


Expand Down

0 comments on commit 1e602fc

Please sign in to comment.