File pacemaker-libpe_status-use-default-timeout-rath... of Package pacemaker.16959

Overview Repositories Revisions Requests Users Attributes Meta

File pacemaker-libpe_status-use-default-timeout-rather-than-0-if-timeout-spec-is-bad.patch of Package pacemaker.16959

commit f82572e7faef42d3ef0728be76187a66e2cd4962
Author: Ken Gaillot <kgaillot@redhat.com>
Date:   Wed Mar 7 09:57:03 2018 -0600

Low: libpe_status: use default timeout rather than 0 if timeout spec is bad

Index: pacemaker-1.1.18+20180406.19c7be5c7/lib/pengine/utils.c
===================================================================
--- pacemaker-1.1.18+20180406.19c7be5c7.orig/lib/pengine/utils.c
+++ pacemaker-1.1.18+20180406.19c7be5c7/lib/pengine/utils.c
@@ -816,13 +816,9 @@ unpack_timeout(const char *value, action
         }
     }
 
-    if (value == NULL) {
-        value = CRM_DEFAULT_OP_TIMEOUT_S;
-    }
-
     timeout = crm_get_msec(value);
     if (timeout < 0) {
-        timeout = 0;
+        timeout = crm_get_msec(CRM_DEFAULT_OP_TIMEOUT_S);
     }
 
     return timeout;
@@ -854,15 +850,13 @@ pe_get_configured_timeout(resource_t *rs
         timeout = pe_pref(data_set->config_hash, "default-action-timeout");
     }
 
-    if (timeout == NULL) {
-        timeout = CRM_DEFAULT_OP_TIMEOUT_S;
-    }
+    // @TODO check meta-attributes (including versioned meta-attributes)
+    // @TODO maybe use min-interval monitor timeout as default for monitors
 
     timeout_ms = crm_get_msec(timeout);
     if (timeout_ms < 0) {
-        timeout_ms = 0;
+        timeout_ms = crm_get_msec(CRM_DEFAULT_OP_TIMEOUT_S);
     }
-
     return timeout_ms;
 }

Places

File pacemaker-libpe_status-use-default-timeout-rather-than-0-if-timeout-spec-is-bad.patch of Package pacemaker.16959

Places