aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/run_tests/stress_test/configs/java.json
diff options
context:
space:
mode:
authorGravatar David Garcia Quintas <dgq@google.com>2016-05-18 10:29:57 -0700
committerGravatar David Garcia Quintas <dgq@google.com>2016-05-18 10:29:57 -0700
commit8f7365021ff1ab65ea893fd52d28875f298ac8f9 (patch)
treeecc05dc0e75aa1f0c307822423bf97adb4cf16eb /tools/run_tests/stress_test/configs/java.json
parent51341eaa06d2d92950972bfbc515243362b10597 (diff)
parentfcbe7daf832dcb616fc93ca59c3b1aab279f510e (diff)
Merge branch 'master' of github.com:grpc/grpc into compression_md_level_bis
Diffstat (limited to 'tools/run_tests/stress_test/configs/java.json')
-rw-r--r--tools/run_tests/stress_test/configs/java.json4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/run_tests/stress_test/configs/java.json b/tools/run_tests/stress_test/configs/java.json
index c07d75e79d..b7c6d8b286 100644
--- a/tools/run_tests/stress_test/configs/java.json
+++ b/tools/run_tests/stress_test/configs/java.json
@@ -23,7 +23,7 @@
"total_only": "true"
},
"env": {
- "STRESSTEST_CLIENT_OPTS":"-Xmx3g -Xms3g -XX:NewSize=1.5g -XX:MaxNewSize=1.5g"
+ "STRESSTEST_CLIENT_OPTS":"-Xmx3g -Xms3g -XX:NewSize=1500m -XX:MaxNewSize=1500m -XX:+UseConcMarkSweepGC"
}
}
},
@@ -50,7 +50,7 @@
"use_tls": "false"
},
"env": {
- "TEST_SERVER_OPTS":"-Xmx3g -Xms3g -XX:NewSize=1.5g -XX:MaxNewSize=1.5g"
+ "TEST_SERVER_OPTS":"-Xmx3g -Xms3g -XX:NewSize=1500m -XX:MaxNewSize=1500m -XX:+UseConcMarkSweepGC"
}
}
},