SLIDER-508 add client conf and accumulo-env as configurations for accumulo
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/7704bf00 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/7704bf00 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/7704bf00 Branch: refs/heads/feature/SLIDER-481_allow_dedicated_handling_of_exports Commit: 7704bf003f4be20e5971794320f6f3994164fa4c Parents: 3ed76a5 Author: Billie Rinaldi <[email protected]> Authored: Mon Oct 13 19:02:05 2014 -0700 Committer: Billie Rinaldi <[email protected]> Committed: Mon Oct 13 19:02:40 2014 -0700 ---------------------------------------------------------------------- app-packages/accumulo/appConfig-default.json | 43 +++++++--- .../accumulo/configuration/accumulo-env.xml | 89 ++++++++++++++++++++ app-packages/accumulo/configuration/client.xml | 44 ++++++++++ app-packages/accumulo/configuration/global.xml | 89 -------------------- app-packages/accumulo/metainfo.xml | 10 +++ .../package/scripts/accumulo_configuration.py | 9 +- app-packages/accumulo/package/scripts/params.py | 33 +++++--- .../accumulo/package/templates/client.conf.j2 | 18 ---- app-packages/accumulo/resources-default.json | 4 +- .../funtest/accumulo/AccumuloReadWriteIT.groovy | 2 +- .../accumulo/AccumuloReadWriteSSLIT.groovy | 2 +- 11 files changed, 202 insertions(+), 141 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7704bf00/app-packages/accumulo/appConfig-default.json ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/appConfig-default.json b/app-packages/accumulo/appConfig-default.json index d5723da..3f9f26a 100644 --- a/app-packages/accumulo/appConfig-default.json +++ b/app-packages/accumulo/appConfig-default.json @@ -5,36 +5,50 @@ "global": { "application.def": ".slider/package/ACCUMULO/${app.package.name}.zip", "java_home": "${app.java.home}", - "site.global.app_user": "${app.user}", - "site.global.app_log_dir": "${AGENT_LOG_ROOT}", - "site.global.app_pid_dir": "${AGENT_WORK_ROOT}/app/run", + "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/accumulo-${accumulo.version}", - "site.global.tserver_heapsize": "256m", - "site.global.master_heapsize": "128m", - "site.global.monitor_heapsize": "64m", - "site.global.gc_heapsize": "64m", - "site.global.other_heapsize": "128m", - "site.global.hadoop_prefix": "${hadoop.dir}", - "site.global.hadoop_conf_dir": "/etc/hadoop/conf", - "site.global.zookeeper_home": "${zk.dir}", - "site.global.accumulo_instance_name": "${USER}-${CLUSTER_NAME}", - "site.global.accumulo_root_password": "NOT_USED", + "site.global.app_user": "${app.user}", "site.global.user_group": "${app.user.group}", + + "site.accumulo-env.java_home": "${app.java.home}", + "site.accumulo-env.tserver_heapsize": "256m", + "site.accumulo-env.master_heapsize": "128m", + "site.accumulo-env.monitor_heapsize": "64m", + "site.accumulo-env.gc_heapsize": "64m", + "site.accumulo-env.other_heapsize": "128m", + "site.accumulo-env.hadoop_prefix": "${hadoop.dir}", + "site.accumulo-env.hadoop_conf_dir": "/etc/hadoop/conf", + "site.accumulo-env.zookeeper_home": "${zk.dir}", + + "site.client.instance.name": "${USER}-${CLUSTER_NAME}", + "site.client.instance.zookeeper.host": "${@//site/accumulo-site/instance.zookeeper.host}", + "site.client.instance.rpc.ssl.enabled": "${@//site/accumulo-site/instance.rpc.ssl.enabled}", + "site.client.instance.rpc.ssl.clientAuth": "${@//site/accumulo-site/instance.rpc.ssl.clientAuth}", + "site.client.general.security.credential.provider.paths": "${@//site/accumulo-site/general.security.credential.provider.paths}", + + "site.global.accumulo_root_password": "NOT_USED", "site.global.ssl_cert_dir": "ssl", "site.global.monitor_protocol": "http", + "site.accumulo-site.instance.volumes": "${DEFAULT_DATA_DIR}/data", "site.accumulo-site.instance.zookeeper.host": "${ZK_HOST}", "site.accumulo-site.instance.security.authenticator": "org.apache.slider.accumulo.CustomAuthenticator", + "site.accumulo-site.general.security.credential.provider.paths": "jceks://hdfs/user/${USER}/accumulo-${CLUSTER_NAME}.jceks", + "site.accumulo-site.instance.rpc.ssl.enabled": "false", + "site.accumulo-site.instance.rpc.ssl.clientAuth": "false", "site.accumulo-site.general.kerberos.keytab": "${accumulo.keytab}", "site.accumulo-site.general.kerberos.principal": "${accumulo.principal}", + "site.accumulo-site.tserver.memory.maps.native.enabled": "false", "site.accumulo-site.tserver.memory.maps.max": "80M", "site.accumulo-site.tserver.cache.data.size": "7M", "site.accumulo-site.tserver.cache.index.size": "20M", - "site.accumulo-site.trace.user": "root", "site.accumulo-site.tserver.sort.buffer.size": "50M", "site.accumulo-site.tserver.walog.max.size": "40M", + + "site.accumulo-site.trace.user": "root", + "site.accumulo-site.master.port.client": "0", "site.accumulo-site.trace.port.client": "0", "site.accumulo-site.tserver.port.client": "0", @@ -43,6 +57,7 @@ "site.accumulo-site.monitor.port.log4j": "0", "site.accumulo-site.master.replication.coordinator.port": "0", "site.accumulo-site.replication.receipt.service.port": "0", + "site.accumulo-site.general.classpaths": "$ACCUMULO_HOME/lib/accumulo-server.jar,\n$ACCUMULO_HOME/lib/accumulo-core.jar,\n$ACCUMULO_HOME/lib/accumulo-start.jar,\n$ACCUMULO_HOME/lib/accumulo-fate.jar,\n$ACCUMULO_HOME/lib/accumulo-proxy.jar,\n$ACCUMULO_HOME/lib/[^.].*.jar,\n$ZOOKEEPER_HOME/zookeeper[^.].*.jar,\n$HADOOP_CONF_DIR,\n$HADOOP_PREFIX/[^.].*.jar,\n$HADOOP_PREFIX/lib/[^.].*.jar,\n$HADOOP_PREFIX/share/hadoop/common/.*.jar,\n$HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,\n$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,\n$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,\n$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,\n${hadoop.dir}/.*.jar,\n${hadoop.dir}/lib/.*.jar,\n${hdfs.dir}/.*.jar,\n${mapred.dir}/.*.jar,\n${yarn.dir}/.*.jar," }, "credentials": { http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7704bf00/app-packages/accumulo/configuration/accumulo-env.xml ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/configuration/accumulo-env.xml b/app-packages/accumulo/configuration/accumulo-env.xml new file mode 100644 index 0000000..65b6804 --- /dev/null +++ b/app-packages/accumulo/configuration/accumulo-env.xml @@ -0,0 +1,89 @@ +<?xml version="1.0"?> +<?xml-stylesheet type="text/xsl" href="configuration.xsl"?> +<!-- +/** + * 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. + */ +--> + +<configuration> + <property> + <name>tserver_heapsize</name> + <value>256m</value> + <description>TServer heap size.</description> + </property> + <property> + <name>master_heapsize</name> + <value>128m</value> + <description>Master Heap Size</description> + </property> + <property> + <name>monitor_heapsize</name> + <value>64m</value> + <description>Monitor Heap Size</description> + </property> + <property> + <name>gc_heapsize</name> + <value>64m</value> + <description>GC Heap Size</description> + </property> + <property> + <name>other_heapsize</name> + <value>128m</value> + <description>Other Heap Size</description> + </property> + <property> + <name>hadoop_prefix</name> + <value>/usr/lib/hadoop</value> + <description>Hadoop directory.</description> + </property> + <property> + <name>hadoop_conf_dir</name> + <value>/etc/hadoop/conf</value> + <description>Hadoop configuration directory.</description> + </property> + <property> + <name>zookeeper_home</name> + <value>/usr/lib/zookeeper</value> + <description>Zookeeper directory.</description> + </property> + <property> + <name>accumulo_instance_name</name> + <value>accumulo-instance</value> + <description>Accumulo Instance Name.</description> + </property> + <property> + <name>content</name> + <description>This is the template for a client accumulo-env.sh file</description> + <value> +#! /usr/bin/env bash +export HADOOP_PREFIX=${@//site/accumulo-env/hadoop_prefix} +export HADOOP_CONF_DIR=${@//site/accumulo-env/hadoop_conf_dir} +export JAVA_HOME=${@//site/accumulo-env/java_home} +export ZOOKEEPER_HOME=${@//site/accumulo-env/zookeeper_home} +export ACCUMULO_LOG_DIR=$ACCUMULO_HOME/logs +export ACCUMULO_TSERVER_OPTS="-Xmx${@//site/accumulo-env/tserver_heapsize} -Xms${@//site/accumulo-env/tserver_heapsize}" +export ACCUMULO_MASTER_OPTS="-Xmx${@//site/accumulo-env/master_heapsize} -Xms${@//site/accumulo-env/master_heapsize}" +export ACCUMULO_MONITOR_OPTS="-Xmx${@//site/accumulo-env/monitor_heapsize} -Xms${@//site/accumulo-env/monitor_heapsize}" +export ACCUMULO_GC_OPTS="-Xmx${@//site/accumulo-env/gc_heapsize} -Xms${@//site/accumulo-env/gc_heapsize}" +export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75 -Djava.net.preferIPv4Stack=true" +export ACCUMULO_OTHER_OPTS="-Xmx${@//site/accumulo-env/other_heapsize} -Xms${@//site/accumulo-env/other_heapsize}" +# what do when the JVM runs out of heap memory +export ACCUMULO_KILL_CMD='kill -9 %p' + </value> + </property> +</configuration> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7704bf00/app-packages/accumulo/configuration/client.xml ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/configuration/client.xml b/app-packages/accumulo/configuration/client.xml new file mode 100644 index 0000000..86e90d5 --- /dev/null +++ b/app-packages/accumulo/configuration/client.xml @@ -0,0 +1,44 @@ +<?xml version="1.0"?> +<?xml-stylesheet type="text/xsl" href="configuration.xsl"?> +<!-- +/** + * 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. + */ +--> + +<configuration> + <property> + <name>instance.name</name> + <value>accumulo-instance</value> + <description>Accumulo Instance Name.</description> + </property> + <property> + <name>instance.zookeeper.host</name> + <value>localhost:2181</value> + <description>Zookeeper hosts.</description> + </property> + <property> + <name>instance.rpc.ssl.enabled</name> + <value>false</value> + <description>SSL enabled.</description> + </property> + <property> + <name>instance.rpc.ssl.clientAuth</name> + <value>false</value> + <description>SSL client auth enabled.</description> + </property> +</configuration> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7704bf00/app-packages/accumulo/configuration/global.xml ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/configuration/global.xml b/app-packages/accumulo/configuration/global.xml deleted file mode 100644 index 904a645..0000000 --- a/app-packages/accumulo/configuration/global.xml +++ /dev/null @@ -1,89 +0,0 @@ -<?xml version="1.0"?> -<?xml-stylesheet type="text/xsl" href="configuration.xsl"?> -<!-- -/** - * 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. - */ ---> - -<configuration> - <property> - <name>app_log_dir</name> - <value>/var/log/accumulo</value> - <description>Log Directories for Accumulo.</description> - </property> - <property> - <name>app_pid_dir</name> - <value>/var/run/accumulo</value> - <description>Pid Directories for Accumulo.</description> - </property> - <property> - <name>tserver_heapsize</name> - <value>128m</value> - <description>TServer heap size.</description> - </property> - <property> - <name>master_heapsize</name> - <value>128m</value> - <description>Master Heap Size</description> - </property> - <property> - <name>monitor_heapsize</name> - <value>64m</value> - <description>Monitor Heap Size</description> - </property> - <property> - <name>gc_heapsize</name> - <value>64m</value> - <description>GC Heap Size</description> - </property> - <property> - <name>other_heapsize</name> - <value>128m</value> - <description>Other Heap Size</description> - </property> - <property> - <name>accumulo_hdfs_root_dir</name> - <value>${DEFAULT_DATA_DIR}</value> - <description>Accumulo Relative Path to HDFS.</description> - </property> - <property> - <name>app_user</name> - <value>yarn</value> - <description>Accumulo User Name.</description> - </property> - <property> - <name>hadoop_prefix</name> - <value>/usr/lib/hadoop</value> - <description>Hadoop directory.</description> - </property> - <property> - <name>hadoop_conf_dir</name> - <value>/etc/hadoop/conf</value> - <description>Hadoop configuration directory.</description> - </property> - <property> - <name>zookeeper_home</name> - <value>/usr/lib/zookeeper</value> - <description>Zookeeper directory.</description> - </property> - <property> - <name>accumulo_instance_name</name> - <value>accumulo-instance</value> - <description>Accumulo Instance Name.</description> - </property> -</configuration> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7704bf00/app-packages/accumulo/metainfo.xml ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/metainfo.xml b/app-packages/accumulo/metainfo.xml index a926561..d3fb263 100644 --- a/app-packages/accumulo/metainfo.xml +++ b/app-packages/accumulo/metainfo.xml @@ -158,6 +158,16 @@ <fileName>accumulo-site.xml</fileName> <dictionaryName>accumulo-site</dictionaryName> </configFile> + <configFile> + <type>env</type> + <fileName>accumulo-env.sh</fileName> + <dictionaryName>accumulo-env</dictionaryName> + </configFile> + <configFile> + <type>properties</type> + <fileName>client.conf</fileName> + <dictionaryName>client</dictionaryName> + </configFile> </configFiles> </application> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7704bf00/app-packages/accumulo/package/scripts/accumulo_configuration.py ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/package/scripts/accumulo_configuration.py b/app-packages/accumulo/package/scripts/accumulo_configuration.py index 935d591..b883c6f 100644 --- a/app-packages/accumulo/package/scripts/accumulo_configuration.py +++ b/app-packages/accumulo/package/scripts/accumulo_configuration.py @@ -121,12 +121,17 @@ def setup_conf_dir(name=None): # 'master' or 'tserver' or 'monitor' or 'gc' or ' owner = params.accumulo_user, group = params.user_group ) - if params.ssl_enabled: - accumulo_TemplateConfig( 'client.conf') # create env file accumulo_TemplateConfig( 'accumulo-env.sh') + # create client.conf file + PropertiesFile(format("{params.conf_dir}/client.conf"), + properties = params.config['configurations']['client'], + owner = params.accumulo_user, + group = params.user_group + ) + # create host files accumulo_StaticFile( 'masters') accumulo_StaticFile( 'slaves') http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7704bf00/app-packages/accumulo/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/package/scripts/params.py b/app-packages/accumulo/package/scripts/params.py index 7d0e52d..9e6e8dd 100644 --- a/app-packages/accumulo/package/scripts/params.py +++ b/app-packages/accumulo/package/scripts/params.py @@ -32,22 +32,20 @@ pid_dir = status_params.pid_dir # accumulo env java64_home = config['hostLevelParams']['java_home'] -hadoop_prefix = config['configurations']['global']['hadoop_prefix'] -hadoop_conf_dir = config['configurations']['global']['hadoop_conf_dir'] -zookeeper_home = config['configurations']['global']['zookeeper_home'] -master_heapsize = config['configurations']['global']['master_heapsize'] -tserver_heapsize = config['configurations']['global']['tserver_heapsize'] -monitor_heapsize = config['configurations']['global']['monitor_heapsize'] -gc_heapsize = config['configurations']['global']['gc_heapsize'] -other_heapsize = config['configurations']['global']['other_heapsize'] +hadoop_prefix = config['configurations']['accumulo-env']['hadoop_prefix'] +hadoop_conf_dir = config['configurations']['accumulo-env']['hadoop_conf_dir'] +zookeeper_home = config['configurations']['accumulo-env']['zookeeper_home'] +zookeeper_host = config['configurations']['accumulo-site']['instance.zookeeper.host'] +master_heapsize = config['configurations']['accumulo-env']['master_heapsize'] +tserver_heapsize = config['configurations']['accumulo-env']['tserver_heapsize'] +monitor_heapsize = config['configurations']['accumulo-env']['monitor_heapsize'] +gc_heapsize = config['configurations']['accumulo-env']['gc_heapsize'] +other_heapsize = config['configurations']['accumulo-env']['other_heapsize'] +env_sh_template = config['configurations']['accumulo-env']['content'] # accumulo local directory structure accumulo_root = config['configurations']['global']['app_root'] -conf_dir = None -if ('accumulo_conf_dir' in config['configurations']['global']): - conf_dir = config['configurations']['global']['accumulo_conf_dir'] -else: - conf_dir = format("{accumulo_root}/conf") +conf_dir = format("{accumulo_root}/conf") log_dir = config['configurations']['global']['app_log_dir'] daemon_script = format("{accumulo_root}/bin/accumulo") @@ -60,6 +58,9 @@ monitor_truststore_property = "monitor.ssl.trustStore" ssl_enabled = False if 'instance.rpc.ssl.enabled' in config['configurations']['accumulo-site']: ssl_enabled = config['configurations']['accumulo-site']['instance.rpc.ssl.enabled'] +clientauth_enabled = False +if 'instance.rpc.ssl.clientAuth' in config['configurations']['accumulo-site']: + clientauth_enabled = config['configurations']['accumulo-site']['instance.rpc.ssl.clientAuth'] ssl_cert_dir = config['configurations']['global']['ssl_cert_dir'] keystore_path = format("{conf_dir}/ssl/keystore.jks") truststore_path = format("{conf_dir}/ssl/truststore.jks") @@ -67,9 +68,13 @@ ssl_keystore_file_property = "rpc.javax.net.ssl.keyStore" ssl_truststore_file_property = "rpc.javax.net.ssl.trustStore" credential_provider = config['configurations']['accumulo-site']["general.security.credential.provider.paths"] #credential_provider = credential_provider.replace("${HOST}", hostname) # if enabled, must propagate to configuration +if ssl_keystore_file_property in config['configurations']['accumulo-site']: + keystore_path = config['configurations']['accumulo-site'][ssl_keystore_file_property] +if ssl_truststore_file_property in config['configurations']['accumulo-site']: + truststore_path = config['configurations']['accumulo-site'][ssl_truststore_file_property] # accumulo initialization parameters -accumulo_instance_name = config['configurations']['global']['accumulo_instance_name'] +accumulo_instance_name = config['configurations']['client']['instance.name'] accumulo_root_password = config['configurations']['global']['accumulo_root_password'] accumulo_hdfs_root_dir = config['configurations']['accumulo-site']['instance.volumes'].split(",")[0] http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7704bf00/app-packages/accumulo/package/templates/client.conf.j2 ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/package/templates/client.conf.j2 b/app-packages/accumulo/package/templates/client.conf.j2 deleted file mode 100644 index 4e6a4be..0000000 --- a/app-packages/accumulo/package/templates/client.conf.j2 +++ /dev/null @@ -1,18 +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. - -instance.rpc.ssl.clientAuth true -instance.rpc.ssl.enabled true -general.security.credential.provider.paths {{credential_provider}} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7704bf00/app-packages/accumulo/resources-default.json ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/resources-default.json b/app-packages/accumulo/resources-default.json index f9cae60..48bc772 100644 --- a/app-packages/accumulo/resources-default.json +++ b/app-packages/accumulo/resources-default.json @@ -5,7 +5,7 @@ "global": { "yarn.log.include.patterns": "", "yarn.log.exclude.patterns": "", - "yarn.log.interval": "0" + "yarn.log.interval": "60" }, "components": { "ACCUMULO_MASTER": { @@ -18,7 +18,7 @@ "ACCUMULO_TSERVER": { "yarn.role.priority": "2", "yarn.component.instances": "1", - "yarn.memory": "256" + "yarn.memory": "512" }, "ACCUMULO_MONITOR": { "yarn.role.priority": "3", http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7704bf00/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloReadWriteIT.groovy ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloReadWriteIT.groovy b/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloReadWriteIT.groovy index 12a3bff..b4118d2 100644 --- a/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloReadWriteIT.groovy +++ b/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloReadWriteIT.groovy @@ -54,7 +54,7 @@ class AccumuloReadWriteIT extends AccumuloBasicIT { FuntestProperties.DEFAULT_SLIDER_ZK_HOSTS) ZooKeeperInstance instance = new ZooKeeperInstance( - tree.global.get("site.global.accumulo_instance_name"), zookeepers) + tree.global.get("site.client.instance.name"), zookeepers) Connector connector = instance.getConnector(USER, new PasswordToken(PASSWORD)) ingest(connector, 200000, 1, 50, 0); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7704bf00/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloReadWriteSSLIT.groovy ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloReadWriteSSLIT.groovy b/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloReadWriteSSLIT.groovy index cc227ed..0464cec 100644 --- a/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloReadWriteSSLIT.groovy +++ b/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloReadWriteSSLIT.groovy @@ -47,7 +47,7 @@ class AccumuloReadWriteSSLIT extends AccumuloSSLTestBase { RegistryConstants.KEY_REGISTRY_ZK_QUORUM, FuntestProperties.DEFAULT_SLIDER_ZK_HOSTS) ClientConfiguration conf = new ClientConfiguration() - .withInstance(tree.global.get("site.global.accumulo_instance_name")) + .withInstance(tree.global.get("site.client.instance.name")) .withZkHosts(zookeepers) .withSsl(true) .withKeystore(clientKeyStoreFile.toString(), KEY_PASS, null)
