From 8907bd2c5bb56f6916ad514684de5428619a0689 Mon Sep 17 00:00:00 2001 From: Klaus Wenninger Date: Thu, 7 May 2026 14:40:38 +0200 Subject: [PATCH 1/2] low: pcmk_sched_recurring: don't trigger unfencing when rescheduling a recurring action --- lib/pacemaker/pcmk_sched_recurring.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/pacemaker/pcmk_sched_recurring.c b/lib/pacemaker/pcmk_sched_recurring.c index 0714918f411..2252f814503 100644 --- a/lib/pacemaker/pcmk_sched_recurring.c +++ b/lib/pacemaker/pcmk_sched_recurring.c @@ -727,8 +727,8 @@ pcmk__reschedule_recurring(pcmk_resource_t *rsc, const char *task, { pcmk_action_t *op = NULL; - trigger_unfencing(rsc, node, "Device parameters changed (reschedule)", - NULL, rsc->priv->scheduler); + // trigger_unfencing(rsc, node, "Device parameters changed (reschedule)", + // NULL, rsc->priv->scheduler); op = custom_action(rsc, pcmk__op_key(rsc->id, task, interval_ms), task, node, TRUE, rsc->priv->scheduler); pcmk__set_action_flags(op, pcmk__action_reschedule); From 62b194c82fc8e222d3f9818a917e1f232fd59934 Mon Sep 17 00:00:00 2001 From: Klaus Wenninger Date: Tue, 19 May 2026 18:53:18 +0200 Subject: [PATCH 2/2] low: crm_shadow: allow to commit a CIB including status-section --- include/crm/cib/internal.h | 1 + tools/crm_shadow.c | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/include/crm/cib/internal.h b/include/crm/cib/internal.h index 63b5eda8a6e..57f640d87f5 100644 --- a/include/crm/cib/internal.h +++ b/include/crm/cib/internal.h @@ -182,6 +182,7 @@ cib__client_triggers_refresh(const char *name) "crm_attribute", "crm_node", "crm_resource", + "crm_shadow_status", "crm_ticket", NULL); } diff --git a/tools/crm_shadow.c b/tools/crm_shadow.c index 890994815de..e04be604cbd 100644 --- a/tools/crm_shadow.c +++ b/tools/crm_shadow.c @@ -77,6 +77,7 @@ static struct { gboolean force; gboolean batch; gboolean full_upload; + gboolean update_status; gchar *validate_with; } options = { .cmd_options = cib_sync_call, @@ -679,6 +680,12 @@ commit_shadow_file(GError **error) return; } + if (options.update_status) { + options.full_upload = TRUE; + free(crm_system_name); + crm_system_name = strdup("crm_shadow_status"); + } + filename = get_shadow_file(options.instance); if (check_file_exists(filename, true, error) != pcmk_rc_ok) { goto done; @@ -1139,6 +1146,11 @@ static GOptionEntry addl_entries[] = { &options.validate_with, "(Advanced) Create an older configuration version", NULL }, + { "update-status", 'u', G_OPTION_FLAG_NONE, G_OPTION_ARG_NONE, + &options.update_status, + "(Advanced) Upload entire CIB with --commit, without triggering a " + "controller refresh", NULL }, + { NULL } };