Repository: incubator-slider Updated Branches: refs/heads/develop 43d11cca0 -> af62e17a9
SLIDER-873 give AccumuloReadWriteIT and AccumuloProxyIT appropriate client configurations Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/af62e17a Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/af62e17a Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/af62e17a Branch: refs/heads/develop Commit: af62e17a92a973ef22def9003f358728191af7be Parents: 43d11cc Author: Billie Rinaldi <[email protected]> Authored: Tue Jun 2 12:34:44 2015 -0700 Committer: Billie Rinaldi <[email protected]> Committed: Tue Jun 2 12:34:44 2015 -0700 ---------------------------------------------------------------------- .../package/scripts/accumulo_configuration.py | 16 ++++++++++++++++ .../funtest/accumulo/AccumuloReadWriteIT.groovy | 8 ++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/af62e17a/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 e7b3de8..fd58234 100644 --- a/app-packages/accumulo/package/scripts/accumulo_configuration.py +++ b/app-packages/accumulo/package/scripts/accumulo_configuration.py @@ -79,6 +79,22 @@ def setup_conf_dir(name=None): # 'master' or 'tserver' or 'monitor' or 'gc' or ' owner = params.accumulo_user, group = params.user_group ) + # create client.conf file + configs = {} + configs.update(params.config['configurations']['client']) + update_site_config(configs, 'general.security.credential.provider.paths') + update_site_config(configs, 'rpc.javax.net.ssl.trustStore') + update_site_config(configs, 'rpc.javax.net.ssl.trustStoreType') + update_site_config(configs, 'rpc.javax.net.ssl.keyStore') + update_site_config(configs, 'rpc.javax.net.ssl.keyStoreType') + for key,value in params.config['configurations']['accumulo-site'].iteritems(): + if key.startswith("trace.span.receiver."): + configs[key] = value + PropertiesFile(format("{params.conf_dir}/client.conf"), + properties = configs, + owner = params.accumulo_user, + group = params.user_group + ) # create host files accumulo_StaticFile( 'masters') http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/af62e17a/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 0b9fd9a..0ecf210 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 @@ -20,6 +20,7 @@ package org.apache.slider.funtest.accumulo import groovy.util.logging.Slf4j import org.apache.accumulo.core.cli.BatchWriterOpts import org.apache.accumulo.core.cli.ScannerOpts +import org.apache.accumulo.core.client.ClientConfiguration import org.apache.accumulo.core.client.Connector import org.apache.accumulo.core.client.ZooKeeperInstance import org.apache.accumulo.core.client.security.tokens.PasswordToken @@ -52,8 +53,11 @@ class AccumuloReadWriteIT extends AccumuloBasicIT { RegistryConstants.KEY_REGISTRY_ZK_QUORUM, FuntestProperties.DEFAULT_SLIDER_ZK_HOSTS) - ZooKeeperInstance instance = new ZooKeeperInstance( - tree.global.get("site.client.instance.name"), zookeepers) + ClientConfiguration configuration = new ClientConfiguration() + configuration.setProperty(ClientConfiguration.ClientProperty.INSTANCE_ZK_HOST, zookeepers) + configuration.setProperty(ClientConfiguration.ClientProperty.INSTANCE_NAME, tree.global.get("site.client.instance.name")) + + ZooKeeperInstance instance = new ZooKeeperInstance(configuration) Connector connector = instance.getConnector(USER, new PasswordToken(PASSWORD)) ingest(connector, 200000, 1, 50, 0);
