Accepting request 459648 from home:ZRen:branches:Base:System
Fixes for bsc#1012973,bsc#1023283¸bsc#1025560 OBS-URL: https://build.opensuse.org/request/show/459648 OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=167
This commit is contained in:
Tomáš Chvátal
committed by
Git OBS Bridge
Git OBS Bridge
parent
bf54202619
commit
d35ced24ce
310
clvmd.ocf
310
clvmd.ocf
@@ -1,6 +1,5 @@
|
||||
#!/bin/bash
|
||||
# Copyright (c) 2008 Xinwei Hu
|
||||
# All Rights Reserved.
|
||||
# Copyright (c) 2008 Xinwei Hu All Rights Reserved.
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of version 2 of the GNU General Public License as
|
||||
@@ -12,7 +11,7 @@
|
||||
#
|
||||
# Further, this software is distributed without any warranty that it is
|
||||
# free of the rightful claim of any third person regarding infringement
|
||||
# or the like. Any license provided herein, whether implied or
|
||||
# or the like. Any license provided herein, whether implied or
|
||||
# otherwise, applies only to this software file. Patent licenses, if
|
||||
# any, provided herein do not apply to combinations of this program with
|
||||
# other software, or any other product whatsoever.
|
||||
@@ -38,161 +37,175 @@ DAEMON="${sbindir}/clvmd"
|
||||
CMIRRORD="${sbindir}/cmirrord"
|
||||
LVMCONF="${sbindir}/lvmconf"
|
||||
|
||||
time_to_seconds() {
|
||||
local val
|
||||
val=$1
|
||||
case $val in
|
||||
*h) echo $(( $(echo $val | sed -e "s/h$//") * 3600 ));;
|
||||
*ms) echo $(( $(echo $val | sed -e "s/ms$//") / 1000 ));;
|
||||
*s) echo $val | sed -e "s/s$//";;
|
||||
*m) echo $(( $(echo $val | sed -e "s/m$//") * 60 ));;
|
||||
*) echo "$val";;
|
||||
esac
|
||||
}
|
||||
|
||||
OCF_RESKEY_daemon_timeout=$(time_to_seconds ${OCF_RESKEY_daemon_timeout})
|
||||
|
||||
status_daemons()
|
||||
{
|
||||
PID=`pidofproc "$DAEMON"`
|
||||
PID=`pidofproc "$DAEMON"`
|
||||
NPID=`pidofproc "$CMIRRORD"`
|
||||
if [ -n "$PID" -a -n "$NPID" ]; then
|
||||
return $OCF_SUCCESS
|
||||
fi
|
||||
return $OCF_NOT_RUNNING
|
||||
if [ -n "$PID" -a -n "$NPID" ]; then
|
||||
return $OCF_SUCCESS
|
||||
fi
|
||||
return $OCF_NOT_RUNNING
|
||||
}
|
||||
|
||||
status_clvmd()
|
||||
{
|
||||
PID=`pidofproc "$DAEMON"`
|
||||
if [ -n "$PID" ]; then
|
||||
return $OCF_SUCCESS
|
||||
fi
|
||||
return $OCF_NOT_RUNNING
|
||||
PID=`pidofproc "$DAEMON"`
|
||||
if [ -n "$PID" ]; then
|
||||
return $OCF_SUCCESS
|
||||
fi
|
||||
return $OCF_NOT_RUNNING
|
||||
}
|
||||
|
||||
status_cmirrord()
|
||||
{
|
||||
PID=`pidofproc "$CMIRRORD"`
|
||||
if [ -n "$PID" ]; then
|
||||
return $OCF_SUCCESS
|
||||
fi
|
||||
return $OCF_NOT_RUNNING
|
||||
PID=`pidofproc "$CMIRRORD"`
|
||||
if [ -n "$PID" ]; then
|
||||
return $OCF_SUCCESS
|
||||
fi
|
||||
return $OCF_NOT_RUNNING
|
||||
}
|
||||
|
||||
bringup_clvmd()
|
||||
{
|
||||
if [ ! -e "$DAEMON" ]; then
|
||||
ocf_log err "Required binary not found: $DAEMON"
|
||||
return $OCF_ERR_INSTALLED
|
||||
fi
|
||||
if [ ! -e "$DAEMON" ]; then
|
||||
ocf_log err "Required binary not found: $DAEMON"
|
||||
return $OCF_ERR_INSTALLED
|
||||
fi
|
||||
|
||||
start_daemon "$DAEMON" "$OCF_RESKEY_daemon_options"; rc=$?
|
||||
if [ $rc != 0 ]; then
|
||||
ocf_log err "Could not start $DAEMON"
|
||||
return $OCF_ERR_GENERIC
|
||||
fi
|
||||
start_daemon "$DAEMON" "$OCF_RESKEY_daemon_options"; rc=$?
|
||||
if [ $rc != 0 ]; then
|
||||
ocf_log err "Could not start $DAEMON"
|
||||
return $OCF_ERR_GENERIC
|
||||
fi
|
||||
|
||||
sleep 1
|
||||
COUNT=0
|
||||
rc=$OCF_NOT_RUNNING
|
||||
sleep 1
|
||||
COUNT=0
|
||||
rc=$OCF_NOT_RUNNING
|
||||
|
||||
while [ $rc = $OCF_NOT_RUNNING ]; do
|
||||
COUNT=`expr $COUNT + 1`
|
||||
if [ $COUNT -gt $OCF_RESKEY_daemon_timeout ]; then
|
||||
ocf_log err "`basename $DAEMON` did not come up"
|
||||
return $OCF_ERR_GENERIC
|
||||
fi
|
||||
status_clvmd; rc=$?
|
||||
sleep 1
|
||||
done
|
||||
while [ $rc = $OCF_NOT_RUNNING ]; do
|
||||
COUNT=`expr $COUNT + 1`
|
||||
if [ $COUNT -gt $OCF_RESKEY_daemon_timeout ]; then
|
||||
ocf_log err "`basename $DAEMON` did not come up"
|
||||
return $OCF_ERR_GENERIC
|
||||
fi
|
||||
status_clvmd; rc=$?
|
||||
sleep 1
|
||||
done
|
||||
|
||||
return $rc
|
||||
return $rc
|
||||
}
|
||||
|
||||
bringup_cmirrord()
|
||||
{
|
||||
if [ ! -e "$CMIRRORD" ]; then
|
||||
ocf_log err "Required binary not found: $DAEMON"
|
||||
return $OCF_ERR_INSTALLED
|
||||
fi
|
||||
if [ ! -e "$CMIRRORD" ]; then
|
||||
ocf_log err "Required binary not found: $DAEMON"
|
||||
return $OCF_ERR_INSTALLED
|
||||
fi
|
||||
|
||||
start_daemon "$CMIRRORD"; rc=$?
|
||||
if [ $rc != 0 ]; then
|
||||
ocf_log err "Could not start $CMIRRORD"
|
||||
return $OCF_ERR_GENERIC
|
||||
fi
|
||||
start_daemon "$CMIRRORD"; rc=$?
|
||||
if [ $rc != 0 ]; then
|
||||
ocf_log err "Could not start $CMIRRORD"
|
||||
return $OCF_ERR_GENERIC
|
||||
fi
|
||||
|
||||
sleep 1
|
||||
COUNT=0
|
||||
rc=$OCF_NOT_RUNNING
|
||||
sleep 1
|
||||
COUNT=0
|
||||
rc=$OCF_NOT_RUNNING
|
||||
|
||||
while [ $rc = $OCF_NOT_RUNNING ]; do
|
||||
COUNT=`expr $COUNT + 1`
|
||||
if [ $COUNT -gt $OCF_RESKEY_daemon_timeout ]; then
|
||||
ocf_log err "`basename $DAEMON` did not come up"
|
||||
return $OCF_ERR_GENERIC
|
||||
fi
|
||||
status_cmirrord; rc=$?
|
||||
sleep 1
|
||||
done
|
||||
while [ $rc = $OCF_NOT_RUNNING ]; do
|
||||
COUNT=`expr $COUNT + 1`
|
||||
if [ $COUNT -gt $OCF_RESKEY_daemon_timeout ]; then
|
||||
ocf_log err "`basename $DAEMON` did not come up"
|
||||
return $OCF_ERR_GENERIC
|
||||
fi
|
||||
status_cmirrord; rc=$?
|
||||
sleep 1
|
||||
done
|
||||
|
||||
return $rc
|
||||
return $rc
|
||||
}
|
||||
|
||||
|
||||
kill_clvmd()
|
||||
{
|
||||
status_clvmd; rc=$?
|
||||
if [ $rc != $OCF_SUCCESS ]; then
|
||||
return rc
|
||||
fi
|
||||
status_clvmd; rc=$?
|
||||
if [ $rc != $OCF_SUCCESS ]; then
|
||||
return $rc
|
||||
fi
|
||||
|
||||
ocf_log info "Stopping `basename "$DAEMON"`"
|
||||
killproc -INT "$DAEMON"
|
||||
ocf_log info "Stopping `basename "$DAEMON"`"
|
||||
killproc -INT "$DAEMON"
|
||||
|
||||
sleep 1
|
||||
status_daemons; rc=$?
|
||||
|
||||
COUNT=0
|
||||
while [ $rc = $OCF_SUCCESS ]; do
|
||||
COUNT=`expr $COUNT + 1`
|
||||
if [ $COUNT -gt $OCF_RESKEY_daemon_timeout ]; then
|
||||
ocf_log err "`basename $DAEMON` shutdown emergency"
|
||||
killproc -9 "$DAEMON"
|
||||
sleep 1
|
||||
status_daemons; rc=$?
|
||||
|
||||
COUNT=0
|
||||
while [ $rc = $OCF_SUCCESS ]; do
|
||||
COUNT=`expr $COUNT + 1`
|
||||
if [ $COUNT -gt $OCF_RESKEY_daemon_timeout ]; then
|
||||
ocf_log err "`basename $DAEMON` shutdown emergency"
|
||||
killproc -9 "$DAEMON"
|
||||
status_clvmd; rc=$?
|
||||
if [ $rc = $OCF_NOT_RUNNING ]; then
|
||||
return $OCF_SUCCESS
|
||||
else
|
||||
return $OCF_ERR_GENERIC
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
killproc -INT "$DAEMON"
|
||||
sleep 1
|
||||
sleep 1
|
||||
status_clvmd; rc=$?
|
||||
done
|
||||
done
|
||||
|
||||
return $OCF_SUCCESS
|
||||
return $OCF_SUCCESS
|
||||
}
|
||||
|
||||
kill_cmirrord()
|
||||
{
|
||||
status_cmirrord; rc=$?
|
||||
if [ $rc != $OCF_SUCCESS ]; then
|
||||
return rc
|
||||
fi
|
||||
status_cmirrord; rc=$?
|
||||
if [ $rc != $OCF_SUCCESS ]; then
|
||||
return $rc
|
||||
fi
|
||||
|
||||
ocf_log info "Stopping `basename "$CMIRRORD"`"
|
||||
killproc -INT "$CMIRRORD"
|
||||
ocf_log info "Stopping `basename "$CMIRRORD"`"
|
||||
killproc -INT "$CMIRRORD"
|
||||
|
||||
sleep 1
|
||||
status_cmirrord; rc=$?
|
||||
|
||||
COUNT=0
|
||||
while [ $rc = $OCF_SUCCESS ]; do
|
||||
COUNT=`expr $COUNT + 1`
|
||||
if [ $COUNT -gt $OCF_RESKEY_daemon_timeout ]; then
|
||||
ocf_log err "`basename $CMIRRORD` shutdown emergency"
|
||||
killproc -9 "$CMIRRORD"
|
||||
sleep 1
|
||||
status_cmirrord; rc=$?
|
||||
|
||||
COUNT=0
|
||||
while [ $rc = $OCF_SUCCESS ]; do
|
||||
COUNT=`expr $COUNT + 1`
|
||||
if [ $COUNT -gt $OCF_RESKEY_daemon_timeout ]; then
|
||||
ocf_log err "`basename $CMIRRORD` shutdown emergency"
|
||||
killproc -9 "$CMIRRORD"
|
||||
status_cmirrord; rc=$?
|
||||
if [ $rc = $OCF_NOT_RUNNING ]; then
|
||||
return $OCF_SUCCESS
|
||||
else
|
||||
return $OCF_ERR_GENERIC
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
killproc -INT "$CMIRRORD"
|
||||
sleep 1
|
||||
sleep 1
|
||||
status_cmirrord; rc=$?
|
||||
done
|
||||
done
|
||||
|
||||
return $OCF_SUCCESS
|
||||
return $OCF_SUCCESS
|
||||
}
|
||||
|
||||
|
||||
@@ -201,34 +214,34 @@ clvmd_start()
|
||||
clvmd_validate
|
||||
ocf_log info "Starting $OCF_RESOURCE_INSTANCE"
|
||||
|
||||
# autoset locking type to clusted when lvmconf tool is available
|
||||
if [ -x "$LVMCONF" ]; then
|
||||
$LVMCONF --enable-cluster > /dev/null 2>&1
|
||||
fi
|
||||
# autoset locking type to clusted when lvmconf tool is available
|
||||
if [ -x "$LVMCONF" ]; then
|
||||
$LVMCONF --enable-cluster > /dev/null 2>&1
|
||||
fi
|
||||
|
||||
status_clvmd; rc=$?
|
||||
if [ $rc == $OCF_NOT_RUNNING ]; then
|
||||
bringup_clvmd; rc=$?
|
||||
if [ $rc != $OCF_SUCCESS ]; then
|
||||
return $OCF_ERR_GENERIC
|
||||
fi
|
||||
if [ $rc == $OCF_NOT_RUNNING ]; then
|
||||
bringup_clvmd; rc=$?
|
||||
if [ $rc != $OCF_SUCCESS ]; then
|
||||
return $OCF_ERR_GENERIC
|
||||
fi
|
||||
fi
|
||||
|
||||
status_cmirrord; rc=$?
|
||||
if [ $rc == $OCF_NOT_RUNNING ]; then
|
||||
bringup_cmirrord; rc=$?
|
||||
if [ $rc != $OCF_SUCCESS ]; then
|
||||
kill_clvmd
|
||||
return $OCF_ERR_GENERIC
|
||||
fi
|
||||
if [ $rc == $OCF_NOT_RUNNING ]; then
|
||||
bringup_cmirrord; rc=$?
|
||||
if [ $rc != $OCF_SUCCESS ]; then
|
||||
kill_clvmd
|
||||
return $OCF_ERR_GENERIC
|
||||
fi
|
||||
fi
|
||||
|
||||
return $OCF_SUCCESS
|
||||
return $OCF_SUCCESS
|
||||
}
|
||||
|
||||
clvmd_stop() {
|
||||
clvmd_validate
|
||||
ocf_log info "Stopping $OCF_RESOURCE_INSTANCE"
|
||||
ocf_log info "Stopping $OCF_RESOURCE_INSTANCE"
|
||||
|
||||
status_clvmd; rc=$?
|
||||
if [ $rc != $OCF_NOT_RUNNING ]; then
|
||||
@@ -252,28 +265,28 @@ clvmd_stop() {
|
||||
}
|
||||
|
||||
clvmd_monitor() {
|
||||
clvmd_validate
|
||||
clvmd_validate
|
||||
|
||||
status_daemons
|
||||
return $?
|
||||
status_daemons
|
||||
return $?
|
||||
}
|
||||
|
||||
clvmd_usage() {
|
||||
echo "usage: $0 {start|stop|monitor|validate-all|meta-data}"
|
||||
echo " Expects to have a fully populated OCF RA-compliant environment set."
|
||||
echo " In particualr, a value for OCF_ROOT"
|
||||
echo "usage: $0 {start|stop|monitor|validate-all|meta-data}"
|
||||
echo " Expects to have a fully populated OCF RA-compliant environment set."
|
||||
echo " In particualr, a value for OCF_ROOT"
|
||||
}
|
||||
|
||||
clvmd_validate() {
|
||||
: TODO: check for globally_unique=true and return OCF_ERR_CONFIGURED
|
||||
case ${OCF_RESKEY_CRM_meta_globally_unique} in
|
||||
: TODO: check for globally_unique=true and return OCF_ERR_CONFIGURED
|
||||
case ${OCF_RESKEY_CRM_meta_globally_unique} in
|
||||
yes|Yes|true|True|1)
|
||||
ocf_log err "$OCF_RESOURCE_INSTANCE must be configured with the globally_unique=false meta attribute"
|
||||
exit $OCF_ERR_CONFIGURED
|
||||
;;
|
||||
esac
|
||||
ocf_log err "$OCF_RESOURCE_INSTANCE must be configured with the globally_unique=false meta attribute"
|
||||
exit $OCF_ERR_CONFIGURED
|
||||
;;
|
||||
esac
|
||||
|
||||
return $OCF_SUCCESS
|
||||
return $OCF_SUCCESS
|
||||
}
|
||||
|
||||
meta_data() {
|
||||
@@ -289,30 +302,29 @@ It starts clvmd and cmirrord as anonymous clones.
|
||||
<shortdesc lang="en">clvmd resource agent</shortdesc>
|
||||
<parameters>
|
||||
|
||||
<parameter name="daemon_timeout" unique="0">
|
||||
<longdesc lang="en">
|
||||
<parameter name="daemon_timeout" unique="0">
|
||||
<longdesc lang="en">
|
||||
Number of seconds to allow the control daemon to come up and down
|
||||
</longdesc>
|
||||
<shortdesc lang="en">Daemon Timeout</shortdesc>
|
||||
<content type="string" default="80"/>
|
||||
</parameter>
|
||||
</longdesc>
|
||||
<shortdesc lang="en">Daemon Timeout</shortdesc>
|
||||
<content type="string" default="80"/>
|
||||
</parameter>
|
||||
|
||||
<parameter name="daemon_options" unique="0">
|
||||
<longdesc lang="en">
|
||||
<parameter name="daemon_options" unique="0">
|
||||
<longdesc lang="en">
|
||||
Options to clvmd. Refer to clvmd.8 for detailed descriptions.
|
||||
</longdesc>
|
||||
<shortdesc lang="en">Daemon Options</shortdesc>
|
||||
<content type="string" default="-d0"/>
|
||||
</parameter>
|
||||
|
||||
</longdesc>
|
||||
<shortdesc lang="en">Daemon Options</shortdesc>
|
||||
<content type="string" default="-d0"/>
|
||||
</parameter>
|
||||
|
||||
</parameters>
|
||||
<actions>
|
||||
<action name="start" timeout="90" />
|
||||
<action name="stop" timeout="100" />
|
||||
<action name="monitor" timeout="20" depth="0"/>
|
||||
<action name="meta-data" timeout="5" />
|
||||
<action name="validate-all" timeout="30" />
|
||||
<action name="start" timeout="90"/>
|
||||
<action name="stop" timeout="100"/>
|
||||
<action name="monitor" timeout="20" depth="0"/>
|
||||
<action name="meta-data" timeout="5"/>
|
||||
<action name="validate-all" timeout="30"/>
|
||||
</actions>
|
||||
</resource-agent>
|
||||
END
|
||||
@@ -333,7 +345,7 @@ validate-all) clvmd_validate
|
||||
usage|help) clvmd_usage
|
||||
exit $OCF_SUCCESS
|
||||
;;
|
||||
*) clvmd_usage
|
||||
*) clvmd_usage
|
||||
exit $OCF_ERR_UNIMPLEMENTED
|
||||
;;
|
||||
esac
|
||||
|
||||
Reference in New Issue
Block a user