|
 |
ed0026 |
commit 65e481e7966d5144a0439d16ebb2a9bcffb26506
|
|
|
ed0026 |
Author: Andrew Beekhof <andrew@beekhof.net>
|
|
|
ed0026 |
Date: Wed Aug 7 14:33:26 2013 +1000
|
|
|
ed0026 |
|
|
|
ed0026 |
Log: PE: Better indicate when a resource has failed
|
|
|
ed0026 |
|
|
|
ed0026 |
diff --git a/lib/pengine/native.c b/lib/pengine/native.c
|
|
|
ed0026 |
index c1fe89d..c81a218 100644
|
|
|
ed0026 |
--- a/lib/pengine/native.c
|
|
|
ed0026 |
+++ b/lib/pengine/native.c
|
|
|
ed0026 |
@@ -413,16 +413,20 @@ native_print(resource_t * rsc, const char *pre_text, long options, void *print_d
|
|
|
ed0026 |
if(is_set(rsc->flags, pe_rsc_orphan)) {
|
|
|
ed0026 |
offset += snprintf(buffer + offset, LINE_MAX - offset, " ORPHANED ");
|
|
|
ed0026 |
}
|
|
|
ed0026 |
- offset += snprintf(buffer + offset, LINE_MAX - offset, "%s ", role2text(rsc->role));
|
|
|
ed0026 |
+ if(rsc->role > RSC_ROLE_SLAVE && is_set(rsc->flags, pe_rsc_failed)) {
|
|
|
ed0026 |
+ offset += snprintf(buffer + offset, LINE_MAX - offset, "FAILED %s ", role2text(rsc->role));
|
|
|
ed0026 |
+ } else if(is_set(rsc->flags, pe_rsc_failed)) {
|
|
|
ed0026 |
+ offset += snprintf(buffer + offset, LINE_MAX - offset, "FAILED ");
|
|
|
ed0026 |
+ } else {
|
|
|
ed0026 |
+ offset += snprintf(buffer + offset, LINE_MAX - offset, "%s ", role2text(rsc->role));
|
|
|
ed0026 |
+ }
|
|
|
ed0026 |
+
|
|
|
ed0026 |
if(node) {
|
|
|
ed0026 |
offset += snprintf(buffer + offset, LINE_MAX - offset, "%s ", node->details->uname);
|
|
|
ed0026 |
}
|
|
|
ed0026 |
if(is_not_set(rsc->flags, pe_rsc_managed)) {
|
|
|
ed0026 |
offset += snprintf(buffer + offset, LINE_MAX - offset, "(unmanaged) ");
|
|
|
ed0026 |
}
|
|
|
ed0026 |
- if(is_set(rsc->flags, pe_rsc_failed)) {
|
|
|
ed0026 |
- offset += snprintf(buffer + offset, LINE_MAX - offset, "FAILED ");
|
|
|
ed0026 |
- }
|
|
|
ed0026 |
if(is_set(rsc->flags, pe_rsc_failure_ignored)) {
|
|
|
ed0026 |
offset += snprintf(buffer + offset, LINE_MAX - offset, "(failure ignored)");
|
|
|
ed0026 |
}
|