cluster: RHEL55 - Revert "resource-agents: Add status_program attribute"
by Lon Hohberger
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: d97be02b2f557e7e60a2f804353ae639868ef67d
Parent: ea76067bc05359c1582bfd84be4c1b3eb05b230a
Author: Lon Hohberger <lhh(a)redhat.com>
AuthorDate: Thu Jun 3 14:03:04 2010 -0400
Committer: Lon Hohberger <lhh(a)redhat.com>
CommitterDate: Thu Jun 3 14:03:04 2010 -0400
Revert "resource-agents: Add status_program attribute"
This reverts commit ea76067bc05359c1582bfd84be4c1b3eb05b230a.
---
rgmanager/src/resources/vm.sh | 33 +--------------------------------
1 files changed, 1 insertions(+), 32 deletions(-)
diff --git a/rgmanager/src/resources/vm.sh b/rgmanager/src/resources/vm.sh
index 2a995eb..d2932dd 100755
--- a/rgmanager/src/resources/vm.sh
+++ b/rgmanager/src/resources/vm.sh
@@ -213,20 +213,6 @@ meta_data()
<content type="string" default="0"/>
</parameter>
- <parameter name="status_program" reconfig="1">
- <longdesc lang="en">
- Ordinarily, only the presence/health of a virtual machine
- is checked. If specified, the status_program value is
- executed during a depth 10 check. The intent of this
- program is to ascertain the status of critical services
- within a virtual machine.
- </longdesc>
- <shortdesc lang="en">
- Additional status check program
- </shortdesc>
- <content type="string" default="0"/>
- </parameter>
-
<parameter name="hypervisor">
<shortdesc lang="en">
Hypervisor
@@ -269,10 +255,6 @@ meta_data()
<action name="status" timeout="10" interval="30"/>
<action name="monitor" timeout="10" interval="30"/>
- <!-- depth 10 calls the status_program -->
- <action name="status" depth="10" timeout="10" interval="300"/>
- <action name="monitor" depth="10" timeout="10" interval="300"/>
-
<!-- reconfigure - reconfigure with new OCF parameters.
NOT OCF COMPATIBLE AT ALL -->
<action name="reconfig" timeout="10"/>
@@ -561,11 +543,7 @@ virsh_status()
return 0
fi
- if [ "$state" = "shut off" ]; then
- return $OCF_NOT_RUNNING
- fi
-
- return $OCF_ERR_GENERIC
+ return 1
}
@@ -945,15 +923,6 @@ case $1 in
validate_all || exit $OCF_ERR_ARGS
echo -n "Virtual machine $OCF_RESKEY_name is "
do_status
- rv=$?
- if [ $rv -ne 0 ]; then
- exit $rv
- fi
- [ -z "$OCF_RESKEY_status_program" ] && exit 0
- [ -z "$OCF_CHECK_LEVEL" ] && exit 0
- [ $OCF_CHECK_LEVEL -lt 10 ] && exit 0
-
- bash -c "$OCF_RESKEY_status_program" &> /dev/null
exit $?
;;
migrate)
13 years, 11 months
cluster: RHEL56 - resource-agents: Add status_program attribute
by Lon Hohberger
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 805e0bae5db683fb33ec2e3c14b12c6380885494
Parent: 1042bd4beb2f201459112a06052655760fadd521
Author: Lon Hohberger <lhh(a)redhat.com>
AuthorDate: Tue May 4 17:54:15 2010 -0400
Committer: Lon Hohberger <lhh(a)redhat.com>
CommitterDate: Thu Jun 3 14:05:54 2010 -0400
resource-agents: Add status_program attribute
Fix previous patch which contained an incorrect default.
Resolves: bz583788
Signed-off-by: Lon Hohberger <lhh(a)redhat.com>
---
rgmanager/src/resources/vm.sh | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/rgmanager/src/resources/vm.sh b/rgmanager/src/resources/vm.sh
index d2932dd..c8be516 100755
--- a/rgmanager/src/resources/vm.sh
+++ b/rgmanager/src/resources/vm.sh
@@ -213,6 +213,20 @@ meta_data()
<content type="string" default="0"/>
</parameter>
+ <parameter name="status_program" reconfig="1">
+ <longdesc lang="en">
+ Ordinarily, only the presence/health of a virtual machine
+ is checked. If specified, the status_program value is
+ executed during a depth 10 check. The intent of this
+ program is to ascertain the status of critical services
+ within a virtual machine.
+ </longdesc>
+ <shortdesc lang="en">
+ Additional status check program
+ </shortdesc>
+ <content type="string" default=""/>
+ </parameter>
+
<parameter name="hypervisor">
<shortdesc lang="en">
Hypervisor
@@ -255,6 +269,10 @@ meta_data()
<action name="status" timeout="10" interval="30"/>
<action name="monitor" timeout="10" interval="30"/>
+ <!-- depth 10 calls the status_program -->
+ <action name="status" depth="10" timeout="10" interval="300"/>
+ <action name="monitor" depth="10" timeout="10" interval="300"/>
+
<!-- reconfigure - reconfigure with new OCF parameters.
NOT OCF COMPATIBLE AT ALL -->
<action name="reconfig" timeout="10"/>
@@ -543,7 +561,11 @@ virsh_status()
return 0
fi
- return 1
+ if [ "$state" = "shut off" ]; then
+ return $OCF_NOT_RUNNING
+ fi
+
+ return $OCF_ERR_GENERIC
}
@@ -923,6 +945,15 @@ case $1 in
validate_all || exit $OCF_ERR_ARGS
echo -n "Virtual machine $OCF_RESKEY_name is "
do_status
+ rv=$?
+ if [ $rv -ne 0 ]; then
+ exit $rv
+ fi
+ [ -z "$OCF_RESKEY_status_program" ] && exit 0
+ [ -z "$OCF_CHECK_LEVEL" ] && exit 0
+ [ $OCF_CHECK_LEVEL -lt 10 ] && exit 0
+
+ bash -c "$OCF_RESKEY_status_program" &> /dev/null
exit $?
;;
migrate)
13 years, 11 months
cluster: RHEL56 - Revert "resource-agents: Add status_program attribute"
by Lon Hohberger
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 1042bd4beb2f201459112a06052655760fadd521
Parent: 6f9e71a735281ae034cb9741a499b01127f9712e
Author: Lon Hohberger <lhh(a)redhat.com>
AuthorDate: Thu Jun 3 14:05:31 2010 -0400
Committer: Lon Hohberger <lhh(a)redhat.com>
CommitterDate: Thu Jun 3 14:05:31 2010 -0400
Revert "resource-agents: Add status_program attribute"
This reverts commit 4c44c6e523a4c8521f55fc7330508c493da379f5.
---
rgmanager/src/resources/vm.sh | 33 +--------------------------------
1 files changed, 1 insertions(+), 32 deletions(-)
diff --git a/rgmanager/src/resources/vm.sh b/rgmanager/src/resources/vm.sh
index 2a995eb..d2932dd 100755
--- a/rgmanager/src/resources/vm.sh
+++ b/rgmanager/src/resources/vm.sh
@@ -213,20 +213,6 @@ meta_data()
<content type="string" default="0"/>
</parameter>
- <parameter name="status_program" reconfig="1">
- <longdesc lang="en">
- Ordinarily, only the presence/health of a virtual machine
- is checked. If specified, the status_program value is
- executed during a depth 10 check. The intent of this
- program is to ascertain the status of critical services
- within a virtual machine.
- </longdesc>
- <shortdesc lang="en">
- Additional status check program
- </shortdesc>
- <content type="string" default="0"/>
- </parameter>
-
<parameter name="hypervisor">
<shortdesc lang="en">
Hypervisor
@@ -269,10 +255,6 @@ meta_data()
<action name="status" timeout="10" interval="30"/>
<action name="monitor" timeout="10" interval="30"/>
- <!-- depth 10 calls the status_program -->
- <action name="status" depth="10" timeout="10" interval="300"/>
- <action name="monitor" depth="10" timeout="10" interval="300"/>
-
<!-- reconfigure - reconfigure with new OCF parameters.
NOT OCF COMPATIBLE AT ALL -->
<action name="reconfig" timeout="10"/>
@@ -561,11 +543,7 @@ virsh_status()
return 0
fi
- if [ "$state" = "shut off" ]; then
- return $OCF_NOT_RUNNING
- fi
-
- return $OCF_ERR_GENERIC
+ return 1
}
@@ -945,15 +923,6 @@ case $1 in
validate_all || exit $OCF_ERR_ARGS
echo -n "Virtual machine $OCF_RESKEY_name is "
do_status
- rv=$?
- if [ $rv -ne 0 ]; then
- exit $rv
- fi
- [ -z "$OCF_RESKEY_status_program" ] && exit 0
- [ -z "$OCF_CHECK_LEVEL" ] && exit 0
- [ $OCF_CHECK_LEVEL -lt 10 ] && exit 0
-
- bash -c "$OCF_RESKEY_status_program" &> /dev/null
exit $?
;;
migrate)
13 years, 11 months
cluster: RHEL6 - resource-agents: Resolve incorrect default
by Lon Hohberger
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 16cd1902fbbcae8c37c212099b9384ec30b2f376
Parent: de94f7c47a2dcea549427bfbfadda5a8bb2e5a10
Author: Lon Hohberger <lhh(a)redhat.com>
AuthorDate: Thu Jun 3 12:55:17 2010 -0400
Committer: Lon Hohberger <lhh(a)redhat.com>
CommitterDate: Thu Jun 3 13:20:32 2010 -0400
resource-agents: Resolve incorrect default
The incorrect default was causing VMs to restart
every 5 minutes.
Resolves: rhbz#599643
Signed-off-by: Lon Hohberger <lhh(a)redhat.com>
---
rgmanager/src/resources/vm.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/rgmanager/src/resources/vm.sh b/rgmanager/src/resources/vm.sh
index 3501071..53ada42 100644
--- a/rgmanager/src/resources/vm.sh
+++ b/rgmanager/src/resources/vm.sh
@@ -224,7 +224,7 @@ meta_data()
<shortdesc lang="en">
Additional status check program
</shortdesc>
- <content type="string" default="0"/>
+ <content type="string" default=""/>
</parameter>
<parameter name="hypervisor">
13 years, 11 months
cluster: STABLE3 - resource-agents: Resolve incorrect default
by Lon Hohberger
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 58dae2d17bbe8bebb36dfbfc3e75c76ce09a118d
Parent: e724bb5fe6abc7395c525b2bf483810577b92c33
Author: Lon Hohberger <lhh(a)redhat.com>
AuthorDate: Thu Jun 3 12:55:17 2010 -0400
Committer: Lon Hohberger <lhh(a)redhat.com>
CommitterDate: Thu Jun 3 13:15:09 2010 -0400
resource-agents: Resolve incorrect default
The incorrect default was causing VMs to restart
every 5 minutes.
Resolves: rhbz#599643
Signed-off-by: Lon Hohberger <lhh(a)redhat.com>
---
rgmanager/src/resources/vm.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/rgmanager/src/resources/vm.sh b/rgmanager/src/resources/vm.sh
index 3501071..53ada42 100644
--- a/rgmanager/src/resources/vm.sh
+++ b/rgmanager/src/resources/vm.sh
@@ -224,7 +224,7 @@ meta_data()
<shortdesc lang="en">
Additional status check program
</shortdesc>
- <content type="string" default="0"/>
+ <content type="string" default=""/>
</parameter>
<parameter name="hypervisor">
13 years, 11 months