Repository: chukwa Updated Branches: refs/heads/master 750e3190c -> bc8436849
CHUKWA-808. Fix solr startup for Docker support. (Eric Yang) Project: http://git-wip-us.apache.org/repos/asf/chukwa/repo Commit: http://git-wip-us.apache.org/repos/asf/chukwa/commit/bc843684 Tree: http://git-wip-us.apache.org/repos/asf/chukwa/tree/bc843684 Diff: http://git-wip-us.apache.org/repos/asf/chukwa/diff/bc843684 Branch: refs/heads/master Commit: bc8436849a5a7f0dc4146055be4977f721fc641f Parents: 750e319 Author: Eric Yang <[email protected]> Authored: Sun May 29 19:50:09 2016 -0700 Committer: Eric Yang <[email protected]> Committed: Sun May 29 19:50:09 2016 -0700 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ contrib/docker/start-all.sh | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/chukwa/blob/bc843684/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index bb57155..44a5350 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -22,6 +22,8 @@ Release 0.8 - 05/22/2016 BUGS + CHUKWA-808. Fix solr startup for Docker support. (Eric Yang) + CHUKWA-807. Update Docker support to current. (Eric Yang) CHUKWA-803. Update Solr API to version 5 API. (Eric Yang) http://git-wip-us.apache.org/repos/asf/chukwa/blob/bc843684/contrib/docker/start-all.sh ---------------------------------------------------------------------- diff --git a/contrib/docker/start-all.sh b/contrib/docker/start-all.sh index 17701f5..7f0fd7b 100755 --- a/contrib/docker/start-all.sh +++ b/contrib/docker/start-all.sh @@ -21,8 +21,8 @@ export HBASE_CONF_DIR=/opt/apache/hbase/conf export CHUKWA_CONF_DIR=/opt/apache/chukwa/etc/chukwa service sshd start su - zookeeper -c '/opt/apache/zookeeper/bin/zkServer.sh start' -su - solr -c 'cd /opt/apache/solr; ./bin/solr start -cloud -z localhost:2181 >/dev/null 2>&1 &' -su - solr -c 'cd /opt/apache/solr; ./bin/solr create_collection -c chukwa -n chukwa >/dev/null 2>&1 &' +su - solr -c 'cd /opt/apache/solr; ./bin/solr start -cloud -z localhost:2181' +su - solr -c 'cd /opt/apache/solr; ./bin/solr create_collection -c chukwa -n chukwa' su - hdfs -c '/opt/apache/hadoop/sbin/start-dfs.sh >/dev/null 2>&1' su - yarn -c '/opt/apache/hadoop/sbin/start-yarn.sh >/dev/null 2>&1' SAFE_MODE=`su - hdfs -c '/opt/apache/hadoop/bin/hadoop dfsadmin -safemode get 2>/dev/null'`
