rpm/lvm2
SHA256
1
0
Fork 0
forked from pool/lvm2
Code Pull Requests Activity

Accepting request 195669 from home:deanraccoon:branches:Base:System

Browse Source 
add systemd support to lvm2 package, split device-mapper to another package

OBS-URL: https://build.opensuse.org/request/show/195669
OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=64
This commit is contained in:
Marcus Meissner
2013-08-26 11:12:14 +00:00
committed by Git OBS Bridge
parent fc4fb0b87f
commit 0eac2148de
17 changed files with 1082 additions and 819 deletions
Download Patch File Download Diff File Expand all files Collapse all files

174
clvmd.ocf
View File

@@ -27,14 +27,25 @@
. ${OCF_ROOT}/resource.d/heartbeat/.ocf-shellfuncs
# Parameter defaults
: ${OCF_RESKEY_CRM_meta_gloablly_unique:="false"}
: ${OCF_RESKEY_CRM_meta_globally_unique:="false"}
: ${OCF_RESKEY_daemon_timeout:="80"}
: ${OCF_RESKEY_daemon_options:="-d0"}
: ${OCF_RESKEY_daemon_options:="-d2"}
# Common variables
DAEMON="/usr/sbin/clvmd"
CMIRRORD="/usr/sbin/cmirrord"
status_daemon()
status_daemons()
{
PID=`pidofproc "$DAEMON"`
NPID=`pidofproc "$CMIRRORD"`
if [ -n "$PID" -a -n "$NPID" ]; then
return $OCF_SUCCESS
fi
return $OCF_NOT_RUNNING
}
status_clvmd()
{
PID=`pidofproc "$DAEMON"`
if [ -n "$PID" ]; then
@@ -43,7 +54,16 @@ status_daemon()
return $OCF_NOT_RUNNING
}
bringup_daemon()
status_cmirrord()
{
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"
@@ -66,16 +86,47 @@ bringup_daemon()
ocf_log err "`basename $DAEMON` did not come up"
return $OCF_ERR_GENERIC
fi
status_daemon; rc=$?
status_clvmd; rc=$?
sleep 1
done
return $rc
}
kill_daemon()
bringup_cmirrord()
{
status_daemon; rc=$?
if [ ! -e "$CMIRRORD" ]; then
ocf_log err "Required binary not found: $DAEMON"
return $OCF_ERR_INSTALLED
fi
start_daemon "$CMIRRORD" "$OCF_RESKEY_daemon_options"; 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
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
}
kill_clvmd()
{
status_clvmd; rc=$?
if [ $rc != $OCF_SUCCESS ]; then
return rc
fi
@@ -84,7 +135,7 @@ kill_daemon()
killproc -INT "$DAEMON"
sleep 1
status_daemon; rc=$?
status_daemons; rc=$?
COUNT=0
while [ $rc = $OCF_SUCCESS ]; do
@@ -92,7 +143,7 @@ kill_daemon()
if [ $COUNT -gt $OCF_RESKEY_daemon_timeout ]; then
ocf_log err "`basename $DAEMON` shutdown emergency"
killproc -9 "$DAEMON"
status_daemon; rc=$?
status_clvmd; rc=$?
if [ $rc = $OCF_NOT_RUNNING ]; then
return $OCF_SUCCESS
else
@@ -101,40 +152,101 @@ kill_daemon()
fi
killproc -INT "$DAEMON"
sleep 1
status_daemon; rc=$?
status_clvmd; rc=$?
done
return $OCF_SUCCESS
}
clvmd_start() {
clvmd_monitor; rc=$?
if [ $rc != $OCF_NOT_RUNNING ]; then
return $rc
kill_cmirrord()
{
status_cmirrord; rc=$?
if [ $rc != $OCF_SUCCESS ]; then
return rc
fi
ocf_log info "Starting $OCF_RESOURCE_INSTANCE"
ocf_log info "Stopping `basename "$CMIRRORD"`"
killproc -INT "$CMIRRORD"
bringup_daemon
return $?
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
killproc -INT "$CMIRRORD"
sleep 1
status_cmirrord; rc=$?
done
return $OCF_SUCCESS
}
clvmd_start()
{
clvmd_validate
ocf_log info "Starting $OCF_RESOURCE_INSTANCE"
status_clvmd; rc=$?
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
fi
return $OCF_SUCCESS
}
clvmd_stop() {
clvmd_monitor; rc=$?
case $rc in
$OCF_NOT_RUNNING) return $OCF_SUCCESS;;
esac
clvmd_validate
ocf_log info "Stopping $OCF_RESOURCE_INSTANCE"
kill_daemon
status_clvmd; rc=$?
if [ $rc != $OCF_NOT_RUNNING ]; then
kill_clvmd; krc=$?
if [ $krc != $OCF_SUCCESS ]; then
ocf_log err "Failed to stop clvmd"
return $OCF_ERR_GENERIC
fi
fi
status_cmirrord; rc=$?
if [ $rc != $OCF_NOT_RUNNING ]; then
kill_cmirrord; krc=$?
if [ $krc != $OCF_SUCCESS ]; then
ocf_log err "Failed to stop cmirrord"
return $OCF_ERR_GENERIC
fi
fi
return $OCF_SUCCESS
}
clvmd_monitor() {
clvmd_validate
status_daemon
status_daemons
return $?
}
@@ -145,10 +257,10 @@ clvmd_usage() {
}
clvmd_validate() {
: TODO: check for gloablly_unique=true and return OCF_ERR_CONFIGURED
case ${OCF_RESKEY_CRM_meta_gloablly_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 gloablly_unique=false meta attribute"
ocf_log err "$OCF_RESOURCE_INSTANCE must be configured with the globally_unique=false meta attribute"
exit $OCF_ERR_CONFIGURED
;;
esac
@@ -163,8 +275,8 @@ meta_data() {
<resource-agent name="clvmd">
<version>1.0</version>
<longdesc lang="en">
This is a clvmd Resource Agent.
It starts clvmd as anonymous clones.
This is a Resource Agent for both clvmd and cmirrord.
It starts clvmd and cmirrord as anonymous clones.
</longdesc>
<shortdesc lang="en">clvmd resource agent</shortdesc>
<parameters>
@@ -182,7 +294,7 @@ Number of seconds to allow the control daemon to come up and down
Options to clvmd. Refer to clvmd.8 for detailed descriptions.
</longdesc>
<shortdesc lang="en">Daemon Options</shortdesc>
<content type="string" default="-d0"/>
<content type="string" default="-d2"/>
</parameter>