Attachment 893243 Details for Bug 1094812 – Proposed fix

[patch] Proposed fix

0001-Fix-pcs-status-nodes-corosync-on-RHEL6.patch (text/plain), 1.92 KB, created by Tomas Jelinek on 2014-05-07 12:25:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomas Jelinek

Created: 2014-05-07 12:25:49 UTC

Size: 1.92 KB

patch

obsolete

>From e070ae644bd88eac9ed37b5d80b035d880a33ce5 Mon Sep 17 00:00:00 2001
>From: Tomas Jelinek <tojeline@redhat.com>
>Date: Wed, 7 May 2014 13:14:07 +0200
>Subject: [PATCH] Fix 'pcs status nodes corosync' on RHEL6
>
>---
> pcs/utils.py | 20 +++++++++++++++++++-
> 1 file changed, 19 insertions(+), 1 deletion(-)
>
>diff --git a/pcs/utils.py b/pcs/utils.py
>index b2de9a9..4e04879 100644
>--- a/pcs/utils.py
>+++ b/pcs/utils.py
>@@ -273,6 +273,13 @@ def sendHTTPRequest(host, request, data = None, printResult = True, printSuccess
>         return (2,"Unable to connect to %s (%s)" % (host, e.reason))
> 
> def getNodesFromCorosyncConf():
>+    if is_rhel6():
>+        dom = parse(settings.cluster_conf_file)
>+        return [
>+            node_el.getAttribute("name")
>+            for node_el in dom.getElementsByTagName("clusternode")
>+        ]
>+
>     nodes = []
>     lines = getCorosyncConf().strip().split('\n')
>     preg = re.compile(r'.*ring0_addr: (.*)')
>@@ -316,6 +323,17 @@ def reloadCorosync():
>     return output, retval
> 
> def getCorosyncActiveNodes():
>+    if is_rhel6():
>+        output, retval = run(["cman_tool", "nodes", "-F", "type,name"])
>+        if retval != 0:
>+            return []
>+        nodestatus_re = re.compile(r"^(.)\s+([^\s]+)\s*$", re.M)
>+        return [
>+            node_name
>+            for node_status, node_name in nodestatus_re.findall(output)
>+                if node_status == "M"
>+        ]
>+
>     args = ["corosync-cmapctl"]
>     nodes = []
>     output,retval = run(args)
>@@ -536,7 +554,7 @@ def run(args, ignore_stderr=False, string_for_stdin=None):
>                 err("Unable to write to file: " + filename)
> 
>     command = args[0]
>-    if command[0:3] == "crm" or command == "cibadmin":
>+    if command[0:3] == "crm" or command == "cibadmin" or command == "cman_tool":
>         args[0] = settings.pacemaker_binaries + command
>     if command[0:8] == "corosync":
>         args[0] = settings.corosync_binaries + command
>-- 
>1.9.1
>

Actions: View | Diff

Attachments on bug 1094812: 893243