File bug-977258_pacemaker-crmd-start-delay-action-timeout.patch of Package pacemaker.3577
commit f9be2d92bba9113295ae057b30ba1f115d1af2c2
Author: Gao,Yan <ygao@suse.com>
Date: Fri May 13 12:46:41 2016 +0200
Fix: crmd: Take start-delay into account for the timeout of the action timer
diff --git a/lib/transition/unpack.c b/lib/transition/unpack.c
index c873ebf..7a8c656 100644
--- a/lib/transition/unpack.c
+++ b/lib/transition/unpack.c
@@ -65,6 +65,12 @@ unpack_action(synapse_t * parent, xmlNode * xml_action)
action->timeout = crm_parse_int(value, NULL);
}
+ /* Take start-delay into account for the timeout of the action timer */
+ value = g_hash_table_lookup(action->params, "CRM_meta_start_delay");
+ if (value != NULL) {
+ action->timeout += crm_parse_int(value, NULL);
+ }
+
value = g_hash_table_lookup(action->params, "CRM_meta_interval");
if (value != NULL) {
action->interval = crm_parse_int(value, NULL);