Attachment 909605 Details for Bug 1107612 – proposed fix 2/2

[patch] proposed fix 2/2

0002-Fixed-finding-the-cloned-resource-in-clone.patch (text/plain), 2.79 KB, created by Tomas Jelinek on 2014-06-17 14:10:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomas Jelinek

Created: 2014-06-17 14:10:35 UTC

Size: 2.79 KB

patch

obsolete

>From 552f1e76b9a5360518c7a832379c13fb20f80bd9 Mon Sep 17 00:00:00 2001
>From: Tomas Jelinek <tojeline@redhat.com>
>Date: Tue, 17 Jun 2014 10:40:24 +0200
>Subject: [PATCH 2/2] Fixed finding the cloned resource in clone
>
>utils.get_clone_ms_resource replaced with
>utils.dom_get_clone_ms_resource which is able to return the cloned
>resource properly no matter if it is primitive or group
>---
> pcs/resource.py | 14 ++++++++------
> pcs/utils.py    | 16 ----------------
> 2 files changed, 8 insertions(+), 22 deletions(-)
>
>diff --git a/pcs/resource.py b/pcs/resource.py
>index 013f732..770244c 100644
>--- a/pcs/resource.py
>+++ b/pcs/resource.py
>@@ -1609,13 +1609,15 @@ def resource_force_start(argv):
>         group_resources = utils.get_group_children(resource)
>         utils.err("unable to debug-start a group, try one of the group's resource(s) (%s)" % ",".join(group_resources))
> 
>-    if utils.is_clone(resource):
>-        clone_resource = utils.get_clone_ms_resource(resource)
>-        utils.err("unable to debug-start a clone, try the clone's resource: %s" % clone_resource)
>+    dom = utils.get_cib_dom()
>+
>+    if utils.dom_get_clone(dom, resource):
>+        clone_resource = utils.dom_get_clone_ms_resource(dom, resource)
>+        utils.err("unable to debug-start a clone, try the clone's resource: %s" % clone_resource.getAttribute("id"))
> 
>-    if utils.is_master(resource):
>-        master_resource = utils.get_clone_ms_resource(resource,True)
>-        utils.err("unable to debug-start a master, try the master's resource: %s" % master_resource)
>+    if utils.dom_get_master(dom, resource):
>+        master_resource = utils.dom_get_clone_ms_resource(dom, resource)
>+        utils.err("unable to debug-start a master, try the master's resource: %s" % master_resource.getAttribute("id"))
> 
>     args = ["crm_resource", "-r", resource, "--force-start"]
>     if "--full" in utils.pcs_options:
>diff --git a/pcs/utils.py b/pcs/utils.py
>index ecf3ad4..cff1999 100644
>--- a/pcs/utils.py
>+++ b/pcs/utils.py
>@@ -639,22 +639,6 @@ def get_group_children(group_id):
>                     child_resources.append(child.getAttribute("id"))
>     return child_resources
> 
>-# deprecated, use dom_get_clone_ms_resource
>-def get_clone_ms_resource(clone_id,master=False):
>-    dom = get_cib_dom()
>-    if master:
>-        clones = dom.getElementsByTagName("master")
>-    else:
>-        clones = dom.getElementsByTagName("clone")
>-    for c in clones:
>-        if c.getAttribute("id") == clone_id:
>-            for child in c.childNodes:
>-                if (child.nodeType != xml.dom.minidom.Node.ELEMENT_NODE):
>-                    continue
>-                if child.tagName == "primitive":
>-                    return child.getAttribute("id")
>-    return ""
>-
> def dom_get_clone_ms_resource(dom, clone_ms_id):
>     clone_ms = (
>         dom_get_clone(dom, clone_ms_id)
>-- 
>1.9.1
>

Actions: View | Diff

Attachments on bug 1107612: 909604 | 909605