merge master into branch-1.2 for 1.2.1 release
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/d80b82da Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/d80b82da Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/d80b82da Branch: refs/heads/branch-1.2 Commit: d80b82dab3ea335d71e9a44094b178596ac5abd8 Parents: 5a2a1a8 58f3f53 Author: Evans Ye <[email protected]> Authored: Sat Jul 1 12:54:29 2017 +0000 Committer: Evans Ye <[email protected]> Committed: Sat Jul 1 12:54:29 2017 +0000 ---------------------------------------------------------------------- .dockerignore | 1 - README.md | 2 +- .../bigpetstore-mapreduce/build.gradle | 2 - .../TestPetStoreTransactionGeneratorJob.java | 4 +- bigtop-ci/build.sh | 54 ++ bigtop-ci/entrypoint.sh | 4 + bigtop-deploy/juju/hadoop-hbase/README.md | 67 +- bigtop-deploy/juju/hadoop-hbase/bundle-dev.yaml | 14 +- .../juju/hadoop-hbase/bundle-local.yaml | 14 +- bigtop-deploy/juju/hadoop-hbase/bundle.yaml | 26 +- .../juju/hadoop-hbase/tests/01-bundle.py | 2 - .../juju/hadoop-hbase/tests/tests.yaml | 2 +- bigtop-deploy/juju/hadoop-kafka/README.md | 49 +- bigtop-deploy/juju/hadoop-kafka/bundle-dev.yaml | 15 +- .../juju/hadoop-kafka/bundle-local.yaml | 15 +- bigtop-deploy/juju/hadoop-kafka/bundle.yaml | 27 +- .../juju/hadoop-kafka/tests/01-bundle.py | 2 - .../juju/hadoop-kafka/tests/tests.yaml | 2 +- bigtop-deploy/juju/hadoop-processing/README.md | 45 +- .../juju/hadoop-processing/bundle-dev.yaml | 11 +- .../juju/hadoop-processing/bundle-local.yaml | 11 +- .../juju/hadoop-processing/bundle.yaml | 19 +- .../juju/hadoop-processing/tests/01-bundle.py | 2 - .../juju/hadoop-processing/tests/tests.yaml | 2 +- bigtop-deploy/juju/hadoop-spark/README.md | 146 ++-- bigtop-deploy/juju/hadoop-spark/bundle-dev.yaml | 45 +- .../juju/hadoop-spark/bundle-local.yaml | 45 +- bigtop-deploy/juju/hadoop-spark/bundle.yaml | 55 +- .../juju/hadoop-spark/tests/01-bundle.py | 7 +- .../juju/hadoop-spark/tests/tests.yaml | 10 +- bigtop-deploy/juju/spark-processing/README.md | 109 +-- .../juju/spark-processing/bundle-dev.yaml | 10 +- .../juju/spark-processing/bundle-local.yaml | 10 +- bigtop-deploy/juju/spark-processing/bundle.yaml | 17 +- .../juju/spark-processing/tests/tests.yaml | 10 +- bigtop-deploy/puppet/README.md | 1 - .../puppet/hieradata/bigtop/cluster.yaml | 5 +- bigtop-deploy/puppet/hieradata/site.yaml | 14 +- bigtop-deploy/puppet/manifests/bigtop_repo.pp | 70 ++ bigtop-deploy/puppet/manifests/cluster.pp | 9 +- bigtop-deploy/puppet/manifests/jdk.pp | 72 ++ bigtop-deploy/puppet/manifests/site.pp | 76 +- .../puppet/modules/flink/manifests/init.pp | 14 +- .../ignite_hadoop/templates/default-config.xml | 27 +- .../puppet/modules/kerberos/manifests/init.pp | 13 +- .../puppet/modules/spark/manifests/init.pp | 12 +- .../modules/spark/templates/spark-defaults.conf | 15 +- .../puppet/modules/spark/templates/spark-env.sh | 8 + .../puppet/modules/zeppelin/manifests/init.pp | 1 + bigtop-packages/src/charm/README.md | 23 +- .../hadoop/layer-hadoop-namenode/README.md | 39 +- .../hadoop/layer-hadoop-namenode/layer.yaml | 1 - .../hadoop/layer-hadoop-namenode/metadata.yaml | 5 +- .../hadoop/layer-hadoop-namenode/metrics.yaml | 6 +- .../charm/hadoop/layer-hadoop-plugin/README.md | 35 +- .../layer-hadoop-resourcemanager/README.md | 39 +- .../actions/mrbench | 1 + .../actions/nnbench | 1 + .../actions/parseBenchmark.py | 3 +- .../actions/smoke-test | 10 +- .../actions/teragen | 1 + .../actions/terasort | 1 + .../actions/testdfsio | 1 + .../layer-hadoop-resourcemanager/metadata.yaml | 5 +- .../layer-hadoop-resourcemanager/metrics.yaml | 2 +- .../charm/hadoop/layer-hadoop-slave/README.md | 40 +- .../layer-hadoop-slave/actions/smoke-test | 10 +- .../hadoop/layer-hadoop-slave/metadata.yaml | 4 +- .../src/charm/hbase/layer-hbase/README.md | 174 ++-- .../charm/hbase/layer-hbase/actions/perf-test | 3 +- .../charm/hbase/layer-hbase/actions/smoke-test | 4 +- .../src/charm/hbase/layer-hbase/config.yaml | 6 + .../src/charm/hbase/layer-hbase/icon.svg | 293 +------ .../src/charm/hbase/layer-hbase/layer.yaml | 17 +- .../lib/charms/layer/bigtop_hbase.py | 75 +- .../src/charm/hbase/layer-hbase/metadata.yaml | 6 +- .../charm/hbase/layer-hbase/reactive/hbase.py | 172 +++- .../layer-hbase/tests/01-basic-deployment.py | 2 +- .../hbase/layer-hbase/tests/02-smoke-test.py | 10 +- .../src/charm/hive/layer-hive/README.md | 237 ++++++ .../src/charm/hive/layer-hive/actions.yaml | 4 + .../src/charm/hive/layer-hive/actions/restart | 36 + .../charm/hive/layer-hive/actions/smoke-test | 49 ++ .../src/charm/hive/layer-hive/config.yaml | 6 + .../src/charm/hive/layer-hive/copyright | 16 + .../src/charm/hive/layer-hive/icon.svg | 75 ++ .../src/charm/hive/layer-hive/layer.yaml | 31 + .../layer-hive/lib/charms/layer/bigtop_hive.py | 138 +++ .../src/charm/hive/layer-hive/metadata.yaml | 19 + .../src/charm/hive/layer-hive/reactive/hive.py | 184 ++++ .../layer-hive/tests/01-basic-deployment.py | 39 + .../hive/layer-hive/tests/02-smoke-test.py | 60 ++ .../src/charm/hive/layer-hive/tests/tests.yaml | 3 + .../src/charm/kafka/layer-kafka/README.md | 50 +- .../kafka/layer-kafka/actions/create-topic | 7 +- .../kafka/layer-kafka/actions/kafkautils.py | 4 +- .../charm/kafka/layer-kafka/actions/list-topics | 7 +- .../charm/kafka/layer-kafka/actions/list-zks | 9 +- .../charm/kafka/layer-kafka/actions/read-topic | 7 +- .../charm/kafka/layer-kafka/actions/smoke-test | 9 +- .../charm/kafka/layer-kafka/actions/write-topic | 7 +- .../src/charm/kafka/layer-kafka/icon.svg | 107 +-- .../src/charm/kafka/layer-kafka/metadata.yaml | 25 +- .../charm/kafka/layer-kafka/tests/01-deploy.py | 4 +- .../kafka/layer-kafka/tests/02-smoke-test.py | 4 +- .../layer-kafka/tests/10-config-changed.py | 12 +- .../src/charm/mahout/layer-mahout/README.md | 54 +- .../mahout/layer-mahout/actions/smoke-test | 1 + .../src/charm/mahout/layer-mahout/metadata.yaml | 7 +- .../mahout/layer-mahout/tests/01-mahout-test.py | 12 +- .../src/charm/pig/layer-pig/README.md | 98 +-- .../src/charm/pig/layer-pig/actions/smoke-test | 15 +- .../src/charm/pig/layer-pig/metadata.yaml | 5 +- .../src/charm/pig/layer-pig/tests/01-deploy.py | 2 +- .../src/charm/spark/layer-spark/README.md | 200 ++--- .../src/charm/spark/layer-spark/actions.yaml | 45 +- .../charm/spark/layer-spark/actions/list-jobs | 11 +- .../charm/spark/layer-spark/actions/pagerank | 137 ++- .../actions/restart-spark-job-history-server | 26 +- .../spark/layer-spark/actions/spark-submit | 44 + .../charm/spark/layer-spark/actions/sparkbench | 10 +- .../src/charm/spark/layer-spark/actions/sparkpi | 43 +- .../actions/start-spark-job-history-server | 26 +- .../actions/stop-spark-job-history-server | 26 +- .../src/charm/spark/layer-spark/actions/submit | 58 +- .../src/charm/spark/layer-spark/config.yaml | 20 +- .../src/charm/spark/layer-spark/icon.svg | 850 +------------------ .../src/charm/spark/layer-spark/layer.yaml | 13 +- .../lib/charms/layer/bigtop_spark.py | 192 +++-- .../src/charm/spark/layer-spark/metadata.yaml | 6 +- .../charm/spark/layer-spark/reactive/spark.py | 245 ++++-- .../charm/spark/layer-spark/scripts/sparkpi.sh | 7 +- .../layer-spark/tests/01-basic-deployment.py | 2 +- .../spark/layer-spark/tests/02-smoke-test.py | 2 +- .../layer-spark/tests/03-scale-standalone.py | 7 +- .../charm/spark/layer-spark/tests/10-test-ha.py | 13 +- .../src/charm/zeppelin/layer-zeppelin/README.md | 105 ++- .../zeppelin/layer-zeppelin/actions/restart | 7 +- .../zeppelin/layer-zeppelin/actions/smoke-test | 16 +- .../src/charm/zeppelin/layer-zeppelin/icon.svg | 502 +---------- .../charm/zeppelin/layer-zeppelin/layer.yaml | 6 +- .../lib/charms/layer/bigtop_zeppelin.py | 87 +- .../charm/zeppelin/layer-zeppelin/metadata.yaml | 7 +- .../layer-zeppelin/reactive/zeppelin.py | 116 ++- .../layer-zeppelin/tests/01-basic-deployment.py | 2 +- .../layer-zeppelin/tests/02-zeppelin-smoke.py | 7 +- .../tests/03-zeppelin-spark-smoke.py | 51 ++ .../zeppelin/layer-zeppelin/wheelhouse.txt | 2 +- .../charm/zookeeper/layer-zookeeper/README.md | 50 +- .../zookeeper/layer-zookeeper/actions/restart | 11 +- .../layer-zookeeper/actions/smoke-test | 10 +- .../charm/zookeeper/layer-zookeeper/icon.svg | 673 +-------------- .../zookeeper/layer-zookeeper/metadata.yaml | 7 +- .../layer-zookeeper/tests/01-deploy-smoke.py | 5 +- .../layer-zookeeper/tests/10-bind-address.py | 4 +- .../src/common/ambari/do-component-build | 2 +- .../src/common/ambari/patch0-AMBARI.diff | 25 + .../src/common/ambari/patch1-AMBARI-storm.diff | 12 + .../ambari/patch2-AMBARI-ConcurrentHashMap.diff | 19 + .../src/common/apex/do-component-build | 3 +- .../src/common/apex/patch1-for-hadoop27x.diff | 20 +- .../src/common/flume/do-component-build | 2 +- .../src/common/hadoop/init-hcfs.json | 3 +- .../src/common/hama/do-component-build | 2 +- .../src/common/hbase/patch0-jline-jrub.diff | 15 + .../src/common/hive/do-component-build | 2 +- .../src/common/ignite-hadoop/do-component-build | 2 +- .../common/ignite-hadoop/ignite-hadoop.default | 2 + .../src/common/kafka/do-component-build | 2 +- .../src/common/oozie/do-component-build | 2 +- .../src/common/spark/do-component-build | 2 +- bigtop-packages/src/common/spark/spark-env.sh | 2 +- .../src/common/spark1/do-component-build | 2 +- .../src/common/zeppelin/do-component-build | 39 +- bigtop-packages/src/deb/flink/flink.preinst | 3 +- bigtop-packages/src/deb/flume/flume.preinst | 3 +- .../src/deb/hadoop/hadoop-hdfs.preinst | 3 +- .../src/deb/hadoop/hadoop-httpfs.preinst | 3 +- .../src/deb/hadoop/hadoop-mapreduce.preinst | 3 +- .../src/deb/hadoop/hadoop-yarn.preinst | 3 +- bigtop-packages/src/deb/hama/hama.preinst | 3 +- bigtop-packages/src/deb/hbase/hbase.preinst | 3 +- bigtop-packages/src/deb/hive/hive.preinst | 3 +- bigtop-packages/src/deb/hue/control | 2 +- bigtop-packages/src/deb/hue/hue-common.preinst | 3 +- .../src/deb/ignite-hadoop/ignite-hadoop.preinst | 3 +- bigtop-packages/src/deb/oozie/oozie.preinst | 3 +- bigtop-packages/src/deb/phoenix/phoenix.preinst | 9 +- bigtop-packages/src/deb/solr/solr.preinst | 3 +- bigtop-packages/src/deb/spark/control | 2 +- bigtop-packages/src/deb/spark/rules | 21 + .../src/deb/spark/spark-core.preinst | 3 +- .../src/deb/spark1/spark-core.preinst | 3 +- bigtop-packages/src/deb/sqoop/sqoop.preinst | 3 +- bigtop-packages/src/deb/tajo/tajo.preinst | 3 +- .../src/deb/zeppelin/zeppelin.preinst | 3 +- .../src/deb/zookeeper/zookeeper.preinst | 3 +- .../src/rpm/ambari/SPECS/ambari.spec | 5 +- bigtop-packages/src/rpm/hbase/SPECS/hbase.spec | 3 + .../rpm/ignite-hadoop/SPECS/ignite-hadoop.spec | 15 +- bigtop-packages/src/rpm/spark/SPECS/spark.spec | 21 +- bigtop-packages/src/rpm/ycsb/SPECS/ycsb.spec | 5 +- bigtop.bom | 17 +- bigtop_toolchain/bin/puppetize.sh | 8 +- bigtop_toolchain/manifests/gradle.pp | 2 +- bigtop_toolchain/manifests/jdk.pp | 10 +- bigtop_toolchain/manifests/packages.pp | 16 +- bigtop_toolchain/manifests/puppet-modules.pp | 7 +- build.gradle | 4 +- .../org/apache/bigtop/NullOutputStream.groovy | 27 - .../apache/bigtop/TestNullOutputStream.groovy | 29 - docker/bigtop-deploy/centos-6/Dockerfile | 28 - docker/bigtop-deploy/centos-6/build.sh | 18 - docker/bigtop-deploy/centos-7/Dockerfile | 28 - docker/bigtop-deploy/centos-7/build.sh | 20 - docker/bigtop-deploy/debian-8/Dockerfile | 34 - docker/bigtop-deploy/debian-8/build.sh | 18 - docker/bigtop-deploy/ubuntu-14.04/Dockerfile | 31 - docker/bigtop-deploy/ubuntu-14.04/build.sh | 18 - docker/bigtop-puppet/debian-9/Dockerfile | 20 + docker/bigtop-puppet/debian-9/build.sh | 16 + docker/bigtop-slaves/debian-9/Dockerfile | 23 + .../pseudo-cluster/config/hieradata/site.yaml | 1 - docker/sandbox/README.md | 42 +- docker/sandbox/build.sh | 35 +- docker/sandbox/sandbox-env.sh | 18 +- .../sandbox/site.yaml.template.centos-6_hadoop | 3 +- .../sandbox/site.yaml.template.debian-8_hadoop | 3 +- gradle/wrapper/gradle-wrapper.properties | 2 +- packages.gradle | 7 +- pom.xml | 3 +- provisioner/docker/config.yaml | 2 +- provisioner/docker/config/hiera.yaml | 1 - provisioner/docker/config/hieradata/PLACEHOLDER | 0 provisioner/docker/config/hosts | 1 - provisioner/docker/config_centos-6.yaml | 24 + provisioner/docker/config_centos-7.yaml | 24 + provisioner/docker/config_centos6.yaml | 25 - provisioner/docker/config_centos7.yaml | 25 - provisioner/docker/config_debian-8.yaml | 24 + provisioner/docker/config_debian8.yaml | 25 - provisioner/docker/config_ubuntu-16.04.yaml | 24 + provisioner/docker/config_ubuntu_xenial.yaml | 25 - provisioner/docker/docker-hadoop.sh | 21 +- provisioner/vagrant/Vagrantfile | 4 - provisioner/vagrant/vagrantconfig.yaml | 1 - 246 files changed, 3803 insertions(+), 4385 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/d80b82da/bigtop.bom ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/d80b82da/build.gradle ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/d80b82da/pom.xml ----------------------------------------------------------------------
