diff --git a/_service b/_service index 4b4d896..a37d8b1 100644 --- a/_service +++ b/_service @@ -8,10 +8,10 @@ To update to a new release, change "revision" to the desired git commit hash and bump "version" if necessary - 2.0.4 + 2.0.5 --> - 2.0.4+%cd.%h - master + 2.0.5+%cd.%h + Pacemaker-2.0.5 enable diff --git a/_servicedata b/_servicedata index 3a573b9..60b7298 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ git://github.com/ClusterLabs/pacemaker.git - dfc2df5b2a1fa9a8c48bfa45726f8efdc0758434 + ba59be71228fed04f78ab374dfac748d314d0e89 \ No newline at end of file diff --git a/bug-728579_pacemaker-stonith-dev-id.patch b/bug-728579_pacemaker-stonith-dev-id.patch index 7fd7d80..4cd5e36 100644 --- a/bug-728579_pacemaker-stonith-dev-id.patch +++ b/bug-728579_pacemaker-stonith-dev-id.patch @@ -4,11 +4,11 @@ Date: Thu Sep 6 15:14:58 2012 +0800 Medium: stonith: Expose IDs of stonith resources to stonith agents through "$CRM_meta_st_device_id" environment variable -Index: pacemaker-2.0.3+20200127.cdf84f849/daemons/fenced/fenced_commands.c +Index: pacemaker-2.0.4+20201012.0cc17c01e/daemons/fenced/fenced_commands.c =================================================================== ---- pacemaker-2.0.3+20200127.cdf84f849.orig/daemons/fenced/fenced_commands.c -+++ pacemaker-2.0.3+20200127.cdf84f849/daemons/fenced/fenced_commands.c -@@ -901,6 +901,7 @@ build_device_from_xml(xmlNode * msg) +--- pacemaker-2.0.4+20201012.0cc17c01e.orig/daemons/fenced/fenced_commands.c ++++ pacemaker-2.0.4+20201012.0cc17c01e/daemons/fenced/fenced_commands.c +@@ -931,6 +931,7 @@ build_device_from_xml(xmlNode * msg) device->id, device->on_target_actions); } @@ -16,11 +16,11 @@ Index: pacemaker-2.0.3+20200127.cdf84f849/daemons/fenced/fenced_commands.c device->work = mainloop_add_trigger(G_PRIORITY_HIGH, stonith_device_dispatch, device); /* TODO: Hook up priority */ -Index: pacemaker-2.0.3+20200127.cdf84f849/lib/fencing/st_client.c +Index: pacemaker-2.0.4+20201012.0cc17c01e/lib/fencing/st_client.c =================================================================== ---- pacemaker-2.0.3+20200127.cdf84f849.orig/lib/fencing/st_client.c -+++ pacemaker-2.0.3+20200127.cdf84f849/lib/fencing/st_client.c -@@ -38,6 +38,7 @@ struct stonith_action_s { +--- pacemaker-2.0.4+20201012.0cc17c01e.orig/lib/fencing/st_client.c ++++ pacemaker-2.0.4+20201012.0cc17c01e/lib/fencing/st_client.c +@@ -39,6 +39,7 @@ struct stonith_action_s { char *action; char *victim; GHashTable *args; @@ -28,7 +28,7 @@ Index: pacemaker-2.0.3+20200127.cdf84f849/lib/fencing/st_client.c int timeout; int async; void *userdata; -@@ -596,6 +597,7 @@ stonith__destroy_action(stonith_action_t +@@ -593,6 +594,7 @@ stonith__destroy_action(stonith_action_t } free(action->output); free(action->error); @@ -36,7 +36,7 @@ Index: pacemaker-2.0.3+20200127.cdf84f849/lib/fencing/st_client.c free(action); } } -@@ -665,6 +667,8 @@ stonith_action_create(const char *agent, +@@ -664,6 +666,8 @@ stonith_action_create(const char *agent, if (device_args) { char buffer[512]; const char *value = NULL; @@ -45,7 +45,7 @@ Index: pacemaker-2.0.3+20200127.cdf84f849/lib/fencing/st_client.c snprintf(buffer, sizeof(buffer), "pcmk_%s_retries", _action); value = g_hash_table_lookup(device_args, buffer); -@@ -672,6 +676,11 @@ stonith_action_create(const char *agent, +@@ -671,6 +675,11 @@ stonith_action_create(const char *agent, if (value) { action->max_retries = atoi(value); } @@ -57,9 +57,9 @@ Index: pacemaker-2.0.3+20200127.cdf84f849/lib/fencing/st_client.c } return action; -@@ -809,6 +818,10 @@ internal_stonith_action_execute(stonith_ - svc_action->cb_data = (void *) action; - set_bit(svc_action->flags, SVC_ACTION_NON_BLOCKED); +@@ -812,6 +821,10 @@ internal_stonith_action_execute(stonith_ + SVC_ACTION_NON_BLOCKED, + "SVC_ACTION_NON_BLOCKED"); + if (action->dev_id) { + svc_action->rsc = strdup(action->dev_id); @@ -68,10 +68,10 @@ Index: pacemaker-2.0.3+20200127.cdf84f849/lib/fencing/st_client.c /* keep retries from executing out of control and free previous results */ if (is_retry) { free(action->output); -Index: pacemaker-2.0.3+20200127.cdf84f849/lib/services/services_linux.c +Index: pacemaker-2.0.4+20201012.0cc17c01e/lib/services/services_linux.c =================================================================== ---- pacemaker-2.0.3+20200127.cdf84f849.orig/lib/services/services_linux.c -+++ pacemaker-2.0.3+20200127.cdf84f849/lib/services/services_linux.c +--- pacemaker-2.0.4+20201012.0cc17c01e.orig/lib/services/services_linux.c ++++ pacemaker-2.0.4+20201012.0cc17c01e/lib/services/services_linux.c @@ -28,6 +28,9 @@ #include "crm/common/mainloop.h" #include "crm/services.h" @@ -87,8 +87,8 @@ Index: pacemaker-2.0.3+20200127.cdf84f849/lib/services/services_linux.c { void (*env_setter)(gpointer, gpointer, gpointer) = NULL; + -+ if (safe_str_eq(op->standard, PCMK_RESOURCE_CLASS_STONITH) -+ && safe_str_eq(op->agent, "fence_legacy") ++ if (pcmk__str_eq(op->standard, PCMK_RESOURCE_CLASS_STONITH, pcmk__str_casei) ++ && pcmk__str_eq(op->agent, "fence_legacy", pcmk__str_casei) + && op->rsc != NULL) { + const char *st_dev_id_key = CRM_META "_" F_STONITH_DEVICE; + diff --git a/bug-806256_pacemaker-log-level-notice.patch b/bug-806256_pacemaker-log-level-notice.patch index 2936a57..fb779d1 100644 --- a/bug-806256_pacemaker-log-level-notice.patch +++ b/bug-806256_pacemaker-log-level-notice.patch @@ -4,23 +4,23 @@ Date: Thu Mar 14 09:41:53 2013 +0800 Log: Change some messages to notice level (bnc#806256) -Index: pacemaker-2.0.2+20191023.7a12ccbe4/daemons/controld/controld_membership.c +Index: pacemaker-2.0.4+20200820.09f345c49/daemons/controld/controld_membership.c =================================================================== ---- pacemaker-2.0.2+20191023.7a12ccbe4.orig/daemons/controld/controld_membership.c -+++ pacemaker-2.0.2+20191023.7a12ccbe4/daemons/controld/controld_membership.c -@@ -408,7 +408,7 @@ crm_update_quorum(gboolean quorum, gbool +--- pacemaker-2.0.4+20200820.09f345c49.orig/daemons/controld/controld_membership.c ++++ pacemaker-2.0.4+20200820.09f345c49/daemons/controld/controld_membership.c +@@ -409,7 +409,7 @@ crm_update_quorum(gboolean quorum, gbool crm_xml_add(update, XML_ATTR_DC_UUID, fsa_our_uuid); fsa_cib_update(XML_TAG_CIB, update, call_options, call_id, NULL); -- crm_debug("Updating quorum status to %s (call=%d)", quorum ? "true" : "false", call_id); -+ crm_notice("Updating quorum status to %s (call=%d)", quorum ? "true" : "false", call_id); +- crm_debug("Updating quorum status to %s (call=%d)", ++ crm_notice("Updating quorum status to %s (call=%d)", + pcmk__btoa(quorum), call_id); fsa_register_cib_callback(call_id, FALSE, NULL, cib_quorum_update_complete); free_xml(update); - -Index: pacemaker-2.0.2+20191023.7a12ccbe4/daemons/controld/controld_transition.c +Index: pacemaker-2.0.4+20200820.09f345c49/daemons/controld/controld_transition.c =================================================================== ---- pacemaker-2.0.2+20191023.7a12ccbe4.orig/daemons/controld/controld_transition.c -+++ pacemaker-2.0.2+20191023.7a12ccbe4/daemons/controld/controld_transition.c +--- pacemaker-2.0.4+20200820.09f345c49.orig/daemons/controld/controld_transition.c ++++ pacemaker-2.0.4+20200820.09f345c49/daemons/controld/controld_transition.c @@ -186,7 +186,7 @@ do_te_invoke(long long action, transition_graph = create_blank_graph(); return; @@ -30,11 +30,11 @@ Index: pacemaker-2.0.2+20191023.7a12ccbe4/daemons/controld/controld_transition.c graph_input); te_reset_job_counts(); -Index: pacemaker-2.0.2+20191023.7a12ccbe4/daemons/fenced/fenced_remote.c +Index: pacemaker-2.0.4+20200820.09f345c49/daemons/fenced/fenced_remote.c =================================================================== ---- pacemaker-2.0.2+20191023.7a12ccbe4.orig/daemons/fenced/fenced_remote.c -+++ pacemaker-2.0.2+20191023.7a12ccbe4/daemons/fenced/fenced_remote.c -@@ -595,7 +595,7 @@ remote_op_timeout(gpointer userdata) +--- pacemaker-2.0.4+20200820.09f345c49.orig/daemons/fenced/fenced_remote.c ++++ pacemaker-2.0.4+20200820.09f345c49/daemons/fenced/fenced_remote.c +@@ -609,7 +609,7 @@ remote_op_timeout(gpointer userdata) return FALSE; } diff --git a/bug-943295_pacemaker-lrmd-log-notice.patch b/bug-943295_pacemaker-lrmd-log-notice.patch index 5731c13..b1a2228 100644 --- a/bug-943295_pacemaker-lrmd-log-notice.patch +++ b/bug-943295_pacemaker-lrmd-log-notice.patch @@ -1,8 +1,8 @@ -Index: pacemaker-1.1.18+20180430.c0d7ba798/daemons/execd/execd_commands.c +Index: pacemaker-2.0.4+20200819.114974685/daemons/execd/execd_commands.c =================================================================== ---- pacemaker-1.1.18+20180430.c0d7ba798.orig/daemons/execd/execd_commands.c -+++ pacemaker-1.1.18+20180430.c0d7ba798/daemons/execd/execd_commands.c -@@ -83,7 +83,7 @@ static void +--- pacemaker-2.0.4+20200819.114974685.orig/daemons/execd/execd_commands.c ++++ pacemaker-2.0.4+20200819.114974685/daemons/execd/execd_commands.c +@@ -198,7 +198,7 @@ static void log_finished(lrmd_cmd_t * cmd, int exec_time, int queue_time) { char pid_str[32] = { 0, }; @@ -11,12 +11,12 @@ Index: pacemaker-1.1.18+20180430.c0d7ba798/daemons/execd/execd_commands.c if (cmd->last_pid) { snprintf(pid_str, 32, "%d", cmd->last_pid); -@@ -107,7 +107,7 @@ log_finished(lrmd_cmd_t * cmd, int exec_ +@@ -223,7 +223,7 @@ log_finished(lrmd_cmd_t * cmd, int exec_ static void log_execute(lrmd_cmd_t * cmd) { - int log_level = LOG_INFO; + int log_level = LOG_NOTICE; - if (safe_str_eq(cmd->action, "monitor")) { + if (pcmk__str_eq(cmd->action, "monitor", pcmk__str_casei)) { log_level = LOG_DEBUG; diff --git a/pacemaker-2.0.4+20200702.813fdbfdc.tar.xz b/pacemaker-2.0.4+20200702.813fdbfdc.tar.xz deleted file mode 100644 index f8f5a24..0000000 --- a/pacemaker-2.0.4+20200702.813fdbfdc.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1976bbbb163c63eb17fc4c9878d412ea15973a98deeae252cb184cc1834ea736 -size 3377632 diff --git a/pacemaker-2.0.5+20201202.ba59be712.tar.xz b/pacemaker-2.0.5+20201202.ba59be712.tar.xz new file mode 100644 index 0000000..26bae4d --- /dev/null +++ b/pacemaker-2.0.5+20201202.ba59be712.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b5353e6228ad5c0ecd1a0942ccab94899e83191e0f62814f1f03185e1b86ef4e +size 3439736 diff --git a/pacemaker.changes b/pacemaker.changes index 209a725..d11872c 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,166 @@ +------------------------------------------------------------------- +Sun Dec 06 12:32:29 UTC 2020 - Yan Gao + +- Update to version 2.0.5+20201202.ba59be712 (Pacemaker-2.0.5): +- xml: Revert to correct schema for alerts-3.5 +- tools: match calloc() with free() in crm_resource +- tools: "Connectivity is lost" may not be displayed even if the ping communication is lost. + +------------------------------------------------------------------- +Sun Dec 06 12:22:38 UTC 2020 - Yan Gao + +- Update to version 2.0.4+20201116.ae2c04b54: +- tools: make cibsecret use bash +- fencer: allow peer configuration requests + +------------------------------------------------------------------- +Sun Dec 06 12:12:36 UTC 2020 - Yan Gao + +- Update to version 2.0.4+20201027.31aa4f551: +- pacemakerd: handle shutdown requests better +- daemons,libcrmcommon: send status code with client acks +- fencer: restrict certain IPC requests to privileged users (CVE-2020-25654, bsc#1177916) +- pacemakerd: ignore shutdown requests from unprivileged users (CVE-2020-25654, bsc#1177916) +- pacemakerd: check client for NULL before using it +- executor: restrict certain IPC requests to Pacemaker daemons (CVE-2020-25654, bsc#1177916) +- executor: return appropriate error code when no remote support +- executor: mark controller connections to pacemaker-remoted as privileged +- executor: show CRM_OP_REGISTER rc in debug message + +------------------------------------------------------------------- +Sun Dec 06 11:54:44 UTC 2020 - Yan Gao + +- Update to version 2.0.4+20201022.354625c62: +- tools: revert some changes in crm_resource NULL checks +- xml: Mark new crm_mon attributes as optional. +- scheduler: fix build when DEFAULT_CONCURRENT_FENCING_TRUE is set + +------------------------------------------------------------------- +Sun Dec 06 11:42:57 UTC 2020 - Yan Gao + +- Update to version 2.0.4+20201019.878658661: +- cib: create reply when needed for diff +- cib: only build reply when needed + +------------------------------------------------------------------- +Fri Oct 30 13:45:28 UTC 2020 - Yan Gao + +- Update to version 2.0.4+20201014.b0ef36d82: +- cibsecret: read value to set from input (or stdin) if not specified +- libcrmcommon: Don't leak memory in pcmk__cmdline_preproc. +- tools: Don't leak options.xml_file in crm_simulate. +- tools: Prevent a potential memory problem in crm_resource. +- tools: Use glib for cmdline handling in crmadmin. +- tools: Apply resource filtering to failed actions in crm_mon. +- scheduler: require pre-/post-start notifications correctly +- tools: avoid memory leak if crm_mon --include/--exclude have bad syntax +- pacemakerd: change one message so CTS recognizes it +- libcrmcommon: check controller API object for NULL +- fencer: properly deactivate stonith API callbacks +- controld: Avoiding Broken pipe when shutdown. +- Stateful: add ability to return custom rc saved in state file +- Dummy: add ability to return custom rc saved in state file +- Use effective OCF rc-code to avoid increasing failcount for DEGRADED statuses +- tools: Don't display crm_resource error messages twice. +- Accept PCMK_OCF_DEGRADED and PCMK_OCF_DEGRADED_MASTER status codes +- libcrmservice: avoid dangling reference after DBus memory allocation error +- libcrmservice: avoid double logging an error +- libcrmservice: improve DBus log messages +- fenced: Avoiding Broken pipe when shutdown. +- controld: Avoiding Broken pipe when shutdown. +- attrd: Avoiding Broken pipe when shutdown. +- Dont add OCF_RESKEY_ prefix to OCF_CHECK_LEVEL +- controller: recognize reprobe requests correctly again +- tools: allow crm_resource --option to be specified multiple times again +- tools: only create validate parameters table when needed +- tools: use glib types/free in crm_resource where appropriate to GOption +- xml: Add a new schema version for crm_mon. +- scheduler: Display stop-all-resources in cluster options. +- scheduler: Add management status to group output. (rh#1748139) +- scheduler: Change output for disabled clones. (rh#1748139) +- scheduler: Change output for disabled groups. (rh#1748139) +- scheduler: don't select instance to be promoted on a guest that can't run +- fenced: Set the delegate correctly when fencing fails. +- scheduler: improve messages when creating actions +- libcrmcommon: Warn instead of err in scan_ll() (rh#1874391) +- libcrmcommon: Don't always write out a name attribute. +- scheduler, tools: Add a resource-list message. + +- Rebase: + * bug-728579_pacemaker-stonith-dev-id.patch + +------------------------------------------------------------------- +Fri Oct 30 13:11:41 UTC 2020 - Yan Gao + +- Update to version 2.0.4+20200820.09f345c49: +- controller, Pacemaker Explained: improve the documentation of `stonith-watchdog-timeout` cluster option (bsc#1174696) +- scheduler: improve the documentation of `have-watchdog` cluster option (bsc#1174696) +- libpe_status: downgrade the message about the meaning of `have-watchdog=true` to info (bsc#1174696) + +------------------------------------------------------------------- +Fri Oct 30 13:10:26 UTC 2020 - Yan Gao + +- Update to version 2.0.4+20200820.216d5db57: +- tools: properly detect local node name +- various: improve client flag handling + +-Rebase: + * bug-806256_pacemaker-log-level-notice.patch + * bug-728579_pacemaker-stonith-dev-id.patch + +------------------------------------------------------------------- +Fri Oct 30 11:11:36 UTC 2020 - Yan Gao + +- Update to version 2.0.4+20200819.643f19b71: +- scheduler: update migrate-fail-9 test for migration code change (bsc#1177212) +- scheduler: don't schedule a dangling migration stop if one already occurred (bsc#1177212) + +------------------------------------------------------------------- +Thu Oct 29 10:58:25 UTC 2020 - Yan Gao + +- Update to version 2.0.4+20200819.114974685: +- controld: Log correct timeout for timed-out stonith monitor +- libpe_status: Use pcmk_monitor_timeout as stonith start timeout (rh#1856015) +- crm_mon: Displays completed failed actions as processed. +- libpe_status: Support integer as rule type attribute +- libpe_status: Error-check and expand range of type="number" +- xml: Support integer as rule type attribute +- daemons, lib, tools: Correct comparisons to string functions. +- libcrmcommon: Allow default formatted output message handlers. +- tools: Apply resource filtering to bans. +- tools: Apply resource filtering to --brief option. +- libpe_status: Allow filtering bundled resources. +- libpe_status: Allow filtering cloned resources. +- libpe_status: Allow filtering resource groups. +- libpe_status: Allow filtering primitive resources. +- tools: Add "No active resources" to one case in crm_mon output. +- tools: Allow filtering node history by resource. +- tools: Add --resource= to the crm_mon command line. +- cluster: Close corosync handles when they disconnect (rh#1614166) +- libcrmcommon: Use truly implicit deny for ACLs (rh#1833173) +- libpe_status: Destroy hash table after use +- controld: improve message indicating the RA execution request +- tools: Convert crm_resource to use glib for command line handling. +- Allow logfile perms to be set in sysconfig +- pacemakerd: improve logging when synced with SBD +- pacemakerd: interworking with sbd not using pacemakerd-api +- tools: Add -P to crmadmin to ping via pacemakerd-api +- sbd-integration: sync pacemakerd with sbd +- executor: only send executor notifications to executor clients +- ipc-api: avoid infinite loop when disconnected +- ipc-api: allow calling connect after disconnection +- fencer: don't log assertion if unable to create full request reply +- libcrmcommon: avoid assertion on controller protocol errors +- tools: Add the http-equiv header to crm_mon at the right time. +- tools, libcrmcommon: Reopen the output dest on reset. +- libcrmcommon: Make reset and finish work more similarly. (rh#1857728) +- libcib: Update known_paths +- tools: Update valid scope values for cibadmin --help +- controld: Show action timer plus cluster-delay in action_timer cb (rh#1856035) + +- Rebase: + * bug-943295_pacemaker-lrmd-log-notice.patch + ------------------------------------------------------------------- Tue Aug 25 11:37:48 UTC 2020 - Yan Gao diff --git a/pacemaker.spec b/pacemaker.spec index 3ccdf90..f62506a 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -80,7 +80,7 @@ %define with_regression_tests 0 Name: pacemaker -Version: 2.0.4+20200702.813fdbfdc +Version: 2.0.5+20201202.ba59be712 Release: 0 Summary: Scalable High-Availability cluster resource manager # AGPL-3.0 licensed extra/clustermon.sh is not present in the binary