Merge "Get rid of zookeeper from devstack"
This commit is contained in:
Jenkins
Gerrit Code Review
commit
7b230532dc
@ -1 +0,0 @@
|
|||||||
zookeeperd
|
|
||||||
@ -1 +0,0 @@
|
|||||||
zookeeper
|
|
||||||
@ -1,36 +0,0 @@
|
|||||||
#
|
|
||||||
# (C) Copyright 2015 Hewlett Packard Enterprise Development Company LP
|
|
||||||
#
|
|
||||||
# Licensed 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.
|
|
||||||
#
|
|
||||||
|
|
||||||
# Modified from http://packages.ubuntu.com/saucy/zookeeperd
|
|
||||||
NAME=zookeeper
|
|
||||||
ZOOCFGDIR=/etc/zookeeper/conf
|
|
||||||
|
|
||||||
# seems, that log4j requires the log4j.properties file to be in the classpath
|
|
||||||
CLASSPATH="$ZOOCFGDIR:/usr/share/java/jline.jar:/usr/share/java/log4j-1.2.jar:/usr/share/java/xercesImpl.jar:/usr/share/java/xmlParserAPIs.jar:/usr/share/java/netty.jar:/usr/share/java/slf4j-api.jar:/usr/share/java/slf4j-log4j12.jar:/usr/share/java/zookeeper.jar"
|
|
||||||
|
|
||||||
ZOOCFG="$ZOOCFGDIR/zoo.cfg"
|
|
||||||
ZOO_LOG_DIR=/var/log/zookeeper
|
|
||||||
USER=$NAME
|
|
||||||
GROUP=$NAME
|
|
||||||
PIDDIR=/var/run/$NAME
|
|
||||||
PIDFILE=$PIDDIR/$NAME.pid
|
|
||||||
SCRIPTNAME=/etc/init.d/$NAME
|
|
||||||
JAVA=/usr/bin/java
|
|
||||||
ZOOMAIN="org.apache.zookeeper.server.quorum.QuorumPeerMain"
|
|
||||||
ZOO_LOG4J_PROP="INFO,ROLLINGFILE"
|
|
||||||
JMXLOCALONLY=false
|
|
||||||
JAVA_OPTS=""
|
|
||||||
@ -1,69 +0,0 @@
|
|||||||
#
|
|
||||||
# (C) Copyright 2015 Hewlett Packard Enterprise Development Company LP
|
|
||||||
#
|
|
||||||
# Licensed 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.
|
|
||||||
#
|
|
||||||
|
|
||||||
# From http://packages.ubuntu.com/saucy/zookeeperd
|
|
||||||
|
|
||||||
# ZooKeeper Logging Configuration
|
|
||||||
#
|
|
||||||
|
|
||||||
# Format is "<default threshold> (, <appender>)+
|
|
||||||
|
|
||||||
log4j.rootLogger=${zookeeper.root.logger}
|
|
||||||
|
|
||||||
# Example: console appender only
|
|
||||||
# log4j.rootLogger=INFO, CONSOLE
|
|
||||||
|
|
||||||
# Example with rolling log file
|
|
||||||
#log4j.rootLogger=DEBUG, CONSOLE, ROLLINGFILE
|
|
||||||
|
|
||||||
# Example with rolling log file and tracing
|
|
||||||
#log4j.rootLogger=TRACE, CONSOLE, ROLLINGFILE, TRACEFILE
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log INFO level and above messages to the console
|
|
||||||
#
|
|
||||||
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
|
|
||||||
log4j.appender.CONSOLE.Threshold=INFO
|
|
||||||
log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
|
|
||||||
log4j.appender.CONSOLE.layout.ConversionPattern=%d{ISO8601} - %-5p [%t:%C{1}@%L] - %m%n
|
|
||||||
|
|
||||||
#
|
|
||||||
# Add ROLLINGFILE to rootLogger to get log file output
|
|
||||||
# Log DEBUG level and above messages to a log file
|
|
||||||
log4j.appender.ROLLINGFILE=org.apache.log4j.RollingFileAppender
|
|
||||||
log4j.appender.ROLLINGFILE.Threshold=WARN
|
|
||||||
log4j.appender.ROLLINGFILE.File=${zookeeper.log.dir}/zookeeper.log
|
|
||||||
|
|
||||||
# Max log file size of 10MB
|
|
||||||
log4j.appender.ROLLINGFILE.MaxFileSize=10MB
|
|
||||||
# uncomment the next line to limit number of backup files
|
|
||||||
#log4j.appender.ROLLINGFILE.MaxBackupIndex=10
|
|
||||||
|
|
||||||
log4j.appender.ROLLINGFILE.layout=org.apache.log4j.PatternLayout
|
|
||||||
log4j.appender.ROLLINGFILE.layout.ConversionPattern=%d{ISO8601} - %-5p [%t:%C{1}@%L] - %m%n
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Add TRACEFILE to rootLogger to get log file output
|
|
||||||
# Log DEBUG level and above messages to a log file
|
|
||||||
log4j.appender.TRACEFILE=org.apache.log4j.FileAppender
|
|
||||||
log4j.appender.TRACEFILE.Threshold=TRACE
|
|
||||||
log4j.appender.TRACEFILE.File=${zookeeper.log.dir}/zookeeper_trace.log
|
|
||||||
|
|
||||||
log4j.appender.TRACEFILE.layout=org.apache.log4j.PatternLayout
|
|
||||||
### Notice we are including log4j's NDC here (%x)
|
|
||||||
log4j.appender.TRACEFILE.layout.ConversionPattern=%d{ISO8601} - %-5p [%t:%C{1}@%L][%x] - %m%n
|
|
||||||
@ -1 +0,0 @@
|
|||||||
0
|
|
||||||
@ -1,74 +0,0 @@
|
|||||||
#
|
|
||||||
# (C) Copyright 2015 Hewlett Packard Enterprise Development Company LP
|
|
||||||
#
|
|
||||||
# Licensed 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.
|
|
||||||
#
|
|
||||||
# http://hadoop.apache.org/zookeeper/docs/current/zookeeperAdmin.html
|
|
||||||
|
|
||||||
# The number of milliseconds of each tick
|
|
||||||
tickTime=2000
|
|
||||||
# The number of ticks that the initial
|
|
||||||
# synchronization phase can take
|
|
||||||
initLimit=10
|
|
||||||
# The number of ticks that can pass between
|
|
||||||
# sending a request and getting an acknowledgement
|
|
||||||
syncLimit=5
|
|
||||||
# the directory where the snapshot is stored.
|
|
||||||
dataDir=/var/lib/zookeeper
|
|
||||||
# Place the dataLogDir to a separate physical disc for better performance
|
|
||||||
# dataLogDir=/disk2/zookeeper
|
|
||||||
|
|
||||||
# the port at which the clients will connect
|
|
||||||
clientPort=2181
|
|
||||||
|
|
||||||
# Maximum number of clients that can connect from one client
|
|
||||||
maxClientCnxns=60
|
|
||||||
|
|
||||||
# specify all zookeeper servers
|
|
||||||
# The fist port is used by followers to connect to the leader
|
|
||||||
# The second one is used for leader election
|
|
||||||
|
|
||||||
server.0=127.0.0.1:2888:3888
|
|
||||||
|
|
||||||
# To avoid seeks ZooKeeper allocates space in the transaction log file in
|
|
||||||
# blocks of preAllocSize kilobytes. The default block size is 64M. One reason
|
|
||||||
# for changing the size of the blocks is to reduce the block size if snapshots
|
|
||||||
# are taken more often. (Also, see snapCount).
|
|
||||||
#preAllocSize=65536
|
|
||||||
|
|
||||||
# Clients can submit requests faster than ZooKeeper can process them,
|
|
||||||
# especially if there are a lot of clients. To prevent ZooKeeper from running
|
|
||||||
# out of memory due to queued requests, ZooKeeper will throttle clients so that
|
|
||||||
# there is no more than globalOutstandingLimit outstanding requests in the
|
|
||||||
# system. The default limit is 1,000.ZooKeeper logs transactions to a
|
|
||||||
# transaction log. After snapCount transactions are written to a log file a
|
|
||||||
# snapshot is started and a new transaction log file is started. The default
|
|
||||||
# snapCount is 10,000.
|
|
||||||
#snapCount=1000
|
|
||||||
|
|
||||||
# If this option is defined, requests will be will logged to a trace file named
|
|
||||||
# traceFile.year.month.day.
|
|
||||||
#traceFile=
|
|
||||||
|
|
||||||
# Leader accepts client connections. Default value is "yes". The leader machine
|
|
||||||
# coordinates updates. For higher update throughput at thes slight expense of
|
|
||||||
# read throughput the leader can be configured to not accept clients and focus
|
|
||||||
# on coordination.
|
|
||||||
#leaderServes=yes
|
|
||||||
|
|
||||||
# Autopurge every hour to avoid using lots of disk in bursts
|
|
||||||
# Order of the next 2 properties matters.
|
|
||||||
# autopurge.snapRetainCount must be before autopurge.purgeInterval.
|
|
||||||
autopurge.snapRetainCount=3
|
|
||||||
autopurge.purgeInterval=1
|
|
||||||
@ -363,11 +363,10 @@ function configure_cinder {
|
|||||||
iniset $CINDER_CONF DEFAULT os_privileged_user_tenant "$SERVICE_PROJECT_NAME"
|
iniset $CINDER_CONF DEFAULT os_privileged_user_tenant "$SERVICE_PROJECT_NAME"
|
||||||
iniset $CINDER_CONF DEFAULT graceful_shutdown_timeout "$SERVICE_GRACEFUL_SHUTDOWN_TIMEOUT"
|
iniset $CINDER_CONF DEFAULT graceful_shutdown_timeout "$SERVICE_GRACEFUL_SHUTDOWN_TIMEOUT"
|
||||||
|
|
||||||
# Set the backend url according to the configured dlm backend
|
if [[ ! -z "$CINDER_COORDINATION_URL" ]]; then
|
||||||
if is_dlm_enabled; then
|
iniset $CINDER_CONF coordination backend_url "$CINDER_COORDINATION_URL"
|
||||||
if [[ "$(dlm_backend)" == "zookeeper" ]]; then
|
elif is_service_enabled etcd3; then
|
||||||
iniset $CINDER_CONF coordination backend_url "zookeeper://${SERVICE_HOST}:2181"
|
iniset $CINDER_CONF coordination backend_url "etcd3+http://${SERVICE_HOST}:2379"
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
111
lib/dlm
111
lib/dlm
@ -1,111 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
#
|
|
||||||
# lib/dlm
|
|
||||||
#
|
|
||||||
# Functions to control the installation and configuration of software
|
|
||||||
# that provides a dlm (and possibly other functions). The default is
|
|
||||||
# **zookeeper**, and is going to be the only backend supported in the
|
|
||||||
# devstack tree.
|
|
||||||
|
|
||||||
# Dependencies:
|
|
||||||
#
|
|
||||||
# - ``functions`` file
|
|
||||||
|
|
||||||
# ``stack.sh`` calls the entry points in this order:
|
|
||||||
#
|
|
||||||
# - is_dlm_enabled
|
|
||||||
# - install_dlm
|
|
||||||
# - configure_dlm
|
|
||||||
# - cleanup_dlm
|
|
||||||
|
|
||||||
# Save trace setting
|
|
||||||
_XTRACE_DLM=$(set +o | grep xtrace)
|
|
||||||
set +o xtrace
|
|
||||||
|
|
||||||
|
|
||||||
# Defaults
|
|
||||||
# --------
|
|
||||||
|
|
||||||
# <define global variables here that belong to this project>
|
|
||||||
|
|
||||||
# Set up default directories
|
|
||||||
ZOOKEEPER_DATA_DIR=$DEST/data/zookeeper
|
|
||||||
ZOOKEEPER_CONF_DIR=/etc/zookeeper
|
|
||||||
|
|
||||||
|
|
||||||
# Entry Points
|
|
||||||
# ------------
|
|
||||||
#
|
|
||||||
# NOTE(sdague): it is expected that when someone wants to implement
|
|
||||||
# another one of these out of tree, they'll implement the following
|
|
||||||
# functions:
|
|
||||||
#
|
|
||||||
# - dlm_backend
|
|
||||||
# - install_dlm
|
|
||||||
# - configure_dlm
|
|
||||||
# - cleanup_dlm
|
|
||||||
|
|
||||||
# This should be declared in the settings file of any plugin or
|
|
||||||
# service that needs to have a dlm in their environment.
|
|
||||||
function use_dlm {
|
|
||||||
enable_service $(dlm_backend)
|
|
||||||
}
|
|
||||||
|
|
||||||
# A function to return the name of the backend in question, some users
|
|
||||||
# are going to need to know this.
|
|
||||||
function dlm_backend {
|
|
||||||
echo "zookeeper"
|
|
||||||
}
|
|
||||||
|
|
||||||
# Test if a dlm is enabled (defaults to a zookeeper specific check)
|
|
||||||
function is_dlm_enabled {
|
|
||||||
[[ ,${ENABLED_SERVICES}, =~ ,"$(dlm_backend)", ]] && return 0
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
# cleanup_dlm() - Remove residual data files, anything left over from previous
|
|
||||||
# runs that a clean run would need to clean up
|
|
||||||
function cleanup_dlm {
|
|
||||||
# NOTE(sdague): we don't check for is_enabled here because we
|
|
||||||
# should just delete this regardless. Some times users updated
|
|
||||||
# their service list before they run cleanup.
|
|
||||||
sudo rm -rf $ZOOKEEPER_DATA_DIR
|
|
||||||
}
|
|
||||||
|
|
||||||
# configure_dlm() - Set config files, create data dirs, etc
|
|
||||||
function configure_dlm {
|
|
||||||
if is_dlm_enabled; then
|
|
||||||
sudo cp $FILES/zookeeper/* $ZOOKEEPER_CONF_DIR
|
|
||||||
sudo sed -i -e 's|.*dataDir.*|dataDir='$ZOOKEEPER_DATA_DIR'|' $ZOOKEEPER_CONF_DIR/zoo.cfg
|
|
||||||
# clean up from previous (possibly aborted) runs
|
|
||||||
# create required data files
|
|
||||||
sudo rm -rf $ZOOKEEPER_DATA_DIR
|
|
||||||
sudo mkdir -p $ZOOKEEPER_DATA_DIR
|
|
||||||
# restart after configuration, there is no reason to make this
|
|
||||||
# another step, because having data files that don't match the
|
|
||||||
# zookeeper running is just going to cause tears.
|
|
||||||
restart_service zookeeper
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# install_dlm() - Collect source and prepare
|
|
||||||
function install_dlm {
|
|
||||||
if is_dlm_enabled; then
|
|
||||||
pip_install_gr_extras tooz zookeeper
|
|
||||||
if is_ubuntu; then
|
|
||||||
install_package zookeeperd
|
|
||||||
elif is_fedora; then
|
|
||||||
install_package zookeeper
|
|
||||||
else
|
|
||||||
die $LINENO "Don't know how to install zookeeper on this platform"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# Restore xtrace
|
|
||||||
$_XTRACE_DLM
|
|
||||||
|
|
||||||
# Tell emacs to use shell-script-mode
|
|
||||||
## Local variables:
|
|
||||||
## mode: shell-script
|
|
||||||
## End:
|
|
||||||
5
stack.sh
5
stack.sh
@ -573,7 +573,6 @@ source $TOP_DIR/lib/swift
|
|||||||
source $TOP_DIR/lib/neutron
|
source $TOP_DIR/lib/neutron
|
||||||
source $TOP_DIR/lib/ldap
|
source $TOP_DIR/lib/ldap
|
||||||
source $TOP_DIR/lib/dstat
|
source $TOP_DIR/lib/dstat
|
||||||
source $TOP_DIR/lib/dlm
|
|
||||||
source $TOP_DIR/lib/etcd3
|
source $TOP_DIR/lib/etcd3
|
||||||
source $TOP_DIR/lib/os_brick
|
source $TOP_DIR/lib/os_brick
|
||||||
|
|
||||||
@ -772,10 +771,6 @@ set_systemd_override DefaultLimitNOFILE ${ULIMIT_NOFILE}
|
|||||||
install_rpc_backend
|
install_rpc_backend
|
||||||
restart_rpc_backend
|
restart_rpc_backend
|
||||||
|
|
||||||
# NOTE(sdague): dlm install is conditional on one being enabled by configuration
|
|
||||||
install_dlm
|
|
||||||
configure_dlm
|
|
||||||
|
|
||||||
if is_service_enabled $DATABASE_BACKENDS; then
|
if is_service_enabled $DATABASE_BACKENDS; then
|
||||||
install_database
|
install_database
|
||||||
fi
|
fi
|
||||||
|
|||||||
@ -70,7 +70,6 @@ source $TOP_DIR/lib/neutron
|
|||||||
source $TOP_DIR/lib/ldap
|
source $TOP_DIR/lib/ldap
|
||||||
source $TOP_DIR/lib/dstat
|
source $TOP_DIR/lib/dstat
|
||||||
source $TOP_DIR/lib/etcd3
|
source $TOP_DIR/lib/etcd3
|
||||||
source $TOP_DIR/lib/dlm
|
|
||||||
|
|
||||||
# Extras Source
|
# Extras Source
|
||||||
# --------------
|
# --------------
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user