diff --git a/.env b/.env index 104c809..65cb19a 100644 --- a/.env +++ b/.env @@ -1,7 +1,7 @@ PINPOINT_VERSION=2.0.4 SPRING_PROFILES=release #zookeeper information required -PINPOINT_ZOOKEEPER_ADDRESS=pinpoint-hbase +PINPOINT_ZOOKEEPER_ADDRESS=zoo1 ### Pinpoint-Hbase @@ -76,7 +76,7 @@ COLLECTOR_RECEIVER_STAT_UDP_PORT=9995 COLLECTOR_RECEIVER_SPAN_UDP_PORT=9996 FLINK_CLUSTER_ENABLE=true -FLINK_CLUSTER_ZOOKEEPER_ADDRESS=pinpoint-hbase +FLINK_CLUSTER_ZOOKEEPER_ADDRESS=zoo1 ### Pinpoint-Agent diff --git a/docker-compose.yml b/docker-compose.yml index 1ea9299..86efd4e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,8 +17,6 @@ services: - /home/pinpoint/hbase - /home/pinpoint/zookeeper expose: - # zookeeper - - "2181" # HBase Master API port - "60000" # HBase Master Web UI @@ -28,7 +26,6 @@ services: # HBase Regionserver web UI - "16030" ports: - - "${EXTERNAL_HBASE_PORT:-2181}:2181" - "60000:60000" - "16010:16010" - "60020:60020" @@ -205,6 +202,12 @@ services: image: zookeeper:3.4 restart: always hostname: zoo1 + expose: + - "2181" + - "2888" + - "3888" + ports: + - "2181" environment: ZOO_MY_ID: 1 ZOO_SERVERS: server.1=0.0.0.0:2888:3888 server.2=zoo2:2888:3888 server.3=zoo3:2888:3888 @@ -215,6 +218,12 @@ services: image: zookeeper:3.4 restart: always hostname: zoo2 + expose: + - "2181" + - "2888" + - "3888" + ports: + - "2181" environment: ZOO_MY_ID: 2 ZOO_SERVERS: server.1=zoo1:2888:3888 server.2=0.0.0.0:2888:3888 server.3=zoo3:2888:3888 @@ -225,6 +234,12 @@ services: image: zookeeper:3.4 restart: always hostname: zoo3 + expose: + - "2181" + - "2888" + - "3888" + ports: + - "2181" environment: ZOO_MY_ID: 3 ZOO_SERVERS: server.1=zoo1:2888:3888 server.2=zoo2:2888:3888 server.3=0.0.0.0:2888:3888 diff --git a/pinpoint-collector/build/config/pinpoint-collector.properties b/pinpoint-collector/build/config/pinpoint-collector.properties index 258c2ee..8fc54b2 100644 --- a/pinpoint-collector/build/config/pinpoint-collector.properties +++ b/pinpoint-collector/build/config/pinpoint-collector.properties @@ -5,4 +5,4 @@ # ex) PINPOINT_ZOOKEEPER_ADDRESS should be commented in docker-compose to use pinpoint.zookeeper.address below ########## # -# pinpoint.zookeeper.address= \ No newline at end of file +#pinpoint.zookeeper.address= \ No newline at end of file diff --git a/pinpoint-hbase/.env b/pinpoint-hbase/.env index becae9c..7989a41 100644 --- a/pinpoint-hbase/.env +++ b/pinpoint-hbase/.env @@ -4,5 +4,5 @@ PINPOINT_VERSION=2.0.4 PINPOINT_HBASE_NAME=pinpoint-hbase #config for hbase in external docker -EXTERNAL_HBASE_PORT=2180 +EXTERNAL_HBASE_PORT=2181 diff --git a/pinpoint-hbase/Dockerfile b/pinpoint-hbase/Dockerfile index 710737f..9690981 100644 --- a/pinpoint-hbase/Dockerfile +++ b/pinpoint-hbase/Dockerfile @@ -13,20 +13,20 @@ ENV HBASE_HOME=${BASE_DIR}/hbase-${HBASE_VERSION} COPY hbase-site.xml hbase-site.xml +COPY hbase-env.sh hbase-env.sh +COPY /build/scripts/initialize-hbase.sh /usr/local/bin/ +COPY /build/scripts/check-table.sh /usr/local/bin/ -RUN mkdir -p ${BASE_DIR} \ +RUN chmod a+x /usr/local/bin/initialize-hbase.sh \ + && chmod a+x /usr/local/bin/check-table.sh \ + && mkdir -p ${BASE_DIR} \ && cd ${BASE_DIR} \ && curl -fSL "${HBASE_REPOSITORY}/${HBASE_VERSION}/hbase-${HBASE_VERSION}-bin.tar.gz" -o hbase.tar.gz || curl -fSL "${HBASE_SUB_REPOSITORY}/${HBASE_VERSION}/hbase-${HBASE_VERSION}-bin.tar.gz" -o hbase.tar.gz \ && tar xfvz hbase.tar.gz \ && mv ../../hbase-site.xml ../../${HBASE_HOME}/conf/hbase-site.xml \ - && curl -SL "https://raw.githubusercontent.com/naver/pinpoint/v${PINPOINT_VERSION}/hbase/scripts/hbase-create.hbase" -o ${BASE_DIR}/hbase-create.hbase \ - && ${HBASE_HOME}/bin/start-hbase.sh \ - && sleep 10 \ - && ${HBASE_HOME}/bin/hbase shell ${BASE_DIR}/hbase-create.hbase \ - && ${HBASE_HOME}/bin/stop-hbase.sh \ - && rm ${BASE_DIR}/hbase-create.hbase \ - && rm -rf hbase.tar.gz + && mv ../../hbase-env.sh ../../${HBASE_HOME}/conf/hbase-env.sh \ + && curl -SL "https://raw.githubusercontent.com/naver/pinpoint/v${PINPOINT_VERSION}/hbase/scripts/hbase-create.hbase" -o ${BASE_DIR}/hbase-create.hbase VOLUME ["/home/pinpoint/hbase", "/home/pinpoint/zookeeper"] -ENTRYPOINT ${BASE_DIR}/hbase-${HBASE_VERSION}/bin/hbase master start +CMD /usr/local/bin/initialize-hbase.sh && tail -f $HBASE_HOME/logs/* diff --git a/pinpoint-hbase/hbase-env.sh b/pinpoint-hbase/hbase-env.sh new file mode 100644 index 0000000..db2dbb7 --- /dev/null +++ b/pinpoint-hbase/hbase-env.sh @@ -0,0 +1,138 @@ + +# +#/** +# * 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. +# */ + +# Set environment variables here. + +# This script sets variables multiple times over the course of starting an hbase process, +# so try to keep things idempotent unless you want to take an even deeper look +# into the startup scripts (bin/hbase, etc.) + +# The java implementation to use. Java 1.7+ required. +# export JAVA_HOME=/usr/java/jdk1.6.0/ + +# Extra Java CLASSPATH elements. Optional. +# export HBASE_CLASSPATH= + +# The maximum amount of heap to use. Default is left to JVM default. +# export HBASE_HEAPSIZE=1G + +# Uncomment below if you intend to use off heap cache. For example, to allocate 8G of +# offheap, set the value to "8G". +# export HBASE_OFFHEAPSIZE=1G + +# Extra Java runtime options. +# Below are what we set by default. May only work with SUN JVM. +# For more on why as well as other possible settings, +# see http://wiki.apache.org/hadoop/PerformanceTuning +export HBASE_OPTS="-XX:+UseConcMarkSweepGC" + +# Configure PermSize. Only needed in JDK7. You can safely remove it for JDK8+ +export HBASE_MASTER_OPTS="$HBASE_MASTER_OPTS -XX:PermSize=128m -XX:MaxPermSize=128m" +export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS -XX:PermSize=128m -XX:MaxPermSize=128m" + +# Uncomment one of the below three options to enable java garbage collection logging for the server-side processes. + +# This enables basic gc logging to the .out file. +# export SERVER_GC_OPTS="-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps" + +# This enables basic gc logging to its own file. +# If FILE-PATH is not replaced, the log file(.gc) would still be generated in the HBASE_LOG_DIR . +# export SERVER_GC_OPTS="-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:" + +# This enables basic GC logging to its own file with automatic log rolling. Only applies to jdk 1.6.0_34+ and 1.7.0_2+. +# If FILE-PATH is not replaced, the log file(.gc) would still be generated in the HBASE_LOG_DIR . +# export SERVER_GC_OPTS="-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc: -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=1 -XX:GCLogFileSize=512M" + +# Uncomment one of the below three options to enable java garbage collection logging for the client processes. + +# This enables basic gc logging to the .out file. +# export CLIENT_GC_OPTS="-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps" + +# This enables basic gc logging to its own file. +# If FILE-PATH is not replaced, the log file(.gc) would still be generated in the HBASE_LOG_DIR . +# export CLIENT_GC_OPTS="-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:" + +# This enables basic GC logging to its own file with automatic log rolling. Only applies to jdk 1.6.0_34+ and 1.7.0_2+. +# If FILE-PATH is not replaced, the log file(.gc) would still be generated in the HBASE_LOG_DIR . +# export CLIENT_GC_OPTS="-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc: -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=1 -XX:GCLogFileSize=512M" + +# See the package documentation for org.apache.hadoop.hbase.io.hfile for other configurations +# needed setting up off-heap block caching. + +# Uncomment and adjust to enable JMX exporting +# See jmxremote.password and jmxremote.access in $JRE_HOME/lib/management to configure remote password access. +# More details at: http://java.sun.com/javase/6/docs/technotes/guides/management/agent.html +# NOTE: HBase provides an alternative JMX implementation to fix the random ports issue, please see JMX +# section in HBase Reference Guide for instructions. + +# export HBASE_JMX_BASE="-Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false" +# export HBASE_MASTER_OPTS="$HBASE_MASTER_OPTS $HBASE_JMX_BASE -Dcom.sun.management.jmxremote.port=10101" +# export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS $HBASE_JMX_BASE -Dcom.sun.management.jmxremote.port=10102" +# export HBASE_THRIFT_OPTS="$HBASE_THRIFT_OPTS $HBASE_JMX_BASE -Dcom.sun.management.jmxremote.port=10103" +# export HBASE_ZOOKEEPER_OPTS="$HBASE_ZOOKEEPER_OPTS $HBASE_JMX_BASE -Dcom.sun.management.jmxremote.port=10104" +# export HBASE_REST_OPTS="$HBASE_REST_OPTS $HBASE_JMX_BASE -Dcom.sun.management.jmxremote.port=10105" + +# File naming hosts on which HRegionServers will run. $HBASE_HOME/conf/regionservers by default. +# export HBASE_REGIONSERVERS=${HBASE_HOME}/conf/regionservers + +# Uncomment and adjust to keep all the Region Server pages mapped to be memory resident +#HBASE_REGIONSERVER_MLOCK=true +#HBASE_REGIONSERVER_UID="hbase" + +# File naming hosts on which backup HMaster will run. $HBASE_HOME/conf/backup-masters by default. +# export HBASE_BACKUP_MASTERS=${HBASE_HOME}/conf/backup-masters + +# Extra ssh options. Empty by default. +# export HBASE_SSH_OPTS="-o ConnectTimeout=1 -o SendEnv=HBASE_CONF_DIR" + +# Where log files are stored. $HBASE_HOME/logs by default. +# export HBASE_LOG_DIR=${HBASE_HOME}/logs + +# Enable remote JDWP debugging of major HBase processes. Meant for Core Developers +# export HBASE_MASTER_OPTS="$HBASE_MASTER_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8070" +# export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8071" +# export HBASE_THRIFT_OPTS="$HBASE_THRIFT_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8072" +# export HBASE_ZOOKEEPER_OPTS="$HBASE_ZOOKEEPER_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8073" + +# A string representing this instance of hbase. $USER by default. +# export HBASE_IDENT_STRING=$USER + +# The scheduling priority for daemon processes. See 'man nice'. +# export HBASE_NICENESS=10 + +# The directory where pid files are stored. /tmp by default. +# export HBASE_PID_DIR=/var/hadoop/pids + +# Seconds to sleep between slave commands. Unset by default. This +# can be useful in large clusters, where, e.g., slave rsyncs can +# otherwise arrive faster than the master can service them. +# export HBASE_SLAVE_SLEEP=0.1 + +# Tell HBase whether it should manage it's own instance of Zookeeper or not. +export HBASE_MANAGES_ZK=false + +# The default log rolling policy is RFA, where the log file is rolled as per the size defined for the +# RFA appender. Please refer to the log4j.properties file to see more details on this appender. +# In case one needs to do log rolling on a date change, one should set the environment property +# HBASE_ROOT_LOGGER to ",DRFA". +# For example: +# HBASE_ROOT_LOGGER=INFO,DRFA +# The reason for changing default to RFA is to avoid the boundary case of filling out disk space as +# DRFA doesn't put any cap on the log size. Please refer to HBase-5655 for more context. \ No newline at end of file diff --git a/pinpoint-hbase/hbase-site.xml b/pinpoint-hbase/hbase-site.xml index 99d11dd..ba5105c 100644 --- a/pinpoint-hbase/hbase-site.xml +++ b/pinpoint-hbase/hbase-site.xml @@ -4,9 +4,21 @@ file:///home/pinpoint/hbase - hbase.zookeeper.property.dataDir - /home/pinpoint/zookeeper + hbase.cluster.distributed + true + + zookeeper.znode.parent + /hbase + + + hbase.zookeeper.quorum + zoo1,zoo2,zoo3 + + + hbase.zookeeper.property.clientPort + 2181 + hbase.master.port 60000 diff --git a/pinpoint-zookeeper/docker-compose.yml b/pinpoint-zookeeper/docker-compose.yml index 7599a6d..84e2883 100644 --- a/pinpoint-zookeeper/docker-compose.yml +++ b/pinpoint-zookeeper/docker-compose.yml @@ -1,7 +1,5 @@ version: "3.6" - -servidocker -docker-compose pull && docker-compose upces: +services: #zookeepers zoo1: image: zookeeper:3.4 @@ -10,9 +8,14 @@ docker-compose pull && docker-compose upces: environment: ZOO_MY_ID: 1 ZOO_SERVERS: server.1=0.0.0.0:2888:3888 server.2=zoo2:2888:3888 server.3=zoo3:2888:3888 + expose: + - "2181" + - "2888" + - "3888" + ports: + - "2181" networks: - pinpoint - zoo2: image: zookeeper:3.4 restart: always @@ -20,9 +23,14 @@ docker-compose pull && docker-compose upces: environment: ZOO_MY_ID: 2 ZOO_SERVERS: server.1=zoo1:2888:3888 server.2=0.0.0.0:2888:3888 server.3=zoo3:2888:3888 + expose: + - "2181" + - "2888" + - "3888" + ports: + - "2181" networks: - pinpoint - zoo3: image: zookeeper:3.4 restart: always @@ -30,9 +38,14 @@ docker-compose pull && docker-compose upces: environment: ZOO_MY_ID: 3 ZOO_SERVERS: server.1=zoo1:2888:3888 server.2=zoo2:2888:3888 server.3=0.0.0.0:2888:3888 + expose: + - "2181" + - "2888" + - "3888" + ports: + - "2181" networks: - pinpoint - networks: pinpoint: - driver: bridge + driver: bridge \ No newline at end of file