From f75bf54a1bf11c847d1b803c91cee428e72a89f7 Mon Sep 17 00:00:00 2001
From: Ken Gaillot <kgaillot@redhat.com>
Date: Mar 09 2021 06:18:46 +0000
Subject: Low: scheduler: don't include timeout in secure digests


... to match what the controller does

---

diff --git a/lib/pengine/pe_digest.c b/lib/pengine/pe_digest.c
index b608f22..f55c896 100644
--- a/lib/pengine/pe_digest.c
+++ b/lib/pengine/pe_digest.c
@@ -247,6 +247,17 @@ calculate_secure_digest(op_digest_cache_t *data, pe_resource_t *rsc,
                                        NULL);
     }
     pcmk__filter_op_for_digest(data->params_secure);
+
+    /* CRM_meta_timeout *should* be part of a digest for recurring operations.
+     * However, currently the controller does not add timeout to secure digests,
+     * because it only includes parameters declared by the resource agent.
+     * Remove any timeout that made it this far, to match.
+     *
+     * @TODO Update the controller to add the timeout (which will require
+     * bumping the feature set and checking that here).
+     */
+    xml_remove_prop(data->params_secure, CRM_META "_" XML_ATTR_TIMEOUT);
+
     data->digest_secure_calc = calculate_operation_digest(data->params_secure,
                                                           op_version);
 }