Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package corosync for openSUSE:Factory checked in at 2021-09-03 21:26:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/corosync (Old) and /work/SRC/openSUSE:Factory/.corosync.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "corosync" Fri Sep 3 21:26:01 2021 rev:73 rq:915027 version:2.4.5+git70.64010f57 Changes: -------- --- /work/SRC/openSUSE:Factory/corosync/corosync.changes 2021-06-12 20:05:23.256650511 +0200 +++ /work/SRC/openSUSE:Factory/.corosync.new.1899/corosync.changes 2021-09-03 21:26:47.146215171 +0200 @@ -1,0 +2,6 @@ +Mon Aug 23 10:02:21 UTC 2021 - vark...@suse.com + +- Update to version 2.4.5+git70.64010f57: + * totem: Add cancel_hold_on_retransmit config option + +------------------------------------------------------------------- Old: ---- corosync-2.4.5+git69.6236728a.tar.bz2 New: ---- corosync-2.4.5+git70.64010f57.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ corosync.spec ++++++ --- /var/tmp/diff_new_pack.rav4Q0/_old 2021-09-03 21:26:47.702215751 +0200 +++ /var/tmp/diff_new_pack.rav4Q0/_new 2021-09-03 21:26:47.706215756 +0200 @@ -47,7 +47,7 @@ Summary: The Corosync Cluster Engine and Application Programming Interfaces License: BSD-3-Clause Group: Productivity/Clustering/HA -Version: 2.4.5+git69.6236728a +Version: 2.4.5+git70.64010f57 Release: 0 URL: http://corosync.github.io/corosync/ Source0: %{name}-%{version}.tar.bz2 ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.rav4Q0/_old 2021-09-03 21:26:47.742215793 +0200 +++ /var/tmp/diff_new_pack.rav4Q0/_new 2021-09-03 21:26:47.746215797 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/corosync/corosync.git</param> - <param name="changesrevision">6236728a6136e3e2ceef2709cda51196b89bc689</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">64010f573801b73222e80821a19140c59b003f5c</param></service></servicedata> \ No newline at end of file ++++++ corosync-2.4.5+git69.6236728a.tar.bz2 -> corosync-2.4.5+git70.64010f57.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/corosync-2.4.5+git69.6236728a/exec/totemconfig.c new/corosync-2.4.5+git70.64010f57/exec/totemconfig.c --- old/corosync-2.4.5+git69.6236728a/exec/totemconfig.c 2021-04-09 11:20:51.000000000 +0200 +++ new/corosync-2.4.5+git70.64010f57/exec/totemconfig.c 2021-08-20 16:56:29.000000000 +0200 @@ -78,6 +78,7 @@ #define RRP_PROBLEM_COUNT_THRESHOLD_MIN 2 #define RRP_AUTORECOVERY_CHECK_TIMEOUT 1000 #define BLOCK_UNLISTED_IPS 1 +#define CANCEL_TOKEN_HOLD_ON_RETRANSMIT 0 #define DEFAULT_PORT 5405 @@ -133,6 +134,8 @@ return &totem_config->miss_count_const; if (strcmp(param_name, "totem.block_unlisted_ips") == 0) return &totem_config->block_unlisted_ips; + if (strcmp(param_name, "totem.cancel_token_hold_on_retransmit") == 0) + return &totem_config->cancel_token_hold_on_retransmit; return NULL; } @@ -293,6 +296,9 @@ totem_volatile_config_set_boolean_value(totem_config, "totem.block_unlisted_ips", deleted_key, BLOCK_UNLISTED_IPS); + + totem_volatile_config_set_boolean_value(totem_config, "totem.cancel_token_hold_on_retransmit", + deleted_key, CANCEL_TOKEN_HOLD_ON_RETRANSMIT); } static int totem_volatile_config_validate ( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/corosync-2.4.5+git69.6236728a/exec/totemsrp.c new/corosync-2.4.5+git70.64010f57/exec/totemsrp.c --- old/corosync-2.4.5+git69.6236728a/exec/totemsrp.c 2021-04-09 11:20:51.000000000 +0200 +++ new/corosync-2.4.5+git70.64010f57/exec/totemsrp.c 2021-08-20 16:56:29.000000000 +0200 @@ -4105,8 +4105,9 @@ transmits_allowed = fcc_calculate (instance, token); mcasted_retransmit = orf_token_rtr (instance, token, &transmits_allowed); - if (instance->my_token_held == 1 && - (token->rtr_list_entries > 0 || mcasted_retransmit > 0)) { + if (instance->totem_config->cancel_token_hold_on_retransmit && + instance->my_token_held == 1 && + (token->rtr_list_entries > 0 || mcasted_retransmit > 0)) { instance->my_token_held = 0; forward_token = 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/corosync-2.4.5+git69.6236728a/include/corosync/totem/totem.h new/corosync-2.4.5+git70.64010f57/include/corosync/totem/totem.h --- old/corosync-2.4.5+git69.6236728a/include/corosync/totem/totem.h 2021-04-09 11:20:51.000000000 +0200 +++ new/corosync-2.4.5+git70.64010f57/include/corosync/totem/totem.h 2021-08-20 16:56:29.000000000 +0200 @@ -193,6 +193,8 @@ unsigned int block_unlisted_ips; + unsigned int cancel_token_hold_on_retransmit; + void (*totem_memb_ring_id_create_or_load) ( struct memb_ring_id *memb_ring_id, const struct totem_ip_address *addr); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/corosync-2.4.5+git69.6236728a/man/corosync.conf.5 new/corosync-2.4.5+git70.64010f57/man/corosync.conf.5 --- old/corosync-2.4.5+git69.6236728a/man/corosync.conf.5 2021-04-09 11:20:51.000000000 +0200 +++ new/corosync-2.4.5+git70.64010f57/man/corosync.conf.5 2021-08-20 16:56:29.000000000 +0200 @@ -32,7 +32,7 @@ .\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" * THE POSSIBILITY OF SUCH DAMAGE. .\" */ -.TH COROSYNC_CONF 5 2019-05-23 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual" +.TH COROSYNC_CONF 5 2021-08-19 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual" .SH NAME corosync.conf - corosync executive configuration file @@ -539,6 +539,19 @@ The default value is yes. +.TP +cancel_token_hold_on_retransmit +Allows Corosync to hold token by representative when there is too much +retransmit messages. This allows network to process increased load without +overloading it. Used mechanism is same as described for +.B hold +directive. + +Some deployments may prefer to never hold token when there is +retransmit messages. If so, option should be set to yes. + +The default value is no. + .PP Within the .B logging
