From 6dcfea24562df854ea33eb688a0dcb86d8eeb001 Mon Sep 17 00:00:00 2001 From: Tao He Date: Thu, 25 Feb 2021 21:05:59 +0800 Subject: [PATCH] Use more cpu resources for etcd in CI. Signed-off-by: Tao He --- interactive_engine/tests/function_test.sh | 2 +- python/graphscope/deploy/tests/test_demo_script.py | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/interactive_engine/tests/function_test.sh b/interactive_engine/tests/function_test.sh index 3765f5f0919d..a975b3529273 100755 --- a/interactive_engine/tests/function_test.sh +++ b/interactive_engine/tests/function_test.sh @@ -34,7 +34,7 @@ function _start { curl -XPOST http://localhost:${_port} -d 'import graphscope' curl -XPOST http://localhost:${_port} -d 'graphscope.set_option(show_log=True)' curl -XPOST http://localhost:${_port} -d 'from graphscope.framework.loader import Loader' - curl_sess="curl -XPOST http://localhost:${_port} -d 'session = graphscope.session(num_workers=${workers}, k8s_volumes={\"data\": {\"type\": \"hostPath\", \"field\": {\"path\": \"${GS_TEST_DIR}\", \"type\": \"Directory\"}, \"mounts\": {\"mountPath\": \"/testingdata\"}}}, k8s_coordinator_cpu=1.0, k8s_coordinator_mem='\''4Gi'\'', k8s_vineyard_cpu=1.0, k8s_vineyard_mem='\''4Gi'\'', k8s_vineyard_shared_mem='\''4Gi'\'', k8s_engine_cpu=1.0, k8s_engine_mem='\''4Gi'\'', k8s_gie_graph_manager_image='\''${gie_manager_image}'\'', k8s_gs_image='\''${gs_image}'\'')' --write-out %{http_code} --silent --output ./curl.tmp" + curl_sess="curl -XPOST http://localhost:${_port} -d 'session = graphscope.session(num_workers=${workers}, k8s_volumes={\"data\": {\"type\": \"hostPath\", \"field\": {\"path\": \"${GS_TEST_DIR}\", \"type\": \"Directory\"}, \"mounts\": {\"mountPath\": \"/testingdata\"}}}, k8s_coordinator_cpu=1.0, k8s_coordinator_mem='\''4Gi'\'', k8s_vineyard_cpu=1.0, k8s_vineyard_mem='\''4Gi'\'', k8s_vineyard_shared_mem='\''4Gi'\'', k8s_engine_cpu=1.0, k8s_engine_mem='\''4Gi'\'', k8s_etcd_cpu=2, k8s_gie_graph_manager_image='\''${gie_manager_image}'\'', k8s_gs_image='\''${gs_image}'\'')' --write-out %{http_code} --silent --output ./curl.tmp" echo $curl_sess code=`sh -c "$curl_sess"` diff --git a/python/graphscope/deploy/tests/test_demo_script.py b/python/graphscope/deploy/tests/test_demo_script.py index 31a670a410a7..6cad2fdf1e1d 100644 --- a/python/graphscope/deploy/tests/test_demo_script.py +++ b/python/graphscope/deploy/tests/test_demo_script.py @@ -82,6 +82,7 @@ def test_demo(data_dir): k8s_vineyard_mem="512Mi", k8s_engine_cpu=0.1, k8s_engine_mem="1500Mi", + k8s_etcd_cpu=2, k8s_vineyard_shared_mem="2Gi", k8s_volumes=get_k8s_volumes(), ) @@ -121,6 +122,7 @@ def test_demo_distribute(data_dir, modern_graph_data_dir): k8s_vineyard_mem="512Mi", k8s_engine_cpu=0.1, k8s_engine_mem="1500Mi", + k8s_etcd_cpu=2, k8s_vineyard_shared_mem="2Gi", k8s_volumes=get_k8s_volumes(), ) @@ -201,6 +203,7 @@ def test_multiple_session(data_dir): k8s_engine_cpu=0.1, k8s_engine_mem="1500Mi", k8s_vineyard_shared_mem="2Gi", + k8s_etcd_cpu=2, k8s_volumes=get_k8s_volumes(), ) info = sess.info @@ -220,6 +223,7 @@ def test_multiple_session(data_dir): k8s_engine_cpu=0.1, k8s_engine_mem="1500Mi", k8s_vineyard_shared_mem="2Gi", + k8s_etcd_cpu=2, k8s_volumes=get_k8s_volumes(), ) @@ -245,6 +249,7 @@ def test_query_modern_graph(modern_graph_data_dir): k8s_engine_cpu=0.1, k8s_engine_mem="1500Mi", k8s_vineyard_shared_mem="2Gi", + k8s_etcd_cpu=2, k8s_volumes=get_k8s_volumes(), ) graph = load_modern_graph(sess, modern_graph_data_dir) @@ -278,6 +283,7 @@ def test_traversal_modern_graph(modern_graph_data_dir): k8s_engine_cpu=0.1, k8s_engine_mem="1500Mi", k8s_vineyard_shared_mem="2Gi", + k8s_etcd_cpu=2, k8s_volumes=get_k8s_volumes(), ) graph = load_modern_graph(sess, modern_graph_data_dir) @@ -325,6 +331,7 @@ def test_serialize_roundtrip(p2p_property_dir): k8s_engine_cpu=0.1, k8s_engine_mem="1500Mi", k8s_vineyard_shared_mem="2Gi", + k8s_etcd_cpu=2, k8s_volumes=get_k8s_volumes(), ) graph = sess.load_from(