commit pacemaker for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package pacemaker for openSUSE:Factory 
checked in at 2023-12-28 22:55:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pacemaker (Old)
 and      /work/SRC/openSUSE:Factory/.pacemaker.new.28375 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "pacemaker"

Thu Dec 28 22:55:17 2023 rev:153 rq:1135459 version:2.1.7+20231219.0f7f88312

Changes:
--------
--- /work/SRC/openSUSE:Factory/pacemaker/pacemaker.changes      2023-12-07 
19:09:40.745651001 +0100
+++ /work/SRC/openSUSE:Factory/.pacemaker.new.28375/pacemaker.changes   
2023-12-28 22:55:30.509383869 +0100
@@ -1,0 +2,12 @@
+Wed Dec 20 13:44:11 UTC 2023 - Yan Gao <y...@suse.com>
+
+- Update to version 2.1.7+20231219.0f7f88312 (Pacemaker-2.1.7):
+- attrd: Regression in transient attr deletions (gh#ClusterLabs/pacemaker#3283)
+
+-------------------------------------------------------------------
+Mon Dec 11 07:54:29 UTC 2023 - Yan Gao <y...@suse.com>
+
+- Update to version 2.1.6+20231207.80f8a320e (Pacemaker-2.1.7-rc3):
+- agents: handle dampening parameter consistently and correctly
+
+-------------------------------------------------------------------
@@ -143 +155 @@
-- libcrmcommon: wait for reply from appropriate controller commands
+- libcrmcommon: wait for reply from appropriate controller commands 
(rh#2225631, rh#2221084)

Old:
----
  pacemaker-2.1.6+20231205.0f6fbd59f.tar.xz

New:
----
  pacemaker-2.1.7+20231219.0f7f88312.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ pacemaker.spec ++++++
--- /var/tmp/diff_new_pack.jj7eCA/_old  2023-12-28 22:55:31.185408548 +0100
+++ /var/tmp/diff_new_pack.jj7eCA/_new  2023-12-28 22:55:31.185408548 +0100
@@ -129,7 +129,7 @@
 %define with_regression_tests   0
 
 Name:           pacemaker
-Version:        2.1.6+20231205.0f6fbd59f
+Version:        2.1.7+20231219.0f7f88312
 Release:        0
 Summary:        Scalable High-Availability cluster resource manager
 # AGPL-3.0 licensed extra/clustermon.sh is not present in the binary

++++++ _service ++++++
--- /var/tmp/diff_new_pack.jj7eCA/_old  2023-12-28 22:55:31.213409570 +0100
+++ /var/tmp/diff_new_pack.jj7eCA/_new  2023-12-28 22:55:31.217409716 +0100
@@ -8,10 +8,10 @@
     To update to a new release, change "revision" to the desired
     git commit hash and bump "version" if necessary
 
-    <param name="version">2.1.6</param>
+    <param name="version">2.1.7</param>
 -->
-    <param name="versionformat">2.1.6+%cd.%h</param>
-    <param name="revision">0f6fbd59f</param>
+    <param name="versionformat">2.1.7+%cd.%h</param>
+    <param name="revision">Pacemaker-2.1.7</param>
     <param name="changesgenerate">enable</param>
   </service>
 

++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.jj7eCA/_old  2023-12-28 22:55:31.237410446 +0100
+++ /var/tmp/diff_new_pack.jj7eCA/_new  2023-12-28 22:55:31.237410446 +0100
@@ -5,6 +5,6 @@
   </service>
 <service name="tar_scm">
                 <param 
name="url">https://github.com/ClusterLabs/pacemaker.git</param>
-              <param 
name="changesrevision">0f6fbd59fc7d03578e8feccc9b8bdd8811dccf9f</param></service></servicedata>
+              <param 
name="changesrevision">0f7f88312f7a1ccedee60bf768aba79ee13d41e0</param></service></servicedata>
 (No newline at EOF)
 

++++++ pacemaker-2.1.6+20231205.0f6fbd59f.tar.xz -> 
pacemaker-2.1.7+20231219.0f7f88312.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pacemaker-2.1.6+20231205.0f6fbd59f/ChangeLog 
new/pacemaker-2.1.7+20231219.0f7f88312/ChangeLog
--- old/pacemaker-2.1.6+20231205.0f6fbd59f/ChangeLog    2023-12-05 
23:15:56.000000000 +0100
+++ new/pacemaker-2.1.7+20231219.0f7f88312/ChangeLog    2023-12-19 
22:27:44.000000000 +0100
@@ -1,26 +1,18 @@
-* Tue Nov 21 2023 Ken Gaillot <kgail...@redhat.com> Pacemaker-2.1.7-rc2
-- 26 commits with 14 files changed, 119 insertions(+), 46 deletions(-)
-
-- Features added since Pacemaker-2.1.7-rc1
-  + Default of new node-pending-timeout option has been changed to 0
-    to preserve previous behavior
-
-- Fixes since Pacemaker-2.1.7-rc1
-  + build: Allow building with libxml2 2.12.0 and greater
-  + tools: crm_resource --wait will now wait if any actions are pending
-    (previously it would wait only if new actions were planned)
-  + tools: crm_verify --output-as=xml now includes detailed messages
-
-* Mon Oct 30 2023 Ken Gaillot <kgail...@redhat.com> Pacemaker-2.1.7-rc1
-- 1345 commits with 358 files changed, 23622 insertions(+), 17197 deletions(-)
+* Tue Dec 19 2023 Ken Gaillot <kgail...@redhat.com> Pacemaker-2.1.7
+- 1388 commits with 358 files changed, 23771 insertions(+), 17219 deletions(-)
 
 - Features added since Pacemaker-2.1.6
+  + build: allow building with libxml2 2.12.0 and greater
   + CIB: deprecate "ordering" attribute of "resource_set"
-  + CIB: new cluster option "node-pending-timeout" (defaulting to 2 hours) to
-    fence nodes that do not join Pacemaker's controller group within this much
-    time after joining the cluster
+  + CIB: new cluster option "node-pending-timeout" (defaulting to 0, meaning
+    no timeout, to preserve existing behavior) allows fencing of nodes that do
+    not join Pacemaker's controller group within this much time after joining
+    the cluster
   + controller: PCMK_node_start_state now works with Pacemaker Remote nodes
-  + crm_verify: add --quiet option (currently same as default behavior)
+  + tools: crm_verify now supports --quiet option (currently same as default
+    behavior, but in the future, verbose behavior might become the default,
+    so script writers are recommended to explicitly add --quiet if they do not
+    want output)
   + tools: crm_node supports standard --output-as/--output-to arguments
   + tests: CTSlab.py was renamed to cts-lab
 
@@ -32,6 +24,7 @@
   + tools: consider dampening argument when setting values with attrd_updater
     (regression introduced in 2.1.5)
   + tools: wait for reply from crm_node -R (regression introduced in 2.0.5)
+  + agents: handle dampening parameter consistently and correctly
   + CIB: be more strict about ignoring colocation elements without an ID
   + controller: do not check whether watchdog fencing is enabled
     if "stonith-watchdog-timeout" is not configured
@@ -41,7 +34,7 @@
   + controller: wait a second between fencer connection attempts
   + libpacemaker: avoid shuffling clone instances unnecessarily
   + libpacemaker: get bundle container's promotion score from correct node
-  + libpacemaker: role-based colocations now works with bundles
+  + libpacemaker: role-based colocations now work with bundles
   + libpacemaker: clone-node-max now works with cloned groups
   + scheduler: compare anti-colocation dependent negative preferences against
     stickiness
@@ -49,11 +42,14 @@
   + scheduler: avoid fencing a pending node without a name
   + scheduler: properly evaluate rules in action meta-attributes
   + scheduler: properly sort rule-based blocks when overwriting values
+  + tools: crm_resource --wait will now wait if any actions are pending
+    (previously it would wait only if new actions were planned)
+  + tools: crm_verify --output-as=xml now includes detailed messages
   + tools: avoid showing pending nodes as having "<3.15.1" feature set in
     crm_mon
   + tools: fix display of clone descriptions
-  + tools: crm_resource now reports an error rather than time out when trying
-    to restart an unmanaged resource
+  + tools: crm_resource now reports an error rather than timing out when
+    trying to restart an unmanaged resource
   + tools: crm_resource now properly detects which promoted role name to use
     in ban and move constraints
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/pacemaker-2.1.6+20231205.0f6fbd59f/agents/ocf/HealthCPU.in 
new/pacemaker-2.1.7+20231219.0f7f88312/agents/ocf/HealthCPU.in
--- old/pacemaker-2.1.6+20231205.0f6fbd59f/agents/ocf/HealthCPU.in      
2023-12-05 23:15:56.000000000 +0100
+++ new/pacemaker-2.1.7+20231219.0f7f88312/agents/ocf/HealthCPU.in      
2023-12-19 22:27:44.000000000 +0100
@@ -126,16 +126,16 @@
 
         if [ $IDLE -lt ${OCF_RESKEY_red_limit} ] ; then
             # echo "System state RED!"
-            attrd_updater -n "#health-cpu" -B "red" -d ${OCF_RESKEY_dampening}
+            attrd_updater -n "#health-cpu" -B "red" -d 
"${OCF_RESKEY_dampening}"
             return $OCF_SUCCESS
         fi
 
         if [ $IDLE -lt ${OCF_RESKEY_yellow_limit} ] ; then
             # echo "System state yellow."
-            attrd_updater -n "#health-cpu" -B "yellow" -d 
${OCF_RESKEY_dampening}
+            attrd_updater -n "#health-cpu" -B "yellow" -d 
"${OCF_RESKEY_dampening}"
         else
             # echo "System state green."
-            attrd_updater -n "#health-cpu" -B "green" -d 
${OCF_RESKEY_dampening}
+            attrd_updater -n "#health-cpu" -B "green" -d 
"${OCF_RESKEY_dampening}"
         fi
 
         return $OCF_SUCCESS
@@ -145,8 +145,7 @@
 }
 
 healthcpu_reload_agent() {
-    # No action required
-    :;
+    return $OCF_SUCCESS
 }
 
 healthcpu_validate() {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/pacemaker-2.1.6+20231205.0f6fbd59f/agents/ocf/HealthSMART.in 
new/pacemaker-2.1.7+20231219.0f7f88312/agents/ocf/HealthSMART.in
--- old/pacemaker-2.1.6+20231205.0f6fbd59f/agents/ocf/HealthSMART.in    
2023-12-05 23:15:56.000000000 +0100
+++ new/pacemaker-2.1.7+20231219.0f7f88312/agents/ocf/HealthSMART.in    
2023-12-19 22:27:44.000000000 +0100
@@ -139,25 +139,25 @@
 
     if [ $1 -lt ${lower_red_limit} ] ; then
         ocf_log info "Drive ${DRIVE} ${DEVICE} too cold: ${1} C"
-        attrd_updater -n "#health-smart" -U "red" -d "${OCF_RESKEY_dampen}"
+        attrd_updater -n "#health-smart" -B "red" -d "${OCF_RESKEY_dampen}"
         return 1
     fi
 
     if [ $1 -gt ${upper_red_limit} ] ; then
         ocf_log info "Drive ${DRIVE} ${DEVICE} too hot: ${1} C"
-        attrd_updater -n "#health-smart" -U "red" -d "${OCF_RESKEY_dampen}"
+        attrd_updater -n "#health-smart" -B "red" -d "${OCF_RESKEY_dampen}"
         return 1
     fi
 
     if [ $1 -lt ${lower_yellow_limit} ] ; then
         ocf_log info "Drive ${DRIVE} ${DEVICE} quite cold: ${1} C"
-        attrd_updater -n "#health-smart" -U "yellow" -d "${OCF_RESKEY_dampen}"
+        attrd_updater -n "#health-smart" -B "yellow" -d "${OCF_RESKEY_dampen}"
         return 1
     fi
 
     if [ $1 -gt ${upper_yellow_limit} ] ; then
         ocf_log info "Drive ${DRIVE} ${DEVICE} quite hot: ${1} C"
-        attrd_updater -n "#health-smart" -U "yellow" -d "${OCF_RESKEY_dampen}"
+        attrd_updater -n "#health-smart" -B "yellow" -d "${OCF_RESKEY_dampen}"
         return 1
     fi
 }
@@ -244,7 +244,7 @@
 }
 
 HealthSMART_stop() {
-    attrd_updater -D -n "#health-smart" -d "${OCF_RESKEY_dampen}"
+    attrd_updater -D -n "#health-smart"
 
     rm "${OCF_RESKEY_state}"
 
@@ -278,7 +278,7 @@
                 # Check overall S.M.A.R.T. status
                 "${OCF_RESKEY_smartctl}" -d "${DEVICE}" -H ${DRIVE} | grep -q 
"SMART overall-health self-assessment test result: PASSED"
                 if [ $? -ne 0 ]; then
-                    attrd_updater -n "#health-smart" -U "red" -d 
"${OCF_RESKEY_dampen}"
+                    attrd_updater -n "#health-smart" -B "red" -d 
"${OCF_RESKEY_dampen}"
                     return $OCF_SUCCESS
                 fi
 
@@ -290,7 +290,7 @@
             else
                 "${OCF_RESKEY_smartctl}" -H "${DRIVE}" | grep -q "SMART 
overall-health self-assessment test result: PASSED"
                 if [ $? -ne 0 ]; then
-                    attrd_updater -n "#health-smart" -U "red" -d 
"${OCF_RESKEY_dampen}"
+                    attrd_updater -n "#health-smart" -B "red" -d 
"${OCF_RESKEY_dampen}"
                     return $OCF_SUCCESS
                 fi
 
@@ -301,7 +301,7 @@
             fi
         done
 
-        attrd_updater -n "#health-smart" -U "green" -d "${OCF_RESKEY_dampen}"
+        attrd_updater -n "#health-smart" -B "green" -d "${OCF_RESKEY_dampen}"
         return $OCF_SUCCESS
     fi
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/pacemaker-2.1.6+20231205.0f6fbd59f/agents/ocf/ifspeed.in 
new/pacemaker-2.1.7+20231219.0f7f88312/agents/ocf/ifspeed.in
--- old/pacemaker-2.1.6+20231205.0f6fbd59f/agents/ocf/ifspeed.in        
2023-12-05 23:15:56.000000000 +0100
+++ new/pacemaker-2.1.7+20231219.0f7f88312/agents/ocf/ifspeed.in        
2023-12-19 22:27:44.000000000 +0100
@@ -123,7 +123,7 @@
 <content type="integer" default="${OCF_RESKEY_weight_base_default}"/>
 </parameter>
 
-<parameter name="dampen">
+<parameter name="dampen" reloadable="1">
 <longdesc lang="en">
 The time to wait (dampening) for further changes to occur.
 </longdesc>
@@ -147,6 +147,7 @@
 <action name="monitor" depth="0"  timeout="30s" interval="10s"/>
 <action name="meta-data"  timeout="5s" />
 <action name="validate-all"  timeout="30s" depth="0" />
+<action name="reload-agent"  timeout="20s" />
 </actions>
 </resource-agent>
 END
@@ -154,7 +155,7 @@
 
 usage() {
     cat <<END
-Usage: $0 {start|stop|monitor|validate-all|meta-data}
+Usage: $0 {start|stop|monitor|validate-all|meta-data|reload-agent}
 
 Expects to have a fully populated OCF RA-compliant environment set.
 END
@@ -172,7 +173,7 @@
 
 stop() {
     ha_pseudo_resource "${ha_pseudo_resource_name}" stop
-    attrd_updater -D -n "${OCF_RESKEY_name}" -d "${OCF_RESKEY_dampen}" 
${attrd_options}
+    attrd_updater -D -n "${OCF_RESKEY_name}" ${attrd_options}
     return $OCF_SUCCESS
 }
 
@@ -491,11 +492,7 @@
     speed=$( iface_get_speed "${nic}" )
 
     : $(( score = speed * ${OCF_RESKEY_weight_base} / 1000 ))
-    if [ "$__OCF_ACTION" = "start" ] ; then
-        attrd_updater -n "${OCF_RESKEY_name}" -B "${score}" -d 
"${OCF_RESKEY_dampen}" ${attrd_options}
-    else
-        attrd_updater -n "${OCF_RESKEY_name}" -v "${score}" -d 
"${OCF_RESKEY_dampen}" ${attrd_options}
-    fi
+    attrd_updater -n "${OCF_RESKEY_name}" -B "${score}" -d 
"${OCF_RESKEY_dampen}" ${attrd_options}
     rc=$?
     case ${rc} in
         0)
@@ -508,6 +505,10 @@
     return ${rc}
 }
 
