geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n...@apache.org
Subject [geode-benchmarks] branch develop updated: Revert "Removed an unknown JVM parameter"
Date Tue, 04 Dec 2018 20:47:55 GMT
This is an automated email from the ASF dual-hosted git repository.

nnag pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-benchmarks.git


The following commit(s) were added to refs/heads/develop by this push:
     new 3d09c6a  Revert "Removed an unknown JVM parameter"
3d09c6a is described below

commit 3d09c6aa32cac4c29fffad945902c78d4feb68c6
Author: nabarun <nag@cs.wisc.edu>
AuthorDate: Tue Dec 4 12:47:41 2018 -0800

    Revert "Removed an unknown JVM parameter"
    
    This reverts commit 05c82aa6381019d05255701558241208266b4e13.
---
 .../benchmark/configure/ClientServerTopology.java  | 19 -------------------
 .../geode/benchmark/parameters/JVMParameters.java  |  1 +
 infrastructure/google_cloud/run_tests.sh           | 22 +++++++++++-----------
 3 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/configure/ClientServerTopology.java
b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/configure/ClientServerTopology.java
deleted file mode 100644
index 1c993e0..0000000
--- a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/configure/ClientServerTopology.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for additional information
regarding
- * copyright ownership. The ASF licenses this file to You under the Apache License, Version
2.0 (the
- * "License"); you may not use this file except in compliance with the License. You may obtain
a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express
- * or implied. See the License for the specific language governing permissions and limitations
under
- * the License.
- */
-package org.apache.geode.benchmark.configure;
-
-public class ClientServerTopology {
-//  public static void configu
-}
diff --git a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/parameters/JVMParameters.java
b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/parameters/JVMParameters.java
index bf08429..9fb150c 100644
--- a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/parameters/JVMParameters.java
+++ b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/parameters/JVMParameters.java
@@ -28,6 +28,7 @@ public class JVMParameters {
       "-XX:GCLogFileSize=1M",
       "-XX:+UnlockDiagnosticVMOptions",
       "-XX:ParGCCardsPerStrideChunk=32768",
+      "-XX:OnOutOfMemoryError='\''kill -9 %p'\''",
       "-XX:+UseNUMA",
       "-XX:+UseConcMarkSweepGC",
       "-XX:+UseCMSInitiatingOccupancyOnly",
diff --git a/infrastructure/google_cloud/run_tests.sh b/infrastructure/google_cloud/run_tests.sh
index f9fdac6..477a75a 100755
--- a/infrastructure/google_cloud/run_tests.sh
+++ b/infrastructure/google_cloud/run_tests.sh
@@ -24,23 +24,23 @@ OUTPUT=${3:-output-${DATE}-${TAG}}
 BENCHMARK_BRANCH=${4:-develop}
 PREFIX="geode-performance-${TAG}"
 
-#INSTANCES=$(gcloud compute instance-groups list-instances ${PREFIX} | grep "${TAG}" | awk
'{print $1}')
+INSTANCES=$(gcloud compute instance-groups list-instances ${PREFIX} | grep "${TAG}" | awk
'{print $1}')
 
 
-HOSTS=(r02-s06.maas.gemstone.com r02-s08.maas.gemstone.com r02-s10.maas.gemstone.com r02-s14.maas.gemstone.com)
+HOSTS=$(echo ${INSTANCES} | tr ' ' ',')
 
-#FIRST_INSTANCE=$(echo ${INSTANCES} | awk '{print $1}' )
+FIRST_INSTANCE=$(echo ${INSTANCES} | awk '{print $1}' )
 
-ssh r02-s06.maas.gemstone.com << EOF
-  git clone --depth=1 https://github.com/apache/geode --branch ${BRANCH} geode
-  rgit clone https://github.com/apache/geode-benchmaks --branch ${BENCHMARK_BRANCH}
-  cd geode-benchmarks &&
-  ./gradlew --include-build ../geode benchmark -Phosts=r02-s06.maas.gemstone.com,r02-s08.maas.gemstone.com,r02-s10.maas.gemstone.com,r02-s14.maas.gemstone.com,r02-s18.maas.gemstone.com
--no-daemon
-EOF
+gcloud compute ssh geode@$FIRST_INSTANCE --command="\
+  rm -rf geode-benchmarks geode && \
+  git clone --depth=1 https://github.com/apache/geode --branch ${BRANCH} geode &&
\
+  git clone https://github.com/apache/geode-benchmarks --branch ${BENCHMARK_BRANCH} &&
\
+  cd geode-benchmarks && \
+  ./gradlew --include-build ../geode benchmark -Phosts=${HOSTS}"
 
 
 mkdir -p ${OUTPUT}
 
-scp --recurse r02-s06.maas.gemstone.com:geode-benchmarks/geode-benchmarks/build/reports ${OUTPUT}/reports
+gcloud compute scp --recurse geode@${FIRST_INSTANCE}:geode-benchmarks/geode-benchmarks/build/reports
${OUTPUT}/reports
 
-scp --recurse r02-s06.maas.gemstone.com:geode-benchmarks/geode-benchmarks/build/benchmarks
${OUTPUT}
+gcloud compute scp --recurse geode@${FIRST_INSTANCE}:geode-benchmarks/geode-benchmarks/build/benchmarks
${OUTPUT}


Mime
View raw message