Merge branch 'feature/SLIDER-254_use_credential_provider' into develop Conflicts: app-packages/accumulo/appConfig.json
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/d3e4bf2f Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/d3e4bf2f Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/d3e4bf2f Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry Commit: d3e4bf2f4c3cee903b9db52d7495396a78af73a8 Parents: 1b9749c e4a7b95 Author: Billie Rinaldi <billie.rina...@gmail.com> Authored: Mon Aug 25 15:05:18 2014 -0700 Committer: Billie Rinaldi <billie.rina...@gmail.com> Committed: Mon Aug 25 15:05:18 2014 -0700 ---------------------------------------------------------------------- README.md | 28 +++ app-packages/accumulo/README.txt | 31 +++ app-packages/accumulo/appConfig.json | 14 +- app-packages/accumulo/metainfo.xml | 8 + .../accumulo/package/scripts/accumulo_client.py | 2 +- .../package/scripts/accumulo_configuration.py | 64 ++++- .../accumulo/package/scripts/accumulo_script.py | 53 +---- .../package/scripts/accumulo_service.py | 2 +- app-packages/accumulo/package/scripts/params.py | 28 ++- .../package/templates/accumulo-env.sh.j2 | 2 +- .../accumulo/package/templates/client.conf.j2 | 18 ++ app-packages/accumulo/pom.xml | 34 ++- app-packages/accumulo/src/assembly/accumulo.xml | 24 +- .../slider/accumulo/CustomAuthenticator.java | 118 ++++++++++ .../apache/slider/accumulo/ProviderUtil.java | 57 +++++ .../AccumuloAgentCommandTestBase.groovy | 10 +- .../funtest/accumulo/AccumuloBasicIT.groovy | 96 ++++++-- .../accumulo/AccumuloMonitorSSLIT.groovy | 2 +- .../funtest/accumulo/AccumuloReadWriteIT.groovy | 7 +- .../accumulo/AccumuloReadWriteSSLIT.groovy | 73 ++++++ .../funtest/accumulo/AccumuloSSLTestBase.groovy | 99 ++++++++ .../slider/funtest/accumulo/CertUtil.java | 235 +++++++++++++++++++ .../test/resources/appConfig_monitor_ssl.json | 30 +-- .../src/test/resources/appConfig_ssl.json | 54 +++++ .../accumulo/src/test/resources/resources.json | 4 +- .../test/resources/resources_with_client.json | 41 ++++ pom.xml | 16 +- .../org/apache/slider/client/SliderClient.java | 89 ++++++- .../common/SliderXMLConfKeysForTesting.java | 6 +- .../org/apache/slider/core/conf/ConfTree.java | 7 + .../slider/core/conf/ConfTreeOperations.java | 4 +- .../framework/AgentCommandTestBase.groovy | 5 +- .../accumulo/slider-accumulo-provider/pom.xml | 6 + 33 files changed, 1128 insertions(+), 139 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/d3e4bf2f/app-packages/accumulo/appConfig.json ---------------------------------------------------------------------- diff --cc app-packages/accumulo/appConfig.json index e9ca2ba,9848840..a44dbad --- a/app-packages/accumulo/appConfig.json +++ b/app-packages/accumulo/appConfig.json @@@ -4,7 -4,9 +4,7 @@@ }, "global": { "application.def": "${app.package.name}.zip", - "java_home": "/usr/jdk64/jdk1.7.0_45", - "config_types": "accumulo-site", + "java_home": "/usr/lib/jvm/java", - "package_list": "files/accumulo-${accumulo.version}-bin.tar.gz", "site.global.app_user": "yarn", "site.global.app_log_dir": "${AGENT_LOG_ROOT}", "site.global.app_pid_dir": "${AGENT_WORK_ROOT}/app/run", @@@ -40,9 -44,22 +41,12 @@@ "site.accumulo-site.monitor.port.log4j": "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/usr/lib/hadoop/.*.jar,\n/usr/lib/hadoop/lib/.*.jar,\n/usr/lib/hadoop-hdfs/.*.jar,\n/usr/lib/hadoop-mapreduce/.*.jar,\n/usr/lib/hadoop-yarn/.*.jar," }, + "credentials": { + "jceks://hdfs/user/${USER}/accumulo-${CLUSTER_NAME}.jceks": ["root.initial.password", "instance.secret", "trace.token.property.password"] + }, "components": { - "ACCUMULO_MASTER": { - }, "slider-appmaster": { "jvm.heapsize": "256M" - }, - "ACCUMULO_TSERVER": { - }, - "ACCUMULO_MONITOR": { - }, - "ACCUMULO_GC": { - }, - "ACCUMULO_TRACER": { } } } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/d3e4bf2f/app-packages/accumulo/metainfo.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/d3e4bf2f/app-packages/accumulo/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/d3e4bf2f/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/d3e4bf2f/slider-core/src/main/java/org/apache/slider/client/SliderClient.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/d3e4bf2f/slider-core/src/main/java/org/apache/slider/core/conf/ConfTree.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/d3e4bf2f/slider-core/src/main/java/org/apache/slider/core/conf/ConfTreeOperations.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/d3e4bf2f/slider-providers/accumulo/slider-accumulo-provider/pom.xml ----------------------------------------------------------------------