+reload_agent() {
+    return $OCF_SUCCESS
+}
+
 case $__OCF_ACTION in
     meta-data)
         meta_data
@@ -542,6 +543,9 @@
     validate-all)
         validate "$OCF_CHECK_LEVEL"
         ;;
+    reload-agent)
+        reload_agent
+        ;;
     *)
         usage
         exit $OCF_ERR_UNIMPLEMENTED
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/pacemaker-2.1.6+20231205.0f6fbd59f/agents/ocf/ping.in 
new/pacemaker-2.1.7+20231219.0f7f88312/agents/ocf/ping.in
--- old/pacemaker-2.1.6+20231205.0f6fbd59f/agents/ocf/ping.in   2023-12-05 
23:15:56.000000000 +0100
+++ new/pacemaker-2.1.7+20231219.0f7f88312/agents/ocf/ping.in   2023-12-19 
22:27:44.000000000 +0100
@@ -178,7 +178,7 @@
 
     rm -f "${OCF_RESKEY_pidfile}"
 
-    attrd_updater -D -n "$OCF_RESKEY_name" -d "$OCF_RESKEY_dampen"
+    attrd_updater -D -n "$OCF_RESKEY_name"
 
     return $OCF_SUCCESS
 }
@@ -237,8 +237,7 @@
 }
 
 ping_reload_agent() {
-    # No action required
-    :;
+    return $OCF_SUCCESS
 }
 
 fping_check() {
@@ -319,11 +318,7 @@
     fi
 
     score=$(expr $active \* $OCF_RESKEY_multiplier)
-    if [ "$__OCF_ACTION" = "start" ] ; then
-        attrd_updater -n "$OCF_RESKEY_name" -B "$score" -d "$OCF_RESKEY_dampen"
-    else
-        attrd_updater -n "$OCF_RESKEY_name" -U "$score" -d "$OCF_RESKEY_dampen"
-    fi
+    attrd_updater -n "$OCF_RESKEY_name" -B "$score" -d "$OCF_RESKEY_dampen"
     rc=$?
     case $rc in
         0) ping_conditional_log debug "Updated $OCF_RESKEY_name = $score" ;;
