* [Cluster-devel] [PATCH] gfs2_lockcapture: Fix condition where dlm lockspaces parsing failed
@ 2015-09-11 14:59 sbradley
2015-09-16 10:56 ` Andrew Price
0 siblings, 1 reply; 2+ messages in thread
From: sbradley @ 2015-09-11 14:59 UTC (permalink / raw)
To: cluster-devel.redhat.com
From: Shane Bradley <sbradley@redhat.com>
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@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
--
1.7.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Cluster-devel] [PATCH] gfs2_lockcapture: Fix condition where dlm lockspaces parsing failed
2015-09-11 14:59 [Cluster-devel] [PATCH] gfs2_lockcapture: Fix condition where dlm lockspaces parsing failed sbradley
@ 2015-09-16 10:56 ` Andrew Price
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Price @ 2015-09-16 10:56 UTC (permalink / raw)
To: cluster-devel.redhat.com
On 11/09/15 15:59, sbradley at redhat.com wrote:
> From: Shane Bradley <sbradley@redhat.com>
>
> 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@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
Not 0.10?
> @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
>
>
Coding style aside, the patch looks fine to me.
Cheers,
Andy
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-09-16 10:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-11 14:59 [Cluster-devel] [PATCH] gfs2_lockcapture: Fix condition where dlm lockspaces parsing failed sbradley
2015-09-16 10:56 ` Andrew Price
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).