resource-agents: master - vm.sh: Fix migration failure handling
by Lon Hohberger
Gitweb: http://git.fedorahosted.org/git/resource-agents.git?p=resource-agents.git...
Commit: ba998d71e22a688170c9c30b0b889b92c141e997
Parent: c2f808b226f1e0a8d5a866a3c1c43bd62a51d0e5
Author: Lon Hohberger <lhh(a)redhat.com>
AuthorDate: Mon Nov 30 17:29:02 2009 -0500
Committer: Lon Hohberger <lhh(a)redhat.com>
CommitterDate: Mon Nov 30 17:29:02 2009 -0500
vm.sh: Fix migration failure handling
If a VM fails to migrate, there is a good chance that
the VM is still running locally. Return a non-fatal
error so that the resource does not enter the failed
state.
Signed-off-by: Lon Hohberger <lhh(a)redhat.com>
---
rgmanager/src/resources/vm.sh | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/rgmanager/src/resources/vm.sh b/rgmanager/src/resources/vm.sh
index df56140..9f8647a 100644
--- a/rgmanager/src/resources/vm.sh
+++ b/rgmanager/src/resources/vm.sh
@@ -931,7 +931,23 @@ case $1 in
migrate)
validate_all || exit $OCF_ERR_ARGS
migrate $2 # Send VM to this node
- exit $?
+ rv=$?
+ if [ $rv -eq $OCF_ERR_GENERIC ]; then
+ # Catch-all: If migration failed with
+ # an unhandled error, do a status check
+ # to see if the VM is really dead.
+ #
+ # If the VM is still in good health, return
+ # a value to rgmanager to indicate the
+ # non-critical error
+ #
+ # XXX Is OCF_ERR_CONFIGURED the right value?
+ do_status > /dev/null
+ if [ $? -eq 0 ]; then
+ rv=$OCF_ERR_CONFIGURED
+ fi
+ fi
+ exit $rv
;;
reload)
exit 0
14 years, 5 months
rgmanager: master - build: relax autotools requirement
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/rgmanager.git?p=rgmanager.git;a=commitdif...
Commit: 5a249f4cae6fc27d7ab026e553618f33439cffda
Parent: 27e5a1b243b38e955d4d9a49e5a3f43d5f0bc1b1
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Wed Nov 25 08:55:32 2009 +0100
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Wed Nov 25 08:55:32 2009 +0100
build: relax autotools requirement
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
configure.ac | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index f7a75ff..feded74 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
# Process this file with autoconf to produce a configure script.
-AC_PREREQ([2.63b])
+AC_PREREQ([2.63])
AC_INIT([rgmanager], [master], [linux-cluster(a)redhat.com])
AM_INIT_AUTOMAKE([-Wno-portability])
-LT_PREREQ([2.2.7])
+LT_PREREQ([2.2.6])
LT_INIT
AC_CONFIG_MACRO_DIR([m4])
14 years, 5 months
resource-agents: master - build: relax autotools requirement
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/resource-agents.git?p=resource-agents.git...
Commit: c2f808b226f1e0a8d5a866a3c1c43bd62a51d0e5
Parent: 65a9e84db665456a2e8715037ccfb3700b7170eb
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Wed Nov 25 08:55:15 2009 +0100
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Wed Nov 25 08:55:15 2009 +0100
build: relax autotools requirement
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
configure.ac | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/configure.ac b/configure.ac
index ace859f..29a92a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
# Process this file with autoconf to produce a configure script.
-AC_PREREQ([2.63b])
+AC_PREREQ([2.63])
AC_INIT([resource-agents], [master], [linux-cluster(a)redhat.com])
AM_INIT_AUTOMAKE([-Wno-portability])
14 years, 5 months
gfs2-utils: master - build: relax autotools requirement
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitd...
Commit: eb9faeb14c243662b6b98ecfc5cf088562ad5605
Parent: 90b9ee97aaa76b17ad7df2b3726a4aca8b309fd6
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Wed Nov 25 08:54:55 2009 +0100
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Wed Nov 25 08:54:55 2009 +0100
build: relax autotools requirement
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
configure.ac | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index be55a79..bb4fc13 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
# Process this file with autoconf to produce a configure script.
-AC_PREREQ([2.63b])
+AC_PREREQ([2.63])
AC_INIT([gfs2-utils], [master], [linux-cluster(a)redhat.com])
AM_INIT_AUTOMAKE([-Wno-portability])
-LT_PREREQ([2.2.7])
+LT_PREREQ([2.2.6])
LT_INIT
AC_CONFIG_MACRO_DIR([m4])
14 years, 5 months
fence-agents: master - build: relax autotools requirement
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=com...
Commit: 99b91694fcd7cbd5411839c08dfdd9204576d3d0
Parent: 5215e29266b95f1492428b296e7232c7afe1237a
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Wed Nov 25 08:54:38 2009 +0100
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Wed Nov 25 08:54:38 2009 +0100
build: relax autotools requirement
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
configure.ac | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index b1b87ad..d69adac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
# Process this file with autoconf to produce a configure script.
-AC_PREREQ([2.63b])
+AC_PREREQ([2.63])
AC_INIT([fence-agents], [master], [linux-cluster(a)redhat.com])
AM_INIT_AUTOMAKE([-Wno-portability])
-LT_PREREQ([2.2.7])
+LT_PREREQ([2.2.6])
LT_INIT
AC_CONFIG_MACRO_DIR([m4])
14 years, 5 months
fence: master - build: relax autotools requirement
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/fence.git?p=fence.git;a=commitdiff;h=1f76...
Commit: 1f768229663730768a83035bb2368778566757a1
Parent: 10fe5cff7b048244d2f362d8b890176e43916db3
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Wed Nov 25 08:54:20 2009 +0100
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Wed Nov 25 08:54:20 2009 +0100
build: relax autotools requirement
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
configure.ac | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index e569176..4da5a0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
# Process this file with autoconf to produce a configure script.
-AC_PREREQ([2.63b])
+AC_PREREQ([2.63])
AC_INIT([fence], [master], [linux-cluster(a)redhat.com])
AM_INIT_AUTOMAKE([-Wno-portability])
-LT_PREREQ([2.2.7])
+LT_PREREQ([2.2.6])
LT_INIT
AC_CONFIG_MACRO_DIR([m4])
14 years, 5 months
dlm: master - build: relax autotools requirement
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=7ad436ba...
Commit: 7ad436ba4a7d68a79510fd6c033568b6bb100191
Parent: 7ce1ce66232e3c15fcce95fea72b3490c4a7a4cd
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Wed Nov 25 08:54:01 2009 +0100
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Wed Nov 25 08:54:01 2009 +0100
build: relax autotools requirement
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
configure.ac | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index d50de87..488f3eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
# Process this file with autoconf to produce a configure script.
-AC_PREREQ([2.63b])
+AC_PREREQ([2.63])
AC_INIT([dlm], [master], [linux-cluster(a)redhat.com])
AM_INIT_AUTOMAKE([-Wno-portability])
-LT_PREREQ([2.2.7])
+LT_PREREQ([2.2.6])
LT_INIT
AC_CONFIG_MACRO_DIR([m4])
14 years, 5 months
cluster: master - build: relax autotools requirement
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: bcf995db647d599e398df117cfc3fb85aab3c3a5
Parent: 739dc5c76d55bf71c91370a3c711cc4ae80adf9d
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Wed Nov 25 08:53:23 2009 +0100
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Wed Nov 25 08:53:23 2009 +0100
build: relax autotools requirement
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
configure.ac | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 1d4844e..c0996a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
# Process this file with autoconf to produce a configure script.
-AC_PREREQ([2.63b])
+AC_PREREQ([2.63])
AC_INIT([cluster], [master], [linux-cluster(a)redhat.com])
AM_INIT_AUTOMAKE([-Wno-portability])
-LT_PREREQ([2.2.7])
+LT_PREREQ([2.2.6])
LT_INIT
AC_CONFIG_MACRO_DIR([m4])
14 years, 5 months
cluster: STABLE3 - rgmanage init: no need to re-init variables around
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 2f25bbb8c35727bf880df12bd7b1ef68df9158d8
Parent: 2a190b94bc8efd1c0c9826c3764bd0193bfac0ae
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Tue Nov 24 10:20:56 2009 +0100
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Tue Nov 24 10:20:56 2009 +0100
rgmanage init: no need to re-init variables around
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
rgmanager/init.d/rgmanager.in | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/rgmanager/init.d/rgmanager.in b/rgmanager/init.d/rgmanager.in
index d13a1bb..38f7b1f 100644
--- a/rgmanager/init.d/rgmanager.in
+++ b/rgmanager/init.d/rgmanager.in
@@ -102,7 +102,6 @@ restart)
$0 start
;;
condrestart|try-restart)
- rtrn=0
if status $RGMGRD > /dev/null 2>&1; then
$0 stop
$0 start
14 years, 5 months
cluster: STABLE3 - rgmanager init: update help text
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 2a190b94bc8efd1c0c9826c3764bd0193bfac0ae
Parent: 82ac0e4c74d118ccf63b9c371f2d1d2b13cff14a
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Tue Nov 24 10:19:35 2009 +0100
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Tue Nov 24 10:19:35 2009 +0100
rgmanager init: update help text
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
rgmanager/init.d/rgmanager.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/rgmanager/init.d/rgmanager.in b/rgmanager/init.d/rgmanager.in
index 80535fa..d13a1bb 100644
--- a/rgmanager/init.d/rgmanager.in
+++ b/rgmanager/init.d/rgmanager.in
@@ -135,7 +135,7 @@ stop)
rm -f $LOCK_FILE
;;
*)
- echo "usage: $0 {start|restart|condrestart|reload|status|stop}"
+ echo "usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|status}"
rtrn=2
;;
esac
14 years, 5 months