Skip to content

Commit 5cad4d3

Browse files
sdaguesdague
committed
refactor zookeeper into a slightly more generic dlm module
This attempts to make the zookeeper installation a bit more modular (assuming that other folks will want to add other dlms as plugins), and addresses the service start issues with zookeeper under ubuntu/upstart. Zookeeper is not going to be installed by default. Services need to ask for it with use_dlm. Change-Id: I33525e2b83a4497a57ec95f62880e0308c88b34f
1 parent db6cb07 commit 5cad4d3

5 files changed

Lines changed: 115 additions & 108 deletions

File tree

‎lib/dlm‎

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
#!/bin/bash
2+
#
3+
# lib/dlm
4+
#
5+
# Functions to control the installation and configuration of software
6+
# that provides a dlm (and possibly other functions). The default is
7+
# **zookeeper**, and is going to be the only backend supported in the
8+
# devstack tree.
9+
10+
# Dependencies:
11+
#
12+
# - ``functions`` file
13+
14+
# ``stack.sh`` calls the entry points in this order:
15+
#
16+
# - is_dlm_enabled
17+
# - install_dlm
18+
# - configure_dlm
19+
# - cleanup_dlm
20+
21+
# Save trace setting
22+
XTRACE=$(set +o | grep xtrace)
23+
set +o xtrace
24+
25+
26+
# Defaults
27+
# --------
28+
29+
# <define global variables here that belong to this project>
30+
31+
# Set up default directories
32+
ZOOKEEPER_DATA_DIR=$DEST/data/zookeeper
33+
ZOOKEEPER_CONF_DIR=/etc/zookeeper
34+
35+
36+
# Entry Points
37+
# ------------
38+
#
39+
# NOTE(sdague): it is expected that when someone wants to implement
40+
# another one of these out of tree, they'll implement the following
41+
# functions:
42+
#
43+
# - dlm_backend
44+
# - install_dlm
45+
# - configure_dlm
46+
# - cleanup_dlm
47+
48+
# This should be declared in the settings file of any plugin or
49+
# service that needs to have a dlm in their enviroment.
50+
function use_dlm {
51+
enable_service $(dlm_backend)
52+
}
53+
54+
# A function to return the name of the backend in question, some users
55+
# are going to need to know this.
56+
function dlm_backend {
57+
echo "zookeeper"
58+
}
59+
60+
# Test if a dlm is enabled (defaults to a zookeeper specific check)
61+
function is_dlm_enabled {
62+
[[ ,${ENABLED_SERVICES}, =~ ,"$(dlm_backend)", ]] && return 0
63+
return 1
64+
}
65+
66+
# cleanup_dlm() - Remove residual data files, anything left over from previous
67+
# runs that a clean run would need to clean up
68+
function cleanup_dlm {
69+
# NOTE(sdague): we don't check for is_enabled here because we
70+
# should just delete this regardless. Some times users updated
71+
# their service list before they run cleanup.
72+
sudo rm -rf $ZOOKEEPER_DATA_DIR
73+
}
74+
75+
# configure_dlm() - Set config files, create data dirs, etc
76+
function configure_dlm {
77+
if is_dlm_enabled; then
78+
sudo cp $FILES/zookeeper/* $ZOOKEEPER_CONF_DIR
79+
sudo sed -i -e 's|.*dataDir.*|dataDir='$ZOOKEEPER_DATA_DIR'|' $ZOOKEEPER_CONF_DIR/zoo.cfg
80+
# clean up from previous (possibly aborted) runs
81+
# create required data files
82+
sudo rm -rf $ZOOKEEPER_DATA_DIR
83+
sudo mkdir -p $ZOOKEEPER_DATA_DIR
84+
# restart after configuration, there is no reason to make this
85+
# another step, because having data files that don't match the
86+
# zookeeper running is just going to cause tears.
87+
restart_service zookeeper
88+
fi
89+
}
90+
91+
# install_dlm() - Collect source and prepare
92+
function install_dlm {
93+
if is_dlm_enabled; then
94+
if is_ubuntu; then
95+
install_package zookeeperd
96+
else
97+
die $LINENO "Don't know how to install zookeeper on this platform"
98+
fi
99+
fi
100+
}
101+
102+
# Restore xtrace
103+
$XTRACE
104+
105+
# Tell emacs to use shell-script-mode
106+
## Local variables:
107+
## mode: shell-script
108+
## End:

‎lib/zookeeper‎

Lines changed: 0 additions & 91 deletions
This file was deleted.

‎stack.sh‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ source $TOP_DIR/lib/heat
539539
source $TOP_DIR/lib/neutron-legacy
540540
source $TOP_DIR/lib/ldap
541541
source $TOP_DIR/lib/dstat
542-
source $TOP_DIR/lib/zookeeper
542+
source $TOP_DIR/lib/dlm
543543

544544
# Extras Source
545545
# --------------
@@ -724,11 +724,10 @@ run_phase stack pre-install
724724

725725
install_rpc_backend
726726

727-
if is_service_enabled zookeeper; then
728-
cleanup_zookeeper
729-
configure_zookeeper
730-
init_zookeeper
731-
fi
727+
# NOTE(sdague): dlm install is conditional on one being enabled by configuration
728+
install_dlm
729+
configure_dlm
730+
732731
if is_service_enabled $DATABASE_BACKENDS; then
733732
install_database
734733
fi
@@ -968,15 +967,6 @@ save_stackenv $LINENO
968967
start_dstat
969968

970969

971-
# Zookeeper
972-
# -----
973-
974-
# zookeeper for use with tooz for Distributed Lock Management capabilities etc.,
975-
if is_service_enabled zookeeper; then
976-
start_zookeeper
977-
fi
978-
979-
980970
# Keystone
981971
# --------
982972

‎stackrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ if ! isset ENABLED_SERVICES ; then
6969
# Dashboard
7070
ENABLED_SERVICES+=,horizon
7171
# Additional services
72-
ENABLED_SERVICES+=,rabbit,tempest,mysql,dstat,zookeeper
72+
ENABLED_SERVICES+=,rabbit,tempest,mysql,dstat
7373
fi
7474

7575
# SQLAlchemy supports multiple database drivers for each database server

‎unstack.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ source $TOP_DIR/lib/heat
6969
source $TOP_DIR/lib/neutron-legacy
7070
source $TOP_DIR/lib/ldap
7171
source $TOP_DIR/lib/dstat
72-
source $TOP_DIR/lib/zookeeper
72+
source $TOP_DIR/lib/dlm
7373

7474
# Extras Source
7575
# --------------

0 commit comments

Comments
 (0)