mikewalch closed pull request #199: Fixes #196 Autogenerate the properties needed by Accumulo ITs URL: https://github.com/apache/fluo-uno/pull/199
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/bin/impl/setup-accumulo.sh b/bin/impl/setup-accumulo.sh index 2979c55..cf94ea8 100755 --- a/bin/impl/setup-accumulo.sh +++ b/bin/impl/setup-accumulo.sh @@ -73,6 +73,15 @@ $SED "s#ACCUMULO_IMAP_SIZE#$ACCUMULO_IMAP_SIZE#" "$accumulo_conf" $SED "s#ACCUMULO_USE_NATIVE_MAP#$ACCUMULO_USE_NATIVE_MAP#" "$accumulo_conf" $SED "s#UNO_HOST#$UNO_HOST#" "$accumulo_conf" +cp "$UNO_HOME/conf/accumulo/accumulo-it.properties" "$conf" +it_props="$conf/accumulo-it.properties" +$SED "s#ACCUMULO_USER#$ACCUMULO_USER#" "$it_props" +$SED "s#ACCUMULO_PASSWORD#$ACCUMULO_PASSWORD#" "$it_props" +$SED "s#UNO_HOST#$UNO_HOST#" "$it_props" +$SED "s#ACCUMULO_INSTANCE#$ACCUMULO_INSTANCE#" "$it_props" +$SED "s#HADOOP_CONF_DIR#$HADOOP_CONF_DIR#" "$it_props" +$SED "s#ACCUMULO_HOME#$ACCUMULO_HOME#" "$it_props" + if [[ "$1" == "--with-metrics" ]]; then metrics_props=hadoop-metrics2-accumulo.properties cp "$conf"/templates/"$metrics_props" "$conf"/ diff --git a/conf/accumulo/accumulo-it.properties b/conf/accumulo/accumulo-it.properties new file mode 100644 index 0000000..432d7c2 --- /dev/null +++ b/conf/accumulo/accumulo-it.properties @@ -0,0 +1,15 @@ +# Use this file to run Accumulo integration tests against Uno +# See TESTING.md in Accumulo repo for more information +accumulo.it.cluster.type=STANDALONE +accumulo.it.cluster.clientconf=ACCUMULO_HOME/conf/accumulo-client.properties +accumulo.it.cluster.standalone.admin.principal=ACCUMULO_USER +accumulo.it.cluster.standalone.admin.password=ACCUMULO_PASSWORD +accumulo.it.cluster.standalone.admin.keytab= +accumulo.it.cluster.standalone.zookeepers=UNO_HOST:2181 +accumulo.it.cluster.standalone.instance.name=ACCUMULO_INSTANCE +accumulo.it.cluster.standalone.hadoop.conf=HADOOP_CONF_DIR +accumulo.it.cluster.standalone.home=ACCUMULO_HOME +accumulo.it.cluster.standalone.client.conf=ACCUMULO_HOME/conf +accumulo.it.cluster.standalone.server.conf=ACCUMULO_HOME/conf +accumulo.it.cluster.standalone.client.cmd.prefix= +accumulo.it.cluster.standalone.server.cmd.prefix= ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
