Attachment 867511 Details for Bug 1037423 – Updated patch

[patch] Updated patch

crmmon-clone_printmaster.patch (text/plain), 3.43 KB, created by Christine Caulfield on 2014-02-25 16:18:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christine Caulfield

Created: 2014-02-25 16:18:38 UTC

Size: 3.43 KB

patch

obsolete

>diff --git a/include/crm/pengine/common.h b/include/crm/pengine/common.h
>index acd806a..33acc6e 100644
>--- a/include/crm/pengine/common.h
>+++ b/include/crm/pengine/common.h
>@@ -99,6 +99,7 @@ enum pe_print_options {
> 	pe_print_xml		= 0x0400,
> 	pe_print_brief		= 0x0800,
> 	pe_print_pending	= 0x1000,
>+        pe_print_clone_details  = 0x2000,
> };
> /* *INDENT-ON* */
> 
>diff --git a/lib/pengine/clone.c b/lib/pengine/clone.c
>index c6c69e6..10aec2a 100644
>--- a/lib/pengine/clone.c
>+++ b/lib/pengine/clone.c
>@@ -427,6 +427,9 @@ clone_print(resource_t * rsc, const char *pre_text, long options, void *print_da
>         gboolean print_full = FALSE;
>         resource_t *child_rsc = (resource_t *) gIter->data;
> 
>+        if (options & pe_print_clone_details)
>+            print_full = TRUE;
>+
>         if (child_rsc->fns->active(child_rsc, FALSE) == FALSE) {
>             /* Inactive clone */
>             if (is_set(child_rsc->flags, pe_rsc_orphan)) {
>diff --git a/tools/crm_mon.c b/tools/crm_mon.c
>index 2aff78d..c6cbf47 100644
>--- a/tools/crm_mon.c
>+++ b/tools/crm_mon.c
>@@ -98,6 +98,7 @@ gboolean watch_fencing = FALSE;
> gboolean hide_headers = FALSE;
> gboolean print_brief = FALSE;
> gboolean print_pending = FALSE;
>+gboolean print_clone_detail = FALSE;
> 
> /* FIXME allow, detect, and correctly interpret glob pattern or regex? */
> const char *print_neg_location_prefix;
>@@ -342,6 +343,7 @@ static struct crm_option long_options[] = {
>     {"neg-locations",  2, 0, 'L', "Display negative location constraints [optionally filtered by id prefix]"},
>     {"show-node-attributes", 0, 0, 'A', "Display node attributes" },
>     {"hide-headers",   0, 0, 'D', "\tHide all headers" },
>+    {"show-detail",    0, 0, 'R', "\tShow more details of cloned resources" },
>     {"brief",          0, 0, 'b', "\t\tBrief output" },
>     {"pending",        0, 0, 'j', "\t\tDisplay pending state if 'record-pending' is enabled" },
> 
>@@ -428,6 +430,9 @@ detect_user_input(GIOChannel *channel, GIOCondition condition, gpointer unused)
>             case 'r':
>                 inactive_resources = ! inactive_resources;
>                 break;
>+            case 'R':
>+                print_clone_detail = ! print_clone_detail;
>+		break;
>             case 't':
>                 print_timing = ! print_timing;
>                 if (print_timing)
>@@ -482,6 +487,7 @@ detect_user_input(GIOChannel *channel, GIOCondition condition, gpointer unused)
>         print_as("%c A: \t%s\n", print_nodes_attr ? '*': ' ', get_option_desc('A'));
>         print_as("%c L: \t%s\n", print_neg_location_prefix ? '*': ' ', get_option_desc('L'));
>         print_as("%c D: \t%s\n", hide_headers ? '*': ' ', get_option_desc('D'));
>+        print_as("%c R: \t%s\n", print_clone_detail ? '*': ' ', get_option_desc('R'));
>         print_as("%c b: \t%s\n", print_brief ? '*': ' ', get_option_desc('b'));
>         print_as("%c j: \t%s\n", print_pending ? '*': ' ', get_option_desc('j'));
>         print_as("\n");
>@@ -571,6 +577,9 @@ main(int argc, char **argv)
>             case 'j':
>                 print_pending = TRUE;
>                 break;
>+            case 'R':
>+                print_clone_detail = TRUE;
>+                break;
>             case 'c':
>                 print_tickets = TRUE;
>                 break;
>@@ -1182,6 +1191,10 @@ print_status(pe_working_set_t * data_set)
>         print_opts |= pe_print_pending;
>     }
> 
>+    if (print_clone_detail) {
>+        print_opts |= pe_print_clone_details;
>+    }
>+
>     updates++;
>     dc = data_set->dc_node;
>

Actions: View | Diff

Attachments on bug 1037423: 867511