You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fluo.apache.org by mw...@apache.org on 2018/08/31 15:06:35 UTC
[fluo-uno] branch master updated: Updated Uno to use
accumulo.properties for 2.0 (#189)
This is an automated email from the ASF dual-hosted git repository.
mwalch pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/fluo-uno.git
The following commit(s) were added to refs/heads/master by this push:
new 7b31e89 Updated Uno to use accumulo.properties for 2.0 (#189)
7b31e89 is described below
commit 7b31e89f1e9f18881707a9d3f3687dd61ff16ffd
Author: Mike Walch <mw...@apache.org>
AuthorDate: Fri Aug 31 11:06:33 2018 -0400
Updated Uno to use accumulo.properties for 2.0 (#189)
---
bin/impl/setup-accumulo.sh | 16 +++++++------
conf/accumulo/accumulo-2.0.properties | 10 +++++++++
conf/accumulo/accumulo-site-2.0.xml | 42 -----------------------------------
3 files changed, 19 insertions(+), 49 deletions(-)
diff --git a/bin/impl/setup-accumulo.sh b/bin/impl/setup-accumulo.sh
index 306dddc..b05b2a6 100755
--- a/bin/impl/setup-accumulo.sh
+++ b/bin/impl/setup-accumulo.sh
@@ -41,13 +41,15 @@ tar xzf "$DOWNLOADS/$ACCUMULO_TARBALL" -C "$INSTALL"
conf=$ACCUMULO_HOME/conf
if [[ $ACCUMULO_VERSION =~ ^1\..*$ ]]; then
+ accumulo_conf=$conf/accumulo-site.xml
cp "$conf"/examples/2GB/standalone/* "$conf"/
$SED "s#localhost#$UNO_HOST#" "$conf/slaves"
- cp "$UNO_HOME"/conf/accumulo/accumulo-site-1.0.xml "$conf"/accumulo-site.xml
+ cp "$UNO_HOME"/conf/accumulo/accumulo-site-1.0.xml "$accumulo_conf"
else
+ accumulo_conf=$conf/accumulo.properties
"$ACCUMULO_HOME"/bin/accumulo-cluster create-config
$SED "s#localhost#$UNO_HOST#" "$conf/tservers"
- cp "$UNO_HOME"/conf/accumulo/accumulo-site-2.0.xml "$conf"/accumulo-site.xml
+ cp "$UNO_HOME"/conf/accumulo/accumulo-2.0.properties "$accumulo_conf"
$SED "s#instance[.]name=#instance.name=$ACCUMULO_INSTANCE#" "$conf"/accumulo-client.properties
$SED "s#instance[.]zookeepers=localhost:2181#instance.zookeepers=$UNO_HOST:2181#" "$conf"/accumulo-client.properties
$SED "s#auth[.]principal=#auth.principal=$ACCUMULO_USER#" "$conf"/accumulo-client.properties
@@ -62,11 +64,11 @@ if [[ $ACCUMULO_VERSION =~ ^1\..*$ ]]; then
else
$SED "s#tserver).*#tserver) JAVA_OPTS=\(\"\$\{JAVA_OPTS\[\@\]\}\" '-Xmx$ACCUMULO_TSERV_MEM' '-Xms$ACCUMULO_TSERV_MEM\'\) ;;#" "$conf"/accumulo-env.sh
fi
-$SED "s#ACCUMULO_DCACHE_SIZE#$ACCUMULO_DCACHE_SIZE#" "$conf"/accumulo-site.xml
-$SED "s#ACCUMULO_ICACHE_SIZE#$ACCUMULO_ICACHE_SIZE#" "$conf"/accumulo-site.xml
-$SED "s#ACCUMULO_IMAP_SIZE#$ACCUMULO_IMAP_SIZE#" "$conf"/accumulo-site.xml
-$SED "s#ACCUMULO_USE_NATIVE_MAP#$ACCUMULO_USE_NATIVE_MAP#" "$conf"/accumulo-site.xml
-$SED "s#UNO_HOST#$UNO_HOST#" "$conf"/accumulo-site.xml
+$SED "s#ACCUMULO_DCACHE_SIZE#$ACCUMULO_DCACHE_SIZE#" "$accumulo_conf"
+$SED "s#ACCUMULO_ICACHE_SIZE#$ACCUMULO_ICACHE_SIZE#" "$accumulo_conf"
+$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"
if [[ "$1" == "--with-metrics" ]]; then
metrics_props=hadoop-metrics2-accumulo.properties
diff --git a/conf/accumulo/accumulo-2.0.properties b/conf/accumulo/accumulo-2.0.properties
new file mode 100755
index 0000000..49636dd
--- /dev/null
+++ b/conf/accumulo/accumulo-2.0.properties
@@ -0,0 +1,10 @@
+## Work around for ACCUMULO-2388. See Accumulo 1.6.0 release notes
+general.rpc.timeout=240s
+instance.secret=uno
+instance.volumes=hdfs://UNO_HOST:8020/accumulo
+instance.zookeeper.host=UNO_HOST:2181
+table.durability=flush
+tserver.memory.maps.native.enabled=ACCUMULO_USE_NATIVE_MAP
+tserver.readahead.concurrent.max=64
+tserver.server.threads.minimum=64
+tserver.walog.max.size=512M
diff --git a/conf/accumulo/accumulo-site-2.0.xml b/conf/accumulo/accumulo-site-2.0.xml
deleted file mode 100755
index a9d0874..0000000
--- a/conf/accumulo/accumulo-site-2.0.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-
-<configuration>
- <property>
- <!-- Work around for ACCUMULO-2388. See Accumulo 1.6.0 release notes -->
- <name>general.rpc.timeout</name>
- <value>240s</value>
- </property>
- <property>
- <name>instance.secret</name>
- <value>uno</value>
- </property>
- <property>
- <name>instance.volumes</name>
- <value>hdfs://UNO_HOST:8020/accumulo</value>
- </property>
- <property>
- <name>instance.zookeeper.host</name>
- <value>UNO_HOST:2181</value>
- </property>
- <property>
- <name>table.durability</name>
- <value>flush</value>
- </property>
- <property>
- <name>tserver.memory.maps.native.enabled</name>
- <value>ACCUMULO_USE_NATIVE_MAP</value>
- </property>
- <property>
- <name>tserver.readahead.concurrent.max</name>
- <value>64</value>
- </property>
- <property>
- <name>tserver.server.threads.minimum</name>
- <value>64</value>
- </property>
- <property>
- <name>tserver.walog.max.size</name>
- <value>512M</value>
- </property>
-</configuration>