@@ -423,7 +418,7 @@
 stop)           ping_stop;;
 monitor)        ping_monitor;;
 validate-all)   ping_validate;;
-reload-agent)         ping_reload_agent;;
+reload-agent)   ping_reload_agent;;
 usage|help)     ping_usage
                 exit $OCF_SUCCESS
                 ;;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/pacemaker-2.1.6+20231205.0f6fbd59f/cts/cli/regression.tools.exp 
new/pacemaker-2.1.7+20231219.0f7f88312/cts/cli/regression.tools.exp
--- old/pacemaker-2.1.6+20231205.0f6fbd59f/cts/cli/regression.tools.exp 
2023-12-05 23:15:56.000000000 +0100
+++ new/pacemaker-2.1.7+20231219.0f7f88312/cts/cli/regression.tools.exp 
2023-12-19 22:27:44.000000000 +0100
@@ -7983,12 +7983,10 @@
   <status code="0" message="OK"/>
 </pacemaker-result>
 =#=#=#= End test: Verify a string-supplied valid configuration, outputting as 
xml - OK (0) =#=#=#=
-* Passed: crm_verify     - </cib>'
-* Passed: Verify a string-supplied valid configuration, outputting as xml - 
+* Passed: crm_verify     - Verify a string-supplied valid configuration, 
outputting as xml
 =#=#=#= Begin test: Verbosely verify a string-supplied valid configuration, 
