blob: c1b54065e7d9c91740597fb867338e7679dbd1d8 [file] [log] [blame]
Attila Fazekasece6a332012-11-29 14:19:41 +01001# lib/swift
Dean Troyer6d04fd72012-12-21 11:03:37 -06002# Functions to control the configuration and operation of the **Swift** service
Attila Fazekasece6a332012-11-29 14:19:41 +01003
4# Dependencies:
5# ``functions`` file
6# ``DEST``, ``SCREEN_NAME``, `SWIFT_HASH` must be defined
Attila Fazekas91b8d132013-01-06 22:40:09 +01007# ``STACK_USER`` must be defined
Attila Fazekasece6a332012-11-29 14:19:41 +01008# ``SWIFT_DATA_DIR`` or ``DATA_DIR`` must be defined
9# ``lib/keystone`` file
10# ``stack.sh`` calls the entry points in this order:
11#
12# install_swift
13# configure_swift
14# init_swift
15# start_swift
16# stop_swift
17# cleanup_swift
18
19# Save trace setting
20XTRACE=$(set +o | grep xtrace)
21set +o xtrace
22
23
24# Defaults
25# --------
26
Attila Fazekasece6a332012-11-29 14:19:41 +010027# Set up default directories
Attila Fazekasece6a332012-11-29 14:19:41 +010028SWIFT_DIR=$DEST/swift
29SWIFTCLIENT_DIR=$DEST/python-swiftclient
Dean Troyer64ab7742012-12-28 15:38:28 -060030SWIFT_AUTH_CACHE_DIR=${SWIFT_AUTH_CACHE_DIR:-/var/cache/swift}
Attila Fazekasece6a332012-11-29 14:19:41 +010031
32# TODO: add logging to different location.
33
34# Set ``SWIFT_DATA_DIR`` to the location of swift drives and objects.
35# Default is the common DevStack data directory.
36SWIFT_DATA_DIR=${SWIFT_DATA_DIR:-${DATA_DIR}/swift}
37
38# Set ``SWIFT_CONFIG_DIR`` to the location of the configuration files.
39# Default is ``/etc/swift``.
40SWIFT_CONFIG_DIR=${SWIFT_CONFIG_DIR:-/etc/swift}
41
42# DevStack will create a loop-back disk formatted as XFS to store the
Kevin Lydad66c9652013-01-09 13:39:57 +000043# swift data. Set ``SWIFT_LOOPBACK_DISK_SIZE`` to the disk size in
44# kilobytes.
Attila Fazekasece6a332012-11-29 14:19:41 +010045# Default is 1 gigabyte.
46SWIFT_LOOPBACK_DISK_SIZE=${SWIFT_LOOPBACK_DISK_SIZE:-1000000}
47
48# The ring uses a configurable number of bits from a path’s MD5 hash as
49# a partition index that designates a device. The number of bits kept
50# from the hash is known as the partition power, and 2 to the partition
51# power indicates the partition count. Partitioning the full MD5 hash
52# ring allows other parts of the cluster to work in batches of items at
53# once which ends up either more efficient or at least less complex than
54# working with each item separately or the entire cluster all at once.
55# By default we define 9 for the partition count (which mean 512).
56SWIFT_PARTITION_POWER_SIZE=${SWIFT_PARTITION_POWER_SIZE:-9}
57
58# Set ``SWIFT_REPLICAS`` to configure how many replicas are to be
Chmouel Boudjnah0c3a5582013-03-06 10:58:33 +010059# configured for your Swift cluster. By default we are configuring
60# only one replica since this is way less CPU and memory intensive. If
61# you are planning to test swift replication you may want to set this
62# up to 3.
63SWIFT_REPLICAS=${SWIFT_REPLICAS:-1}
Attila Fazekasece6a332012-11-29 14:19:41 +010064SWIFT_REPLICAS_SEQ=$(seq ${SWIFT_REPLICAS})
65
66# Set ``OBJECT_PORT_BASE``, ``CONTAINER_PORT_BASE``, ``ACCOUNT_PORT_BASE``
67# Port bases used in port number calclution for the service "nodes"
68# The specified port number will be used, the additinal ports calculated by
69# base_port + node_num * 10
Chmouel Boudjnah0c3a5582013-03-06 10:58:33 +010070OBJECT_PORT_BASE=6013
Attila Fazekasece6a332012-11-29 14:19:41 +010071CONTAINER_PORT_BASE=6011
72ACCOUNT_PORT_BASE=6012
73
Dean Troyer6d04fd72012-12-21 11:03:37 -060074
Attila Fazekasece6a332012-11-29 14:19:41 +010075# Entry Points
76# ------------
77
78# cleanup_swift() - Remove residual data files
79function cleanup_swift() {
80 rm -f ${SWIFT_CONFIG_DIR}{*.builder,*.ring.gz,backups/*.builder,backups/*.ring.gz}
81 if egrep -q ${SWIFT_DATA_DIR}/drives/sdb1 /proc/mounts; then
82 sudo umount ${SWIFT_DATA_DIR}/drives/sdb1
83 fi
84 if [[ -e ${SWIFT_DATA_DIR}/drives/images/swift.img ]]; then
85 rm ${SWIFT_DATA_DIR}/drives/images/swift.img
86 fi
87}
88
89# configure_swift() - Set config files, create data dirs and loop image
90function configure_swift() {
91 local swift_auth_server
92 local node_number
93 local swift_node_config
94 local swift_log_dir
95
96 setup_develop $SWIFT_DIR
97
98 # Make sure to kill all swift processes first
Chmouel Boudjnahad8b2762013-01-10 15:40:01 +010099 swift-init --run-dir=${SWIFT_DATA_DIR}/run all stop || true
Attila Fazekasece6a332012-11-29 14:19:41 +0100100
101 # First do a bit of setup by creating the directories and
102 # changing the permissions so we can run it as our user.
103
104 USER_GROUP=$(id -g)
Chmouel Boudjnahad8b2762013-01-10 15:40:01 +0100105 sudo mkdir -p ${SWIFT_DATA_DIR}/{drives,cache,run,logs}
Attila Fazekasece6a332012-11-29 14:19:41 +0100106 sudo chown -R $USER:${USER_GROUP} ${SWIFT_DATA_DIR}
107
108 # Create a loopback disk and format it to XFS.
109 if [[ -e ${SWIFT_DATA_DIR}/drives/images/swift.img ]]; then
110 if egrep -q ${SWIFT_DATA_DIR}/drives/sdb1 /proc/mounts; then
111 sudo umount ${SWIFT_DATA_DIR}/drives/sdb1
Chmouel Boudjnah43eb0b32013-01-12 20:10:34 +0000112 sudo rm -f ${SWIFT_DATA_DIR}/drives/images/swift.img
Attila Fazekasece6a332012-11-29 14:19:41 +0100113 fi
Attila Fazekasece6a332012-11-29 14:19:41 +0100114 fi
115
Chmouel Boudjnah43eb0b32013-01-12 20:10:34 +0000116 mkdir -p ${SWIFT_DATA_DIR}/drives/images
117 sudo touch ${SWIFT_DATA_DIR}/drives/images/swift.img
118 sudo chown $USER: ${SWIFT_DATA_DIR}/drives/images/swift.img
119
120 dd if=/dev/zero of=${SWIFT_DATA_DIR}/drives/images/swift.img \
121 bs=1024 count=0 seek=${SWIFT_LOOPBACK_DISK_SIZE}
122
Attila Fazekasece6a332012-11-29 14:19:41 +0100123 # Make a fresh XFS filesystem
124 mkfs.xfs -f -i size=1024 ${SWIFT_DATA_DIR}/drives/images/swift.img
125
126 # Mount the disk with mount options to make it as efficient as possible
127 mkdir -p ${SWIFT_DATA_DIR}/drives/sdb1
128 if ! egrep -q ${SWIFT_DATA_DIR}/drives/sdb1 /proc/mounts; then
129 sudo mount -t xfs -o loop,noatime,nodiratime,nobarrier,logbufs=8 \
130 ${SWIFT_DATA_DIR}/drives/images/swift.img ${SWIFT_DATA_DIR}/drives/sdb1
131 fi
132
133 # Create a link to the above mount and
134 # create all of the directories needed to emulate a few different servers
135 for node_number in ${SWIFT_REPLICAS_SEQ}; do
136 sudo ln -sf ${SWIFT_DATA_DIR}/drives/sdb1/$node_number ${SWIFT_DATA_DIR}/$node_number;
137 drive=${SWIFT_DATA_DIR}/drives/sdb1/${node_number}
138 node=${SWIFT_DATA_DIR}/${node_number}/node
139 node_device=${node}/sdb1
140 [[ -d $node ]] && continue
141 [[ -d $drive ]] && continue
142 sudo install -o ${USER} -g $USER_GROUP -d $drive
143 sudo install -o ${USER} -g $USER_GROUP -d $node_device
144 sudo chown -R $USER: ${node}
145 done
146
Chmouel Boudjnahad8b2762013-01-10 15:40:01 +0100147 sudo mkdir -p ${SWIFT_CONFIG_DIR}/{object,container,account}-server
148 sudo chown -R $USER: ${SWIFT_CONFIG_DIR}
Attila Fazekasece6a332012-11-29 14:19:41 +0100149
150 if [[ "$SWIFT_CONFIG_DIR" != "/etc/swift" ]]; then
151 # Some swift tools are hard-coded to use ``/etc/swift`` and are apparently not going to be fixed.
152 # Create a symlink if the config dir is moved
153 sudo ln -sf ${SWIFT_CONFIG_DIR} /etc/swift
154 fi
155
156 # Swift use rsync to synchronize between all the different
157 # partitions (which make more sense when you have a multi-node
158 # setup) we configure it with our version of rsync.
159 sed -e "
160 s/%GROUP%/${USER_GROUP}/;
161 s/%USER%/$USER/;
162 s,%SWIFT_DATA_DIR%,$SWIFT_DATA_DIR,;
163 " $FILES/swift/rsyncd.conf | sudo tee /etc/rsyncd.conf
164 # rsyncd.conf just prepared for 4 nodes
Vincent Untzc18b9652012-12-04 12:36:34 +0100165 if is_ubuntu; then
Attila Fazekasece6a332012-11-29 14:19:41 +0100166 sudo sed -i '/^RSYNC_ENABLE=false/ { s/false/true/ }' /etc/default/rsync
167 else
168 sudo sed -i '/disable *= *yes/ { s/yes/no/ }' /etc/xinetd.d/rsync
169 fi
170
171 if is_service_enabled swift3;then
172 swift_auth_server="s3token "
173 fi
174
175 # By default Swift will be installed with the tempauth middleware
176 # which has some default username and password if you have
177 # configured keystone it will checkout the directory.
178 if is_service_enabled key; then
179 swift_auth_server+="authtoken keystoneauth"
180 else
181 swift_auth_server=tempauth
182 fi
183
184 SWIFT_CONFIG_PROXY_SERVER=${SWIFT_CONFIG_DIR}/proxy-server.conf
185 cp ${SWIFT_DIR}/etc/proxy-server.conf-sample ${SWIFT_CONFIG_PROXY_SERVER}
186
187 iniuncomment ${SWIFT_CONFIG_PROXY_SERVER} DEFAULT user
188 iniset ${SWIFT_CONFIG_PROXY_SERVER} DEFAULT user ${USER}
189
190 iniuncomment ${SWIFT_CONFIG_PROXY_SERVER} DEFAULT swift_dir
191 iniset ${SWIFT_CONFIG_PROXY_SERVER} DEFAULT swift_dir ${SWIFT_CONFIG_DIR}
192
193 iniuncomment ${SWIFT_CONFIG_PROXY_SERVER} DEFAULT workers
194 iniset ${SWIFT_CONFIG_PROXY_SERVER} DEFAULT workers 1
195
196 iniuncomment ${SWIFT_CONFIG_PROXY_SERVER} DEFAULT log_level
197 iniset ${SWIFT_CONFIG_PROXY_SERVER} DEFAULT log_level DEBUG
198
199 iniuncomment ${SWIFT_CONFIG_PROXY_SERVER} DEFAULT bind_port
200 iniset ${SWIFT_CONFIG_PROXY_SERVER} DEFAULT bind_port ${SWIFT_DEFAULT_BIND_PORT:-8080}
201
202 # Only enable Swift3 if we have it enabled in ENABLED_SERVICES
203 is_service_enabled swift3 && swift3=swift3 || swift3=""
204
205 iniset ${SWIFT_CONFIG_PROXY_SERVER} pipeline:main pipeline "catch_errors healthcheck cache ratelimit ${swift3} ${swift_auth_server} proxy-logging proxy-server"
206
207 iniset ${SWIFT_CONFIG_PROXY_SERVER} app:proxy-server account_autocreate true
208
209 # Configure Keystone
210 sed -i '/^# \[filter:authtoken\]/,/^# \[filter:keystoneauth\]$/ s/^#[ \t]*//' ${SWIFT_CONFIG_PROXY_SERVER}
211 iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:authtoken auth_host $KEYSTONE_AUTH_HOST
212 iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:authtoken auth_port $KEYSTONE_AUTH_PORT
213 iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL
214 iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:authtoken auth_uri $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/
215 iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:authtoken admin_tenant_name $SERVICE_TENANT_NAME
216 iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:authtoken admin_user swift
217 iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:authtoken admin_password $SERVICE_PASSWORD
Dean Troyer64ab7742012-12-28 15:38:28 -0600218 iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:authtoken signing_dir $SWIFT_AUTH_CACHE_DIR
Attila Fazekasece6a332012-11-29 14:19:41 +0100219
220 iniuncomment ${SWIFT_CONFIG_PROXY_SERVER} filter:keystoneauth use
221 iniuncomment ${SWIFT_CONFIG_PROXY_SERVER} filter:keystoneauth operator_roles
222 iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:keystoneauth operator_roles "Member, admin"
223
224 if is_service_enabled swift3; then
225 cat <<EOF >>${SWIFT_CONFIG_PROXY_SERVER}
226# NOTE(chmou): s3token middleware is not updated yet to use only
227# username and password.
228[filter:s3token]
229paste.filter_factory = keystone.middleware.s3_token:filter_factory
230auth_port = ${KEYSTONE_AUTH_PORT}
231auth_host = ${KEYSTONE_AUTH_HOST}
232auth_protocol = ${KEYSTONE_AUTH_PROTOCOL}
233auth_token = ${SERVICE_TOKEN}
234admin_token = ${SERVICE_TOKEN}
235
236[filter:swift3]
237use = egg:swift3#swift3
238EOF
239 fi
240
241 cp ${SWIFT_DIR}/etc/swift.conf-sample ${SWIFT_CONFIG_DIR}/swift.conf
242 iniset ${SWIFT_CONFIG_DIR}/swift.conf swift-hash swift_hash_path_suffix ${SWIFT_HASH}
243
244 # This function generates an object/account/proxy configuration
245 # emulating 4 nodes on different ports
246 function generate_swift_config() {
247 local swift_node_config=$1
248 local node_id=$2
249 local bind_port=$3
250
251 log_facility=$[ node_id - 1 ]
252 node_path=${SWIFT_DATA_DIR}/${node_number}
253
254 iniuncomment ${swift_node_config} DEFAULT user
255 iniset ${swift_node_config} DEFAULT user ${USER}
256
257 iniuncomment ${swift_node_config} DEFAULT bind_port
258 iniset ${swift_node_config} DEFAULT bind_port ${bind_port}
259
260 iniuncomment ${swift_node_config} DEFAULT swift_dir
261 iniset ${swift_node_config} DEFAULT swift_dir ${SWIFT_CONFIG_DIR}
262
263 iniuncomment ${swift_node_config} DEFAULT devices
264 iniset ${swift_node_config} DEFAULT devices ${node_path}
265
266 iniuncomment ${swift_node_config} DEFAULT log_facility
267 iniset ${swift_node_config} DEFAULT log_facility LOG_LOCAL${log_facility}
268
269 iniuncomment ${swift_node_config} DEFAULT mount_check
270 iniset ${swift_node_config} DEFAULT mount_check false
271
272 iniuncomment ${swift_node_config} ${server_type}-replicator vm_test_mode
273 iniset ${swift_node_config} ${server_type}-replicator vm_test_mode yes
274 }
275
276 for node_number in ${SWIFT_REPLICAS_SEQ}; do
277 swift_node_config=${SWIFT_CONFIG_DIR}/object-server/${node_number}.conf
278 cp ${SWIFT_DIR}/etc/object-server.conf-sample ${swift_node_config}
279 generate_swift_config ${swift_node_config} ${node_number} $[OBJECT_PORT_BASE + 10 * (node_number - 1)]
Chmouel Boudjnah8e5d2f02012-12-20 13:11:43 +0000280 iniset ${swift_node_config} filter:recon recon_cache_path ${SWIFT_DATA_DIR}/cache
281 # Using a sed and not iniset/iniuncomment because we want to a global
282 # modification and make sure it works for new sections.
283 sed -i -e "s,#[ ]*recon_cache_path .*,recon_cache_path = ${SWIFT_DATA_DIR}/cache," ${swift_node_config}
Attila Fazekasece6a332012-11-29 14:19:41 +0100284
285 swift_node_config=${SWIFT_CONFIG_DIR}/container-server/${node_number}.conf
286 cp ${SWIFT_DIR}/etc/container-server.conf-sample ${swift_node_config}
287 generate_swift_config ${swift_node_config} ${node_number} $[CONTAINER_PORT_BASE + 10 * (node_number - 1)]
Attila Fazekas83e10952012-11-30 23:28:07 +0100288 iniuncomment ${swift_node_config} app:container-server allow_versions
289 iniset ${swift_node_config} app:container-server allow_versions "true"
Chmouel Boudjnah8e5d2f02012-12-20 13:11:43 +0000290 sed -i -e "s,#[ ]*recon_cache_path .*,recon_cache_path = ${SWIFT_DATA_DIR}/cache," ${swift_node_config}
Attila Fazekasece6a332012-11-29 14:19:41 +0100291
292 swift_node_config=${SWIFT_CONFIG_DIR}/account-server/${node_number}.conf
293 cp ${SWIFT_DIR}/etc/account-server.conf-sample ${swift_node_config}
294 generate_swift_config ${swift_node_config} ${node_number} $[ACCOUNT_PORT_BASE + 10 * (node_number - 1)]
Chmouel Boudjnah8e5d2f02012-12-20 13:11:43 +0000295 sed -i -e "s,#[ ]*recon_cache_path .*,recon_cache_path = ${SWIFT_DATA_DIR}/cache," ${swift_node_config}
Attila Fazekasece6a332012-11-29 14:19:41 +0100296 done
297
298 swift_log_dir=${SWIFT_DATA_DIR}/logs
299 rm -rf ${swift_log_dir}
300 mkdir -p ${swift_log_dir}/hourly
301 sudo chown -R $USER:adm ${swift_log_dir}
302 sed "s,%SWIFT_LOGDIR%,${swift_log_dir}," $FILES/swift/rsyslog.conf | sudo \
303 tee /etc/rsyslog.d/10-swift.conf
Attila Fazekasece6a332012-11-29 14:19:41 +0100304}
305
306# configure_swiftclient() - Set config files, create data dirs, etc
307function configure_swiftclient() {
308 setup_develop $SWIFTCLIENT_DIR
309}
310
311# init_swift() - Initialize rings
312function init_swift() {
313 local node_number
314 # Make sure to kill all swift processes first
Chmouel Boudjnahad8b2762013-01-10 15:40:01 +0100315 swift-init --run-dir=${SWIFT_DATA_DIR}/run all stop || true
Attila Fazekasece6a332012-11-29 14:19:41 +0100316
317 # This is where we create three different rings for swift with
318 # different object servers binding on different ports.
319 pushd ${SWIFT_CONFIG_DIR} >/dev/null && {
320
321 rm -f *.builder *.ring.gz backups/*.builder backups/*.ring.gz
322
323 swift-ring-builder object.builder create ${SWIFT_PARTITION_POWER_SIZE} ${SWIFT_REPLICAS} 1
324 swift-ring-builder container.builder create ${SWIFT_PARTITION_POWER_SIZE} ${SWIFT_REPLICAS} 1
325 swift-ring-builder account.builder create ${SWIFT_PARTITION_POWER_SIZE} ${SWIFT_REPLICAS} 1
326
327 for node_number in ${SWIFT_REPLICAS_SEQ}; do
328 swift-ring-builder object.builder add z${node_number}-127.0.0.1:$[OBJECT_PORT_BASE + 10 * (node_number - 1)]/sdb1 1
329 swift-ring-builder container.builder add z${node_number}-127.0.0.1:$[CONTAINER_PORT_BASE + 10 * (node_number - 1)]/sdb1 1
330 swift-ring-builder account.builder add z${node_number}-127.0.0.1:$[ACCOUNT_PORT_BASE + 10 * (node_number - 1)]/sdb1 1
331 done
332 swift-ring-builder object.builder rebalance
333 swift-ring-builder container.builder rebalance
334 swift-ring-builder account.builder rebalance
335 } && popd >/dev/null
336
Dean Troyer64ab7742012-12-28 15:38:28 -0600337 # Create cache dir
338 sudo mkdir -p $SWIFT_AUTH_CACHE_DIR
Attila Fazekas91b8d132013-01-06 22:40:09 +0100339 sudo chown $STACK_USER $SWIFT_AUTH_CACHE_DIR
Dean Troyer64ab7742012-12-28 15:38:28 -0600340 rm -f $SWIFT_AUTH_CACHE_DIR/*
Attila Fazekasece6a332012-11-29 14:19:41 +0100341}
342
343function install_swift() {
344 git_clone $SWIFT_REPO $SWIFT_DIR $SWIFT_BRANCH
345}
346
347function install_swiftclient() {
348 git_clone $SWIFTCLIENT_REPO $SWIFTCLIENT_DIR $SWIFTCLIENT_BRANCH
349}
350
351
352# start_swift() - Start running processes, including screen
353function start_swift() {
354 # (re)start rsyslog
355 restart_service rsyslog
356 # Start rsync
Vincent Untzc18b9652012-12-04 12:36:34 +0100357 if is_ubuntu; then
Attila Fazekasece6a332012-11-29 14:19:41 +0100358 sudo /etc/init.d/rsync restart || :
359 else
360 sudo systemctl start xinetd.service
361 fi
362
Chmouel Boudjnah0c3a5582013-03-06 10:58:33 +0100363 # By default with only one replica we are launching the proxy,
364 # container, account and object server in screen in foreground and
365 # other services in background. If we have SWIFT_REPLICAS set to something
366 # greater than one we first spawn all the swift services then kill the proxy
367 # service so we can run it in foreground in screen. ``swift-init ...
368 # {stop|restart}`` exits with '1' if no servers are running, ignore it just
369 # in case
Chmouel Boudjnahad8b2762013-01-10 15:40:01 +0100370 swift-init --run-dir=${SWIFT_DATA_DIR}/run all restart || true
Chmouel Boudjnah0c3a5582013-03-06 10:58:33 +0100371 if [[ ${SWIFT_REPLICAS} == 1 ]];then
372 todo="object container account"
373 fi
374 for type in proxy ${todo};do
375 swift-init --run-dir=${SWIFT_DATA_DIR}/run ${type} stop || true
376 done
377 screen_it s-proxy "cd $SWIFT_DIR && $SWIFT_DIR/bin/swift-proxy-server ${SWIFT_CONFIG_DIR}/proxy-server.conf -v"
378 if [[ ${SWIFT_REPLICAS} == 1 ]];then
379 for type in object container account;do
380 screen_it s-${type} "cd $SWIFT_DIR && $SWIFT_DIR/bin/swift-${type}-server ${SWIFT_CONFIG_DIR}/${type}-server/1.conf -v"
381 done
382 fi
Attila Fazekasece6a332012-11-29 14:19:41 +0100383}
384
385# stop_swift() - Stop running processes (non-screen)
386function stop_swift() {
387 # screen normally killed by unstack.sh
Chmouel Boudjnah0c3a5582013-03-06 10:58:33 +0100388 if type -p swift-init >/dev/null;then
389 swift-init --run-dir=${SWIFT_DATA_DIR}/run all stop || true
390 fi
Attila Fazekasece6a332012-11-29 14:19:41 +0100391}
392
393# Restore xtrace
394$XTRACE