|
 |
60de42 |
From e45670bd14bd2e9b7e108aed647050b69887e312 Mon Sep 17 00:00:00 2001
|
|
|
60de42 |
From: Ken Gaillot <kgaillot@redhat.com>
|
|
|
60de42 |
Date: Thu, 16 Feb 2017 15:04:13 -0600
|
|
|
60de42 |
Subject: [PATCH] Fix: tools: avoid NULL dereference in crm_resource debug
|
|
|
60de42 |
message
|
|
|
60de42 |
|
|
|
60de42 |
Also clarify crm_resource --cleanup help text
|
|
|
60de42 |
---
|
|
|
60de42 |
tools/crm_resource.c | 10 ++++++++--
|
|
|
60de42 |
1 file changed, 8 insertions(+), 2 deletions(-)
|
|
|
60de42 |
|
|
|
60de42 |
diff --git a/tools/crm_resource.c b/tools/crm_resource.c
|
|
|
60de42 |
index c4ee78e..aee2e03 100644
|
|
|
60de42 |
--- a/tools/crm_resource.c
|
|
|
60de42 |
+++ b/tools/crm_resource.c
|
|
|
60de42 |
@@ -128,7 +128,12 @@ static struct crm_option long_options[] = {
|
|
|
60de42 |
{"constraints",0, 0, 'a', "\tDisplay the (co)location constraints that apply to a resource"},
|
|
|
60de42 |
|
|
|
60de42 |
{"-spacer-", 1, 0, '-', "\nCommands:"},
|
|
|
60de42 |
- {"cleanup", 0, 0, 'C', "\t\tDelete the resource history and re-check the current state. Optional: --resource"},
|
|
|
60de42 |
+ {"cleanup", 0, 0, 'C',
|
|
|
60de42 |
+ "\t\tDelete resource's history and re-check its current state. "
|
|
|
60de42 |
+ "Optional: --resource (if not specified, all resources), "
|
|
|
60de42 |
+ "--node (if not specified, all nodes), "
|
|
|
60de42 |
+ "--force (if not specified, resource's group or clone will also be cleaned)"
|
|
|
60de42 |
+ },
|
|
|
60de42 |
{"set-parameter", 1, 0, 'p', "Set the named parameter for a resource. See also -m, --meta"},
|
|
|
60de42 |
{"get-parameter", 1, 0, 'g', "Display the named parameter for a resource. See also -m, --meta"},
|
|
|
60de42 |
{"delete-parameter",1, 0, 'd', "Delete the named parameter for a resource. See also -m, --meta"},
|
|
|
60de42 |
@@ -943,8 +948,9 @@ main(int argc, char **argv)
|
|
|
60de42 |
rsc = uber_parent(rsc);
|
|
|
60de42 |
}
|
|
|
60de42 |
|
|
|
60de42 |
- crm_debug("Re-checking the state of %s for %s on %s", rsc->id, rsc_id, host_uname);
|
|
|
60de42 |
if(rsc) {
|
|
|
60de42 |
+ crm_debug("Re-checking the state of %s (%s requested) on %s",
|
|
|
60de42 |
+ rsc->id, rsc_id, host_uname);
|
|
|
60de42 |
crmd_replies_needed = 0;
|
|
|
60de42 |
rc = cli_resource_delete(cib_conn, crmd_channel, host_uname, rsc, &data_set);
|
|
|
60de42 |
} else {
|
|
|
60de42 |
--
|
|
|
60de42 |
1.8.3.1
|
|
|
60de42 |
|