You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@omid.apache.org by fp...@apache.org on 2016/05/11 18:06:50 UTC
[43/50] [abbrv] incubator-omid git commit: Fix benchmark configs to
let them run on secure Hbase
Fix benchmark configs to let them run on secure Hbase
Change-Id: Ifdd68c6ed75e7be9d758425468c3ee099b102127
Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/4c194978
Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/4c194978
Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/4c194978
Branch: refs/heads/master
Commit: 4c194978d1ffe80a4a45c4f14affa49db5c767fd
Parents: 41d2e23
Author: Igor Katkov <ka...@yahoo-inc.com>
Authored: Mon May 9 14:13:12 2016 -0700
Committer: Igor Katkov <ka...@yahoo-inc.com>
Committed: Mon May 9 14:13:12 2016 -0700
----------------------------------------------------------------------
benchmarks/bin/benchmarks.sh | 2 +-
benchmarks/bin/omid-env.sh | 7 +++++++
.../apache/omid/benchmarks/tso/TSOServerBenchmarkConfig.java | 6 +++---
.../main/resources/default-tso-server-benchmark-config.yml | 2 ++
4 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/4c194978/benchmarks/bin/benchmarks.sh
----------------------------------------------------------------------
diff --git a/benchmarks/bin/benchmarks.sh b/benchmarks/bin/benchmarks.sh
index 55b2031..c89e25f 100755
--- a/benchmarks/bin/benchmarks.sh
+++ b/benchmarks/bin/benchmarks.sh
@@ -20,7 +20,7 @@ for j in ../lib/*.jar; do
done
tso() {
- exec java $JVM_FLAGS -Dlog4j.configuration=log4j.xml -cp $CLASSPATH org.apache.omid.benchmarks.tso.TSOServerBenchmark $@
+ exec java $JVM_FLAGS -Dlog4j.configuration=file:../conf/log4j.xml -cp $CLASSPATH org.apache.omid.benchmarks.tso.TSOServerBenchmark $@
}
usage() {
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/4c194978/benchmarks/bin/omid-env.sh
----------------------------------------------------------------------
diff --git a/benchmarks/bin/omid-env.sh b/benchmarks/bin/omid-env.sh
index c15f6be..c76897c 100644
--- a/benchmarks/bin/omid-env.sh
+++ b/benchmarks/bin/omid-env.sh
@@ -1,2 +1,9 @@
# Set the flags to pass to the jvm when running omid
# export JVM_FLAGS=-Xmx2048m
+# ---------------------------------------------------------------------------------------------------------------------
+# Check if HADOOP_CONF_DIR and HBASE_CONF_DIR are set
+# ---------------------------------------------------------------------------------------------------------------------
+
+if [ -z ${HADOOP_CONF_DIR+x} ]; then echo "WARNING: HADOOP_CONF_DIR is unset"; else echo "HADOOP_CONF_DIR is set to '$HADOOP_CONF_DIR'"; fi
+if [ -z ${HBASE_CONF_DIR+x} ]; then echo "WARNING: HBASE_CONF_DIR is unset"; else echo "HBASE_CONF_DIR is set to '$HBASE_CONF_DIR'"; fi
+
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/4c194978/benchmarks/src/main/java/org/apache/omid/benchmarks/tso/TSOServerBenchmarkConfig.java
----------------------------------------------------------------------
diff --git a/benchmarks/src/main/java/org/apache/omid/benchmarks/tso/TSOServerBenchmarkConfig.java b/benchmarks/src/main/java/org/apache/omid/benchmarks/tso/TSOServerBenchmarkConfig.java
index 49797d4..ccb1d81 100644
--- a/benchmarks/src/main/java/org/apache/omid/benchmarks/tso/TSOServerBenchmarkConfig.java
+++ b/benchmarks/src/main/java/org/apache/omid/benchmarks/tso/TSOServerBenchmarkConfig.java
@@ -26,8 +26,8 @@ import org.apache.omid.tso.client.OmidClientConfiguration;
public class TSOServerBenchmarkConfig extends SecureHBaseConfig {
- private static final String DEFAULT_CONFIG_FILE_NAME = "tso-server-benchmark-config.yml";
- private static final String CONFIG_FILE_NAME = "default-tso-server-benchmark-config.yml";
+ private static final String CONFIG_FILE_NAME = "tso-server-benchmark-config.yml";
+ private static final String DEFAULT_CONFIG_FILE_NAME = "default-tso-server-benchmark-config.yml";
private long benchmarkRunLengthInMins;
@@ -54,7 +54,7 @@ public class TSOServerBenchmarkConfig extends SecureHBaseConfig {
}
TSOServerBenchmarkConfig(String configFileName) {
- new YAMLUtils().loadSettings(DEFAULT_CONFIG_FILE_NAME, configFileName, this);
+ new YAMLUtils().loadSettings(configFileName, DEFAULT_CONFIG_FILE_NAME, this);
}
// ----------------------------------------------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/4c194978/benchmarks/src/main/resources/default-tso-server-benchmark-config.yml
----------------------------------------------------------------------
diff --git a/benchmarks/src/main/resources/default-tso-server-benchmark-config.yml b/benchmarks/src/main/resources/default-tso-server-benchmark-config.yml
index fd2dd58..c5eacd1 100644
--- a/benchmarks/src/main/resources/default-tso-server-benchmark-config.yml
+++ b/benchmarks/src/main/resources/default-tso-server-benchmark-config.yml
@@ -53,6 +53,8 @@ omidClientConfiguration: !!org.apache.omid.tso.client.OmidClientConfiguration
# ---------------------------------------------------------------------------------------------------------------------
commitTableStoreModule: !!org.apache.omid.committable.hbase.DefaultHBaseCommitTableStorageModule
tableName: "OMID_COMMIT_TABLE"
+# principal: omid_hbase_user
+# keytab: /path/to/hbase/user/keytab
# ---------------------------------------------------------------------------------------------------------------------
# Metrics configuration