From 73b6a3b63bc40f836b068c4ac3b8cc45b98f7bbc Mon Sep 17 00:00:00 2001
From: Sree Kuchibhotla <sreek@google.com>
Date: Mon, 4 Apr 2016 22:38:53 -0700
Subject: [PATCH] Config file settings
---
tools/run_tests/stress_test/configs/asan.json | 10 +-
.../stress_test/configs/node-cxx.json | 97 +++++++++++++++++++
tools/run_tests/stress_test/configs/node.json | 12 +--
.../stress_test/configs/opt-tsan-asan.json | 14 +--
tools/run_tests/stress_test/configs/opt.json | 6 +-
tools/run_tests/stress_test/configs/tsan.json | 10 +-
6 files changed, 123 insertions(+), 26 deletions(-)
create mode 100644 tools/run_tests/stress_test/configs/node-cxx.json
diff --git a/tools/run_tests/stress_test/configs/asan.json b/tools/run_tests/stress_test/configs/asan.json
index e17077b7d5..768088d93d 100644
--- a/tools/run_tests/stress_test/configs/asan.json
+++ b/tools/run_tests/stress_test/configs/asan.json
@@ -17,7 +17,7 @@
"num_stubs_per_channel":10,
"test_cases": "empty_unary:1,large_unary:1,client_streaming:1,server_streaming:1,empty_stream:1",
"metrics_port": 8081,
- "metrics_collection_interval_secs":10
+ "metrics_collection_interval_secs":60
},
"metricsPort": 8081,
"metricsArgs": {
@@ -66,7 +66,7 @@
"stress-client-asan": {
"clientTemplate": "cxx_client_asan",
"dockerImage": "grpc_stress_cxx_asan",
- "numInstances": 10,
+ "numInstances": 20,
"serverPodSpec": "stress-server-asan"
}
}
@@ -74,9 +74,9 @@
"globalSettings": {
"buildDockerImages": true,
- "pollIntervalSecs": 10,
- "testDurationSecs": 60,
- "kubernetesProxyPort": 8001,
+ "pollIntervalSecs": 60,
+ "testDurationSecs": 7200,
+ "kubernetesProxyPort": 8003,
"datasetIdNamePrefix": "stress_test_asan",
"summaryTableId": "summary",
"qpsTableId": "qps",
diff --git a/tools/run_tests/stress_test/configs/node-cxx.json b/tools/run_tests/stress_test/configs/node-cxx.json
new file mode 100644
index 0000000000..c4245bf9df
--- /dev/null
+++ b/tools/run_tests/stress_test/configs/node-cxx.json
@@ -0,0 +1,97 @@
+{
+ "dockerImages": {
+ "grpc_stress_cxx_opt" : {
+ "buildScript": "tools/jenkins/build_interop_stress_image.sh",
+ "dockerFileDir": "grpc_interop_stress_cxx",
+ "buildType": "opt"
+ },
+ "grpc_stress_node": {
+ "buildScript": "tools/jenkins/build_interop_stress_image.sh",
+ "dockerFileDir": "grpc_interop_stress_node"
+ }
+ },
+
+ "clientTemplates": {
+ "baseTemplates": {
+ "default": {
+ "wrapperScriptPath": "/var/local/git/grpc/tools/gcp/stress_test/run_client.py",
+ "pollIntervalSecs": 60,
+ "clientArgs": {
+ "num_channels_per_server":5,
+ "num_stubs_per_channel":10,
+ "test_cases": "empty_unary:1,large_unary:1,client_streaming:1,server_streaming:1,empty_stream:1",
+ "metrics_port": 8081
+ },
+ "metricsPort": 8081,
+ "metricsArgs": {
+ "metrics_server_address": "localhost:8081",
+ "total_only": "true"
+ }
+ }
+ },
+ "templates": {
+ "node_client": {
+ "baseTemplate": "default",
+ "stressClientCmd": [
+ "/var/local/git/grpc/tools/gcp/stress_test/run_node.sh",
+ "node",
+ "/var/local/git/grpc/src/node/stress/stress_client.js"
+ ],
+ "metricsClientCmd": [
+ "/var/local/git/grpc/tools/gcp/stress_test/run_node.sh",
+ "node",
+ "/var/local/git/grpc/src/node/stress/metrics_client.js"
+ ]
+ }
+ }
+ },
+
+ "serverTemplates": {
+ "baseTemplates":{
+ "default": {
+ "wrapperScriptPath": "/var/local/git/grpc/tools/gcp/stress_test/run_server.py",
+ "serverPort": 8080,
+ "serverArgs": {
+ "port": 8080
+ }
+ }
+ },
+ "templates": {
+ "cxx_server_opt": {
+ "baseTemplate": "default",
+ "stressServerCmd": ["/var/local/git/grpc/bins/opt/interop_server"]
+ }
+ }
+ },
+
+ "testMatrix": {
+ "serverPodSpecs": {
+ "stress-server-cxx-opt": {
+ "serverTemplate": "cxx_server_opt",
+ "dockerImage": "grpc_stress_cxx_opt",
+ "numInstances": 1
+ }
+ },
+
+ "clientPodSpecs": {
+ "stress-client-node": {
+ "clientTemplate": "node_client",
+ "dockerImage": "grpc_stress_node",
+ "numInstances": 20,
+ "serverPodSpec": "stress-server-cxx-opt"
+ }
+ }
+ },
+
+ "globalSettings": {
+ "buildDockerImages": true,
+ "pollIntervalSecs": 60,
+ "testDurationSecs": 7200,
+ "kubernetesProxyPort": 8006,
+ "datasetIdNamePrefix": "stress_test_node_cxx_opt",
+ "summaryTableId": "summary",
+ "qpsTableId": "qps",
+ "podWarmupSecs": 60
+ }
+}
+
diff --git a/tools/run_tests/stress_test/configs/node.json b/tools/run_tests/stress_test/configs/node.json
index 0c5262a78a..7a48c56a5e 100644
--- a/tools/run_tests/stress_test/configs/node.json
+++ b/tools/run_tests/stress_test/configs/node.json
@@ -76,21 +76,21 @@
"node-stress-client": {
"clientTemplate": "node_client",
"dockerImage": "grpc_stress_node",
- "numInstances": 2,
+ "numInstances": 15,
"serverPodSpec": "node-stress-server"
}
}
},
"globalSettings": {
- "buildDockerImages": false,
- "pollIntervalSecs": 10,
- "testDurationSecs": 120,
- "kubernetesProxyPort": 8001,
+ "buildDockerImages": true,
+ "pollIntervalSecs": 60,
+ "testDurationSecs": 7200,
+ "kubernetesProxyPort": 8005,
"datasetIdNamePrefix": "stress_test_node",
"summaryTableId": "summary",
"qpsTableId": "qps",
- "podWarmupSecs": 10
+ "podWarmupSecs": 60
}
}
diff --git a/tools/run_tests/stress_test/configs/opt-tsan-asan.json b/tools/run_tests/stress_test/configs/opt-tsan-asan.json
index b49683a014..4f172ef30b 100644
--- a/tools/run_tests/stress_test/configs/opt-tsan-asan.json
+++ b/tools/run_tests/stress_test/configs/opt-tsan-asan.json
@@ -27,7 +27,7 @@
"num_stubs_per_channel":10,
"test_cases": "empty_unary:1,large_unary:1,client_streaming:1,server_streaming:1,empty_stream:1",
"metrics_port": 8081,
- "metrics_collection_interval_secs":10
+ "metrics_collection_interval_secs": 60
},
"metricsPort": 8081,
"metricsArgs": {
@@ -104,19 +104,19 @@
"stress-client-opt": {
"clientTemplate": "cxx_client_opt",
"dockerImage": "grpc_stress_cxx_opt",
- "numInstances": 3,
+ "numInstances": 5,
"serverPodSpec": "stress-server-opt"
},
"stress-client-tsan": {
"clientTemplate": "cxx_client_tsan",
"dockerImage": "grpc_stress_cxx_tsan",
- "numInstances": 3,
+ "numInstances": 10,
"serverPodSpec": "stress-server-tsan"
},
"stress-client-asan": {
"clientTemplate": "cxx_client_asan",
"dockerImage": "grpc_stress_cxx_asan",
- "numInstances": 3,
+ "numInstances": 10,
"serverPodSpec": "stress-server-asan"
}
}
@@ -124,9 +124,9 @@
"globalSettings": {
"buildDockerImages": true,
- "pollIntervalSecs": 10,
- "testDurationSecs": 60,
- "kubernetesProxyPort": 8001,
+ "pollIntervalSecs": 60,
+ "testDurationSecs": 7200,
+ "kubernetesProxyPort": 8004,
"datasetIdNamePrefix": "stress_test_opt_tsan",
"summaryTableId": "summary",
"qpsTableId": "qps",
diff --git a/tools/run_tests/stress_test/configs/opt.json b/tools/run_tests/stress_test/configs/opt.json
index ae8c00a36d..ffd4a704c3 100644
--- a/tools/run_tests/stress_test/configs/opt.json
+++ b/tools/run_tests/stress_test/configs/opt.json
@@ -17,7 +17,7 @@
"num_stubs_per_channel":10,
"test_cases": "empty_unary:1,large_unary:1,client_streaming:1,server_streaming:1,empty_stream:1",
"metrics_port": 8081,
- "metrics_collection_interval_secs":10
+ "metrics_collection_interval_secs": 60
},
"metricsPort": 8081,
"metricsArgs": {
@@ -74,8 +74,8 @@
"globalSettings": {
"buildDockerImages": true,
- "pollIntervalSecs": 10,
- "testDurationSecs": 60,
+ "pollIntervalSecs": 60,
+ "testDurationSecs": 7200,
"kubernetesProxyPort": 8001,
"datasetIdNamePrefix": "stress_test_opt",
"summaryTableId": "summary",
diff --git a/tools/run_tests/stress_test/configs/tsan.json b/tools/run_tests/stress_test/configs/tsan.json
index 8d8c954099..f8d3f878e1 100644
--- a/tools/run_tests/stress_test/configs/tsan.json
+++ b/tools/run_tests/stress_test/configs/tsan.json
@@ -17,7 +17,7 @@
"num_stubs_per_channel":10,
"test_cases": "empty_unary:1,large_unary:1,client_streaming:1,server_streaming:1,empty_stream:1",
"metrics_port": 8081,
- "metrics_collection_interval_secs":10
+ "metrics_collection_interval_secs":60
},
"metricsPort": 8081,
"metricsArgs": {
@@ -66,7 +66,7 @@
"stress-client-tsan": {
"clientTemplate": "cxx_client_tsan",
"dockerImage": "grpc_stress_cxx_tsan",
- "numInstances": 10,
+ "numInstances": 20,
"serverPodSpec": "stress-server-tsan"
}
}
@@ -74,9 +74,9 @@
"globalSettings": {
"buildDockerImages": true,
- "pollIntervalSecs": 10,
- "testDurationSecs": 60,
- "kubernetesProxyPort": 8001,
+ "pollIntervalSecs": 60,
+ "testDurationSecs": 7200,
+ "kubernetesProxyPort": 8002,
"datasetIdNamePrefix": "stress_test_tsan",
"summaryTableId": "summary",
"qpsTableId": "qps",
--
GitLab