Page MenuHomeClusterLabs Projects

No OneTemporary

diff --git a/script/service-still-runnable b/script/service-still-runnable
index 3b3085c..6a29050 100755
--- a/script/service-still-runnable
+++ b/script/service-still-runnable
@@ -1,33 +1,33 @@
#!/bin/bash
# This script is part of Booth.
# It checks whether the given resource (service) still has a chance
# to run on the local cluster, so that booth knows whether to
# acquire the ticket here.
set -e
service="${1:?Need a resource name as first argument.}"
# We expect an output like
# p_dummy (ocf::pacemaker:Dummy): Started geo-rz2-a
if crm_simulate --ticket-grant "$BOOTH_TICKET" --simulate --live-check |
sed -n '/^Revised cluster status:/,$p' |
- egrep "^\s+$service\s+\(.*\): Started (\S+)$"
+ egrep "^[[:space:]]+$service[[:space:]]+\(.*\):[[:space:]]+Started ([^[:space:]]+) *$" >/dev/null
then
# can be started - we're done.
exit 0
fi
# Some error occured.
# Try to help the admin with a bit of diagnostic.
#
# disallow ms-resources, ie. only primitives wanted here
if ! crm_resource -l | grep -v ":" | grep "$service" ; then
ha_logger "Defined resource '$service' in $BOOTH_CONF_PATH is not a primitive??"
fi
exit 1

File Metadata

Mime Type
text/x-diff
Expires
Sat, Jan 25, 6:50 AM (1 d, 6 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1321378
Default Alt Text
(1 KB)

Event Timeline