fence-agents: RHEL6 - fencing: Delay should be used also with "disable"

Marek GrĂ¡c marx at fedoraproject.org
Thu Jun 26 13:24:22 UTC 2014


Gitweb:        http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=a5ce29b7dd9b07f0e5038b197a8260a313b7cadd
Commit:        a5ce29b7dd9b07f0e5038b197a8260a313b7cadd
Parent:        b972ec00ea7e50664aa684efa7a2873d98a11c48
Author:        Marek 'marx' Grac <mgrac at redhat.com>
AuthorDate:    Thu Jun 26 14:23:45 2014 +0200
Committer:     Marek 'marx' Grac <mgrac at redhat.com>
CommitterDate: Thu Jun 26 14:23:45 2014 +0200

fencing: Delay should be used also with "disable"

Previously, delay was used only with off and reboot actions.
Resolves: rhbz#641632
---
 fence/agents/lib/fencing.py.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
index 775b567..eeb0a3f 100644
--- a/fence/agents/lib/fencing.py.py
+++ b/fence/agents/lib/fencing.py.py
@@ -892,7 +892,7 @@ def fence_login(options, re_login_string = "(login\s*: )|(Login Name:  )|(userna
 
 	## Do the delay of the fence device before logging in
 	## Delay is important for two-node clusters fencing but we do not need to delay 'status' operations
-	if options["-o"] in ["off", "reboot"]:
+	if options["-o"] in ["off", "reboot", "disable"]:
 		time.sleep(int(options["-f"]))
 
 	try:


More information about the cluster-commits mailing list