cluster-devel.redhat.com archive mirror
 help / color / mirror / Atom feed
From: Ryan McCabe <rmccabe@redhat.com>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] [PATCH 4/5] rgmanager: Treat exit status 16 from umount as success
Date: Thu, 28 Jun 2012 15:57:58 -0400	[thread overview]
Message-ID: <20120628195755.GA80020@redhat.com> (raw)

When the filesystem /etc lives on is completely full, umount will exit
with exit status 16 if the umount syscall succeeded but it was unable to write
a new mtab file because the disk is full. umount won't exit with status 16
under any other circumstances.

This patch changes the fs.sh, clusterfs.sh, and netfs.sh resource agents
to check treat both exit status 0 and exit status 16 as success.

Resolves: rhbz#819595

Signed-off-by: Ryan McCabe <rmccabe@redhat.com>
---
 rgmanager/src/resources/clusterfs.sh |    3 ++-
 rgmanager/src/resources/fs.sh        |    3 ++-
 rgmanager/src/resources/netfs.sh     |    3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/rgmanager/src/resources/clusterfs.sh b/rgmanager/src/resources/clusterfs.sh
index 49eb724..eae1ee0 100755
--- a/rgmanager/src/resources/clusterfs.sh
+++ b/rgmanager/src/resources/clusterfs.sh
@@ -793,7 +793,8 @@ stop: Could not match $OCF_RESKEY_device with a real device"
 			ocf_log info "unmounting $dev ($mp)"
 
 			umount $mp
-			if  [ $? -eq 0 ]; then
+			retval=$?
+			if  [ $retval -eq 0 -o $retval -eq 16 ]; then
 				umount_failed=
 				done=$YES
 				continue
diff --git a/rgmanager/src/resources/fs.sh b/rgmanager/src/resources/fs.sh
index a98cddc..5d6bc1b 100755
--- a/rgmanager/src/resources/fs.sh
+++ b/rgmanager/src/resources/fs.sh
@@ -1103,7 +1103,8 @@ stop: Could not match $OCF_RESKEY_device with a real device"
 
  			ocf_log info "unmounting $mp"
 			umount $mp
-			if  [ $? -eq 0 ]; then
+			retval=$?
+			if  [ $retval -eq 0 -o $retval -eq 16 ]; then
 				umount_failed=
 				done=$YES
 				continue
diff --git a/rgmanager/src/resources/netfs.sh b/rgmanager/src/resources/netfs.sh
index 837a4c4..9f0daa4 100755
--- a/rgmanager/src/resources/netfs.sh
+++ b/rgmanager/src/resources/netfs.sh
@@ -560,7 +560,8 @@ stopNFSFilesystem() {
 			ocf_log info "unmounting $mp"
 
                         umount $umount_flag $mp
-			if  [ $? -eq 0 ]; then
+			retval=$?
+			if  [ $retval -eq 0 -o $retval -eq 16 ]; then
                                 umount_failed=
                                 done=$YES
                                 continue
-- 
1.7.10.2



             reply	other threads:[~2012-06-28 19:57 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-28 19:57 Ryan McCabe [this message]
2012-06-28 20:59 ` [Cluster-devel] [PATCH 4/5] rgmanager: Treat exit status 16 from umount as success Masatake YAMATO
2012-07-04 11:08 ` Fabio M. Di Nitto

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120628195755.GA80020@redhat.com \
    --to=rmccabe@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).