outputting as xml =#=#=#=
 <pacemaker-result api-version="X" request="crm_feature_set=&quot;3.7.1&quot; 
transition-key=&quot;1:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx&quot; 
transition-magic=&quot;0:0;1:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx&quot; 
exit-reason=&quot;&quot; call-id=&quot;1&quot; rc-code=&quot;0&quot; 
op-status=&quot;0&quot; interval=&quot;0&quot; 
last-rc-change=&quot;1613491700&quot; exec-time=&quot;0&quot; 
queue-time=&quot;0&quot; 
op-digest=&quot;f2317cad3d54cec5d7d7aa7d0bf35cf8&quot;/&gt; 
&lt;/lrm_resource&gt; &lt;/lrm_resources&gt; &lt;/lrm&gt; &lt;/node_state&gt; 
&lt;/status&gt; &lt;/cib&gt;' --output-as=xml --verbose">
   <status code="0" message="OK"/>
 </pacemaker-result>
 =#=#=#= End test: Verbosely verify a string-supplied valid configuration, 
outputting as xml - OK (0) =#=#=#=
-* Passed: crm_verify     - </cib>'
-* Passed: Verbosely verify a string-supplied valid configuration, outputting 
as xml - 
+* Passed: crm_verify     - Verbosely verify a string-supplied valid 
configuration, outputting as xml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pacemaker-2.1.6+20231205.0f6fbd59f/cts/cts-cli.in 
new/pacemaker-2.1.7+20231219.0f7f88312/cts/cts-cli.in
--- old/pacemaker-2.1.6+20231205.0f6fbd59f/cts/cts-cli.in       2023-12-05 
23:15:56.000000000 +0100
+++ new/pacemaker-2.1.7+20231219.0f7f88312/cts/cts-cli.in       2023-12-19 
22:27:44.000000000 +0100
@@ -143,7 +143,7 @@
     target=$1; shift
     validate=$1; shift
     cib=$1; shift
