You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by ev...@apache.org on 2017/05/13 03:34:03 UTC
bigtop git commit: BIGTOP-2756. Get rid of Permission Denied when
creating/destroying Docker Provisioner cluster
Repository: bigtop
Updated Branches:
refs/heads/master 73864a30b -> ddf97c85d
BIGTOP-2756. Get rid of Permission Denied when creating/destroying Docker Provisioner cluster
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/ddf97c85
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/ddf97c85
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/ddf97c85
Branch: refs/heads/master
Commit: ddf97c85d3f3eef4c670226a37198854cc9ebd72
Parents: 73864a3
Author: Evans Ye <ev...@apache.org>
Authored: Sat May 6 18:26:56 2017 +0800
Committer: Evans Ye <ev...@apache.org>
Committed: Sat May 13 11:33:50 2017 +0800
----------------------------------------------------------------------
provisioner/docker/config/hiera.yaml | 1 -
provisioner/docker/config/hieradata/PLACEHOLDER | 0
provisioner/docker/config/hosts | 1 -
provisioner/docker/docker-hadoop.sh | 17 ++++++++++-------
4 files changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/ddf97c85/provisioner/docker/config/hiera.yaml
----------------------------------------------------------------------
diff --git a/provisioner/docker/config/hiera.yaml b/provisioner/docker/config/hiera.yaml
deleted file mode 100644
index 8b13789..0000000
--- a/provisioner/docker/config/hiera.yaml
+++ /dev/null
@@ -1 +0,0 @@
-
http://git-wip-us.apache.org/repos/asf/bigtop/blob/ddf97c85/provisioner/docker/config/hieradata/PLACEHOLDER
----------------------------------------------------------------------
diff --git a/provisioner/docker/config/hieradata/PLACEHOLDER b/provisioner/docker/config/hieradata/PLACEHOLDER
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/bigtop/blob/ddf97c85/provisioner/docker/config/hosts
----------------------------------------------------------------------
diff --git a/provisioner/docker/config/hosts b/provisioner/docker/config/hosts
deleted file mode 100644
index 8b13789..0000000
--- a/provisioner/docker/config/hosts
+++ /dev/null
@@ -1 +0,0 @@
-
http://git-wip-us.apache.org/repos/asf/bigtop/blob/ddf97c85/provisioner/docker/docker-hadoop.sh
----------------------------------------------------------------------
diff --git a/provisioner/docker/docker-hadoop.sh b/provisioner/docker/docker-hadoop.sh
index 12488a1..2fdecc2 100755
--- a/provisioner/docker/docker-hadoop.sh
+++ b/provisioner/docker/docker-hadoop.sh
@@ -34,7 +34,7 @@ usage() {
create() {
if [ -e .provision_id ]; then
- echo "Cluster already exist! Run ./$PROG -d to destroy the cluster or delete .provision_id file and containers manually."
+ log "Cluster already exist! Run ./$PROG -d to destroy the cluster or delete .provision_id file and containers manually."
exit 1;
fi
echo "`date +'%Y%m%d_%H%M%S'`_R$RANDOM" > .provision_id
@@ -49,7 +49,7 @@ create() {
# Startup instances
docker-compose -p $PROVISION_ID scale bigtop=$1
if [ $? -ne 0 ]; then
- echo "Docker container(s) startup failed!";
+ log "Docker container(s) startup failed!";
exit 1;
fi
@@ -78,11 +78,11 @@ generate-hosts() {
done
wait
# This must be the last entry in the /etc/hosts
- echo "127.0.0.1 localhost" >> ./config/hosts
+ docker exec ${NODES[0]} bash -c "echo '127.0.0.1 localhost' >> ./config/hosts"
}
generate-config() {
- echo "Bigtop Puppet configurations are shared between instances, and can be modified under config/hieradata"
+ log "Bigtop Puppet configurations are shared between instances, and can be modified under config/hieradata"
cat $BIGTOP_PUPPET_DIR/hiera.yaml >> ./config/hiera.yaml
cp -vfr $BIGTOP_PUPPET_DIR/hieradata ./config/
cat > ./config/hieradata/site.yaml << EOF
@@ -122,13 +122,12 @@ smoke-tests() {
}
destroy() {
+ docker exec ${NODES[0]} bash -c "umount /etc/hosts; rm -f /etc/hosts"
if [ -n "$PROVISION_ID" ]; then
docker-compose -p $PROVISION_ID stop
docker-compose -p $PROVISION_ID rm -f
fi
- echo > ./config/hiera.yaml
- echo > ./config/hosts
- rm -rvf ./config/hieradata/bigtop ./config/hieradata/site.yaml .provision_id
+ rm -rvf ./config .provision_id
}
bigtop-puppet() {
@@ -180,6 +179,10 @@ list() {
echo "$msg"
}
+log() {
+ echo -e "\n[LOG] $1\n"
+}
+
PROG=`basename $0`
if [ $# -eq 0 ]; then