Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/crm/cib/internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ cib__client_triggers_refresh(const char *name)
"crm_attribute",
"crm_node",
"crm_resource",
"crm_shadow_status",
"crm_ticket",
NULL);
}
Expand Down
4 changes: 2 additions & 2 deletions lib/pacemaker/pcmk_sched_recurring.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
12 changes: 12 additions & 0 deletions tools/crm_shadow.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 }
};

Expand Down