You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by fj...@apache.org on 2019/11/27 07:17:13 UTC
[incubator-druid] branch 0.16.1-incubating updated: Use bundled
ZooKeeper in tutorials. (#8792) (#8952)
This is an automated email from the ASF dual-hosted git repository.
fjy pushed a commit to branch 0.16.1-incubating
in repository https://gitbox.apache.org/repos/asf/incubator-druid.git
The following commit(s) were added to refs/heads/0.16.1-incubating by this push:
new dfc6210 Use bundled ZooKeeper in tutorials. (#8792) (#8952)
dfc6210 is described below
commit dfc6210e5ed05d31c6164f26fdfb19cde77acab0
Author: Jonathan Wei <jo...@users.noreply.github.com>
AuthorDate: Tue Nov 26 23:17:01 2019 -0800
Use bundled ZooKeeper in tutorials. (#8792) (#8952)
---
docs/tutorials/cluster.md | 11 ++---------
docs/tutorials/index.md | 20 ++------------------
examples/bin/run-zk | 3 ++-
examples/conf/zk/log4j.xml | 17 -----------------
examples/conf/zk/log4j2.xml | 32 ++++++++++++++++++++++++++++++++
5 files changed, 38 insertions(+), 45 deletions(-)
diff --git a/docs/tutorials/cluster.md b/docs/tutorials/cluster.md
index 26a5d27..ad3cb3c 100644
--- a/docs/tutorials/cluster.md
+++ b/docs/tutorials/cluster.md
@@ -431,15 +431,8 @@ bin/start-cluster-master-no-zk-server
### With Zookeeper on Master
-If you plan to run ZK on Master servers, first update `conf/zoo.cfg` to reflect how you plan to run ZK. Then log on to your Master servers and install Zookeeper:
-
-```bash
-curl http://www.gtlib.gatech.edu/pub/apache/zookeeper/zookeeper-3.4.14/zookeeper-3.4.14.tar.gz -o zookeeper-3.4.14.tar.gz
-tar -xzf zookeeper-3.4.14.tar.gz
-mv zookeeper-3.4.14 zk
-```
-
-If you are running ZK on the Master server, you can start the Master server processes together with ZK using:
+If you plan to run ZK on Master servers, first update `conf/zoo.cfg` to reflect how you plan to run ZK. Then, you
+can start the Master server processes together with ZK using:
```
bin/start-cluster-master-with-zk-server
diff --git a/docs/tutorials/index.md b/docs/tutorials/index.md
index 6eb7bef..53e5a3e 100644
--- a/docs/tutorials/index.md
+++ b/docs/tutorials/index.md
@@ -72,22 +72,6 @@ In the package, you should find:
* `lib/*` - libraries and dependencies for core Druid
* `quickstart/*` - configuration files, sample data, and other files for the quickstart tutorials
-## Download Zookeeper
-
-Druid has a dependency on [Apache ZooKeeper](http://zookeeper.apache.org/) for distributed coordination. You'll
-need to download and run Zookeeper.
-
-In the package root, run the following commands:
-
-```bash
-curl https://archive.apache.org/dist/zookeeper/zookeeper-3.4.14/zookeeper-3.4.14.tar.gz -o zookeeper-3.4.14.tar.gz
-tar -xzf zookeeper-3.4.14.tar.gz
-mv zookeeper-3.4.14 zk
-```
-
-The startup scripts for the tutorial will expect the contents of the Zookeeper tarball to be located at `zk` under the
-apache-druid-{{DRUIDVERSION}} package root.
-
## Start up Druid services
The following commands will assume that you are using the `micro-quickstart` single-machine configuration. If you are
@@ -100,7 +84,7 @@ From the apache-druid-{{DRUIDVERSION}} package root, run the following command:
./bin/start-micro-quickstart
```
-This will bring up instances of Zookeeper and the Druid services, all running on the local machine, e.g.:
+This will bring up instances of ZooKeeper and the Druid services, all running on the local machine, e.g.:
```bash
$ ./bin/start-micro-quickstart
@@ -200,7 +184,7 @@ Once every service has started, you are now ready to load data.
If you completed [Tutorial: Loading stream data from Kafka](./tutorial-kafka.md) and wish to reset the cluster state, you should additionally clear out any Kafka state.
-Shut down the Kafka broker with CTRL-C before stopping Zookeeper and the Druid services, and then delete the Kafka log directory at `/tmp/kafka-logs`:
+Shut down the Kafka broker with CTRL-C before stopping ZooKeeper and the Druid services, and then delete the Kafka log directory at `/tmp/kafka-logs`:
```bash
rm -rf /tmp/kafka-logs
diff --git a/examples/bin/run-zk b/examples/bin/run-zk
index e23d63e..c6345d9 100755
--- a/examples/bin/run-zk
+++ b/examples/bin/run-zk
@@ -38,6 +38,7 @@ WHEREAMI="$(cd "$WHEREAMI" && pwd)"
cd "$WHEREAMI/.."
exec java `cat "$CONFDIR"/jvm.config | xargs` \
- -cp "$WHEREAMI/../zk/lib/*:$WHEREAMI/../zk/*:$CONFDIR" \
+ -cp "$WHEREAMI/../lib/*:$CONFDIR" \
+ -Dzookeeper.jmx.log4j.disable=true \
org.apache.zookeeper.server.quorum.QuorumPeerMain \
"$CONFDIR"/zoo.cfg
diff --git a/examples/conf/zk/log4j.xml b/examples/conf/zk/log4j.xml
deleted file mode 100644
index 5ed9b01..0000000
--- a/examples/conf/zk/log4j.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
- <appender name="console" class="org.apache.log4j.ConsoleAppender">
- <param name="Target" value="System.out"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{ISO8601} %p [%t] %c - %m%n"/>
- </layout>
- </appender>
-
- <root>
- <priority value ="info" />
- <appender-ref ref="console" />
- </root>
-
-</log4j:configuration>
diff --git a/examples/conf/zk/log4j2.xml b/examples/conf/zk/log4j2.xml
new file mode 100644
index 0000000..0ad3c40
--- /dev/null
+++ b/examples/conf/zk/log4j2.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+-->
+
+<Configuration status="WARN">
+ <Appenders>
+ <Console name="Console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d{ISO8601} %p [%t] %c - %m%n"/>
+ </Console>
+ </Appenders>
+ <Loggers>
+ <Root level="info">
+ <AppenderRef ref="Console"/>
+ </Root>
+ </Loggers>
+</Configuration>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org