gfs2-utils: master - gfs2_lockcapture: Fix condition where dlm lockspaces parsing failed
Andrew Price
andyp at fedoraproject.org
Tue Sep 22 15:41:42 UTC 2015
Gitweb: http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=243caa0b1d3e5debbeba9c99e1ad002b6eae93c9
Commit: 243caa0b1d3e5debbeba9c99e1ad002b6eae93c9
Parent: b4bd78f4574a1710da3cb99446ddd7a42baccdb2
Author: Shane Bradley <sbradley at redhat.com>
AuthorDate: Fri Sep 11 10:59:51 2015 -0400
Committer: Andrew Price <anprice at redhat.com>
CommitterDate: Tue Sep 22 16:40:45 2015 +0100
gfs2_lockcapture: Fix condition where dlm lockspaces parsing failed
The output of `dlm_tool ls` was not parsed correctly on dlm_tool version 3.0 or
higher. The patch now parses correctly `dlm_tool ls` output from version 2.0 or
higher.
Signed-off-by: Shane Bradley <sbradley at redhat.com>
---
gfs2/scripts/gfs2_lockcapture | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/gfs2/scripts/gfs2_lockcapture b/gfs2/scripts/gfs2_lockcapture
index 8839818..5fe92bc 100644
--- a/gfs2/scripts/gfs2_lockcapture
+++ b/gfs2/scripts/gfs2_lockcapture
@@ -5,7 +5,7 @@ systems and DLM.
@author : Shane Bradley
@contact : sbradley at redhat.com
- at version : 0.9
+ at version : 0.95
@copyright : GPLv2
"""
import sys
@@ -658,24 +658,25 @@ def getClusterNode(listOfGFS2Names):
else:
return None
-
-def getDLMToolDLMLockspaces():
+def parse_dlm_ls(dlm_ls):
"""
This function returns the names of all the dlm lockspace names found with the
- command: "dlm_tool ls".
+ commands "dlm_tool ls" or "group_tool ls" output.
@return: A list of all the dlm lockspace names.
@rtype: Array
"""
dlmLockspaces = []
- stdout = runCommandOutput("dlm_tool", ["ls"])
- if (not stdout == None):
- stdout = stdout.replace("dlm lockspaces\n", "")
+ if (not dlm_ls == None):
+ dlm_ls = dlm_ls.replace("dlm lockspaces\n", "")
dlmToolLSKeys = ["name", "id", "flags", "change", "members"]
# Split on newlines
- stdoutSections = stdout.split("\n\n")
- for section in stdoutSections:
+ dlm_lsSections = dlm_ls.split("\n\n")
+ for section in dlm_lsSections:
# Create tmp map to hold data
+ if (section.startswith("fence domain")):
+ # Not concerned with fence information.
+ continue
dlmToolLSMap = dict.fromkeys(dlmToolLSKeys)
lines = section.split("\n")
for line in lines:
@@ -699,9 +700,15 @@ def getGroupToolDLMLockspaces():
stdout = runCommandOutput("group_tool", ["ls"])
if (not stdout == None):
lines = stdout.split("\n")
- for line in lines:
- if (line.startswith("dlm")):
- dlmLockspaces.append(line.split()[2])
+ if (len(lines) > 0):
+ if (lines[0].startswith("type")):
+ # Then running cman-2.0
+ for line in lines:
+ if (line.startswith("dlm")):
+ dlmLockspaces.append(line.split()[2])
+ else:
+ # Then running cman-3.0 and uses same sorta output as `dlm_tool ls`.
+ dlmLockspaces = parse_dlm_ls(stdout)
return dlmLockspaces
def getDLMLockspaces():
@@ -713,8 +720,10 @@ def getDLMLockspaces():
"""
message = "Gathering the DLM Lockspace Names."
logging.getLogger(MAIN_LOGGER_NAME).debug(message)
- dlmLockspaces = getDLMToolDLMLockspaces()
+ dlmLockspaces = parse_dlm_ls(runCommandOutput("dlm_tool", ["ls"]))
if (not len(dlmLockspaces) > 0):
+ message = "There was no dlm lockspaces found with the \"dlm_tool ls\" command. Trying with the \"group_tool ls\" command."
+ logging.getLogger(MAIN_LOGGER_NAME).debug(message)
dlmLockspaces = getGroupToolDLMLockspaces()
return dlmLockspaces
More information about the cluster-commits
mailing list