-    app=`echo "$cmd" | sed 's/\ .*//'`
+    app=$(echo "$cmd" | head -n 1 | sed 's/\ .*//')
     printf "* Running: $app - $desc\n" 1>&2
 
     printf "=#=#=#= Begin test: $desc =#=#=#=\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/pacemaker-2.1.6+20231205.0f6fbd59f/daemons/attrd/attrd_cib.c 
new/pacemaker-2.1.7+20231219.0f7f88312/daemons/attrd/attrd_cib.c
--- old/pacemaker-2.1.6+20231205.0f6fbd59f/daemons/attrd/attrd_cib.c    
2023-12-05 23:15:56.000000000 +0100
+++ new/pacemaker-2.1.7+20231219.0f7f88312/daemons/attrd/attrd_cib.c    
2023-12-19 22:27:44.000000000 +0100
@@ -373,7 +373,8 @@
 add_unset_attr_update(const attribute_t *attr, const char *attr_id,
                       const char *node_id, const char *set_id)
 {
-    char *xpath = crm_strdup_printf("/" XML_CIB_TAG_STATUS
+    char *xpath = crm_strdup_printf("/" XML_TAG_CIB
+                                    "/" XML_CIB_TAG_STATUS
                                     "/" XML_CIB_TAG_STATE
                                         "[@" XML_ATTR_ID "='%s']"
                                     "/" XML_TAG_TRANSIENT_NODEATTRS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pacemaker-2.1.6+20231205.0f6fbd59f/po/zh_CN.po 
new/pacemaker-2.1.7+20231219.0f7f88312/po/zh_CN.po
--- old/pacemaker-2.1.6+20231205.0f6fbd59f/po/zh_CN.po  2023-12-05 
23:15:56.000000000 +0100
+++ new/pacemaker-2.1.7+20231219.0f7f88312/po/zh_CN.po  2023-12-19 
22:27:44.000000000 +0100
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: Pacemaker 2\n"
 "Report-Msgid-Bugs-To: develop...@clusterlabs.org\n"
-"POT-Creation-Date: 2023-10-25 17:36-0500\n"
+"POT-Creation-Date: 2023-12-05 15:13+0800\n"
 "PO-Revision-Date: 2021-11-08 11:04+0800\n"
 "Last-Translator: Vivi <develop...@clusterlabs.org>\n"
 "Language-Team: CHINESE <wanglu...@uniontech.org>\n"
@@ -234,6 +234,23 @@
 
"如果shutdown-lock为true，并且将此选项设置为非零持续时间，则自从开始shutdown以"
 
"来经过了这么长的时间后，shutdown锁将过期，即使该节点尚未重新åŠ
 å…¥ã€‚"
 
+#: daemons/controld/controld_control.c:683 lib/pengine/common.c:164
+msgid ""
+"How long to wait for a node that has joined the cluster to join the "
+"controller process group"
+msgstr ""
+"等待已加入集群的节点加入控制器进程组的时间"
+
+#: daemons/controld/controld_control.c:685 lib/pengine/common.c:166
+msgid ""
+"Fence nodes that do not join the controller process group within this much "
+"time after joining the cluster, to allow the cluster to continue managing "
+"resources. A value of 0 means never fence pending nodes. Setting the value "
+"to 2h means fence nodes after 2 hours."
+msgstr ""
+"如果节点加入集群后在此时间内不加å…
¥æŽ§åˆ¶å™¨è¿›ç¨‹ç»„，Fence该节点，以便群集继续管理资源。"
+"值为0表示永远不 fence 待定节点。将值设置为2h表示2小时后 
fence 待定节点。"
+
 #: daemons/fenced/pacemaker-fenced.c:536
 msgid "Advanced use only: An alternate parameter to supply instead of 'port'"
 msgstr "仅高级使用：使用替代的参数名，而不是'port'"
@@ -692,12 +709,12 @@
 "fails to start there. When false, the cluster will instead check the "
 "resource's fail count against its migration-threshold."
 msgstr ""
-"当为true，如果资源启动失败，集群将立即禁止节点启动该资源，当为false，群集将æ
 ¹"
+"当为true，如果资源启动失败，集群将立即禁止节点启动该资源，当为false，集群将æ
 ¹"
 "据其迁移阈值来检查资源的失败计数。"
 
 #: lib/pengine/common.c:68
 msgid "Whether the cluster should check for active resources during start-up"
-msgstr "群集是否在启动期间检查运行资源"
+msgstr "集群是否在启动期间检查运行资源"
 
 #: lib/pengine/common.c:99
 msgid ""
@@ -792,19 +809,6 @@
 "加到此延迟。为了安全, 这个延迟应该明显大于 
pcmk_delay_base/max 的最大设置值，"
 "例如两倍。默认情况下，优先级fencing延迟已禁用。"
 
-#: lib/pengine/common.c:165
-msgid ""
-"How long to wait for a node that has joined the cluster to join the "
-"controller process group"
-msgstr ""
-
-#: lib/pengine/common.c:167
-msgid ""
-"Fence nodes that do not join the controller process group within this much "
-"time after joining the cluster, to allow the cluster to continue managing "
-"resources. A value of 0 means never fence pending nodes."
-msgstr ""
-
 #: lib/pengine/common.c:175
 msgid "Maximum time for node-to-node communication"
 msgstr "最大节点间通信时间"
@@ -845,7 +849,7 @@
 #: lib/pengine/common.c:203
 #, fuzzy
 msgid "Whether the cluster should stop all active resources"
-msgstr "群集是否在启动期间检查运行资源"
+msgstr "集群是否在启动期间检查运行资源"
 
 #: lib/pengine/common.c:209
 msgid "Whether to stop resources that were removed from the configuration"
@@ -923,7 +927,7 @@
 #: lib/pengine/common.c:289
 #, fuzzy
 msgid "How the cluster should allocate resources to nodes"
-msgstr "群集应该如何分配资源到节点"
+msgstr "集群应该如何分配资源到节点"
 
 #: tools/crm_resource.c:258
 #, c-format
@@ -961,127 +965,132 @@
 msgid "Could not get modified CIB: %s\n"
 msgstr "无法获得修改的CIB：%s\n"
 
-#: tools/crm_resource.c:1130
-msgid "You need to specify a resource type with -t"
-msgstr "需要使用-t指定资源类型"
-
-#: tools/crm_resource.c:1197
+#: tools/crm_resource.c:1174
 #, c-format
 msgid "No cluster connection to Pacemaker Remote node %s detected"
 msgstr "未检测到至pacemaker远程节点%s的集群连接"
 
-#: tools/crm_resource.c:1258
+#: tools/crm_resource.c:1235
 msgid "Must specify -t with resource type"
 msgstr "需要使用-t指定资源类型"
 
-#: tools/crm_resource.c:1264
+#: tools/crm_resource.c:1241
 msgid "Must supply -v with new value"
 msgstr "必须使用-v指定新值"
 
-#: tools/crm_resource.c:1296
+#: tools/crm_resource.c:1273
 msgid "Could not create executor connection"
 msgstr "无法创建到pacemaker-execd守护进程的连接"
 
-#: tools/crm_resource.c:1321
+#: tools/crm_resource.c:1298
 #, fuzzy, c-format
 msgid "Metadata query for %s failed: %s"
 msgstr "，查询%s的元数据失败: %s\n"
 
-#: tools/crm_resource.c:1327
+#: tools/crm_resource.c:1304
 #, c-format
 msgid "'%s' is not a valid agent specification"
 msgstr "'%s' 是一个无效的代理"
 
-#: tools/crm_resource.c:1340
+#: tools/crm_resource.c:1317
 msgid "--resource cannot be used with --class, --agent, and --provider"
 msgstr "--resource 不能与 --class, --agent, --provider一起使用"
 
-#: tools/crm_resource.c:1345
+#: tools/crm_resource.c:1322
 msgid ""
 "--class, --agent, and --provider can only be used with --validate and --"
 "force-*"
 msgstr "--class, --agent和--provider只能被用于--validate和--force-*"
 
-#: tools/crm_resource.c:1354
+#: tools/crm_resource.c:1331
 msgid "stonith does not support providers"
 msgstr "stonith 不支持提供者"
 
-#: tools/crm_resource.c:1358
+#: tools/crm_resource.c:1335
 #, c-format
 msgid "%s is not a known stonith agent"
 msgstr "%s 不是一个已知stonith代理"
 
-#: tools/crm_resource.c:1363
+#: tools/crm_resource.c:1340
 #, c-format
 msgid "%s:%s:%s is not a known resource"
 msgstr "%s:%s:%s 不是一个已知资源"
 
-#: tools/crm_resource.c:1477
+#: tools/crm_resource.c:1454
 #, c-format
 msgid "Error creating output format %s: %s"
 msgstr "创建输出格式错误 %s:%s"
 
-#: tools/crm_resource.c:1504
+#: tools/crm_resource.c:1481
 msgid "--expired requires --clear or -U"
 msgstr "--expired需要和--clear或-U一起使用"
 
-#: tools/crm_resource.c:1521
+#: tools/crm_resource.c:1498
 #, c-format
 msgid "Error parsing '%s' as a name=value pair"
 msgstr "'%s'解析错误，格式为name=value"
 
-#: tools/crm_resource.c:1618
+#: tools/crm_resource.c:1595
 msgid "Must supply a resource id with -r"
 msgstr "必须使用-r指定资源id"
 
-#: tools/crm_resource.c:1624
+#: tools/crm_resource.c:1601
 msgid "Must supply a node name with -N"
 msgstr "必须使用-N指定节点名称"
 
-#: tools/crm_resource.c:1642
+#: tools/crm_resource.c:1619
 msgid "Could not create CIB connection"
 msgstr "无法创建到CIB的连接"
 
-#: tools/crm_resource.c:1650
+#: tools/crm_resource.c:1627
 #, c-format
 msgid "Could not connect to the CIB: %s"
 msgstr "不能连接到CIB：%s"
 
-#: tools/crm_resource.c:1671
+#: tools/crm_resource.c:1648
 #, c-format
 msgid "Resource '%s' not found"
 msgstr "没有发现'%s'资源"
 
-#: tools/crm_resource.c:1683
+#: tools/crm_resource.c:1660
 #, c-format
 msgid "Cannot operate on clone resource instance '%s'"
 msgstr "不能操作克隆资源实例'%s'"
 
-#: tools/crm_resource.c:1695
+#: tools/crm_resource.c:1672
 #, c-format
 msgid "Node '%s' not found"
 msgstr "没有发现%s节点"
 
-#: tools/crm_resource.c:1706
+#: tools/crm_resource.c:1683
 #, c-format
 msgid "Error connecting to the controller: %s"
 msgstr "连接到控制器错误：%s"
 
-#: tools/crm_resource.c:1715
+#: tools/crm_resource.c:1692
 #, fuzzy, c-format
 msgid "Error connecting to %s: %s"
 msgstr "连接到控制器错误：%s"
 
-#: tools/crm_resource.c:1973
+#: tools/crm_resource.c:1950
 msgid "You need to supply a value with the -v option"
 msgstr "需要使用-v选项提供一个值"
 
-#: tools/crm_resource.c:2028
+#: tools/crm_resource.c:2006
+msgid "You need to specify a resource type with -t"
+msgstr "需要使用-t指定资源类型"
+
+#: tools/crm_resource.c:2013
+#, fuzzy, c-format
+msgid "Could not delete resource %s: %s"
+msgstr "无法删除资源：%s：%s"
+
+#: tools/crm_resource.c:2023
 #, c-format
 msgid "Unimplemented command: %d"
 msgstr "无效的命令：%d"
 
-#: tools/crm_resource.c:2058
+#: tools/crm_resource.c:2053
 #, c-format
 msgid "Error performing operation: %s"
 msgstr "执行操作错误：%s"