[pve-devel] r5670 - in pve-cluster/trunk/data: . src

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-03-10 06:52:02 +0100 (Thu, 10 Mar 2011)
New Revision: 5670

Modified:
   pve-cluster/trunk/data/ChangeLog
   pve-cluster/trunk/data/src/dfsm.c
Log:
limit to 100 retries


Modified: pve-cluster/trunk/data/ChangeLog
===================================================================
--- pve-cluster/trunk/data/ChangeLog	2011-03-10 05:33:04 UTC (rev 5669)
+++ pve-cluster/trunk/data/ChangeLog	2011-03-10 05:52:02 UTC (rev 5670)
@@ -1,3 +1,8 @@
+2011-03-10  Proxmox Support Team  <support at proxmox.com>
+
+	* src/dfsm.c (dfsm_send_message_full): limit to 100 retries (max
+	10 seconds delay).
+
 2011-03-07  Proxmox Support Team  <support at proxmox.com>
 
 	* perl/Cluster.pm (ipcc_send_rec*): allow to return 'undef'

Modified: pve-cluster/trunk/data/src/dfsm.c
===================================================================
--- pve-cluster/trunk/data/src/dfsm.c	2011-03-10 05:33:04 UTC (rev 5669)
+++ pve-cluster/trunk/data/src/dfsm.c	2011-03-10 05:52:02 UTC (rev 5670)
@@ -213,11 +213,12 @@
 		++retries;
 		if ((retries % 10) == 0)
 			cfs_dom_message(dfsm->log_domain, "cpg_send_message retry %d", retries);
-		goto loop;
+		if (retries < 100)
+			goto loop;
 	}
 
 	if (retries)
-		cfs_dom_message(dfsm->log_domain, "cpg_send_message retried %d", retries);
+		cfs_dom_message(dfsm->log_domain, "cpg_send_message retried %d times", retries);
 
 	if (result != CS_OK &&
 	    (!retry || result != CPG_ERR_TRY_AGAIN))