From d93043fc5fbabf44756c08b7ec037161945fc9e1 Mon Sep 17 00:00:00 2001
From: Bela Ban <belaban@yahoo.com>
Date: Thu, 16 Feb 2012 17:43:30 +0100
Subject: [PATCH] Moved RSVP on top of FRAG2

---
 conf/fast-local.xml       | 2 +-
 conf/tcp.xml              | 2 +-
 conf/udp-largecluster.xml | 2 +-
 conf/udp.xml              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/fast-local.xml b/conf/fast-local.xml
index 20ee7b280bf..b66611e9c12 100644
--- a/conf/fast-local.xml
+++ b/conf/fast-local.xml
@@ -69,7 +69,6 @@
               xmit_table_msgs_per_row="1000"
               xmit_table_max_compaction_time="30000"
               max_msg_batch_size="500"/>
-    <RSVP/>
     <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
                    max_bytes="8m"/>
     <pbcast.GMS print_local_addr="true" join_timeout="3000"
@@ -79,6 +78,7 @@
     <MFC max_credits="2M"
          min_threshold="0.4"/>
     <FRAG2 frag_size="60000"  />
+    <RSVP/>
     <!--pbcast.STATE /-->
     <pbcast.STATE_TRANSFER  />
     <!-- pbcast.FLUSH  /-->
diff --git a/conf/tcp.xml b/conf/tcp.xml
index 89dec73cf52..87bd1ab1460 100644
--- a/conf/tcp.xml
+++ b/conf/tcp.xml
@@ -54,7 +54,6 @@
     <pbcast.NAKACK2 use_mcast_xmit="false"
                    discard_delivered_msgs="true"/>
     <UNICAST />
-    <RSVP resend_interval="2000" timeout="10000"/>
     <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
                    max_bytes="4M"/>
     <pbcast.GMS print_local_addr="true" join_timeout="3000"
@@ -65,5 +64,6 @@
     <MFC max_credits="2M"
          min_threshold="0.4"/>
     <FRAG2 frag_size="60K"  />
+    <!--RSVP resend_interval="2000" timeout="10000"/-->
     <pbcast.STATE_TRANSFER/>
 </config>
\ No newline at end of file
diff --git a/conf/udp-largecluster.xml b/conf/udp-largecluster.xml
index fab3e62b5b5..31b3be8a0c1 100644
--- a/conf/udp-largecluster.xml
+++ b/conf/udp-largecluster.xml
@@ -68,7 +68,6 @@
               xmit_table_msgs_per_row="1000"
               xmit_table_max_compaction_time="30000"
               max_msg_batch_size="500"/>
-    <RSVP resend_interval="2000" timeout="10000"/>
     <pbcast.STABLE stability_delay="2000" desired_avg_gossip="60000"
                    max_bytes="4M"
                    cap="0.1"/>
@@ -84,5 +83,6 @@
     <MFC max_credits="4M"
          min_threshold="0.4"/>
     <FRAG2 frag_size="60K"  />
+    <RSVP resend_interval="2000" timeout="10000"/>
     <pbcast.STATE_TRANSFER />
 </config>
diff --git a/conf/udp.xml b/conf/udp.xml
index a6b563babc9..35fd19bcd57 100644
--- a/conf/udp.xml
+++ b/conf/udp.xml
@@ -67,7 +67,6 @@
               xmit_table_max_compaction_time="60000"
               conn_expiry_timeout="60000"
               max_msg_batch_size="500"/>
-    <RSVP resend_interval="2000" timeout="10000"/>
     <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
                    max_bytes="4M"/>
     <pbcast.GMS print_local_addr="true" join_timeout="3000"
@@ -77,6 +76,7 @@
     <MFC max_credits="2M"
          min_threshold="0.4"/>
     <FRAG2 frag_size="60K"  />
+    <RSVP resend_interval="2000" timeout="10000"/>
     <pbcast.STATE_TRANSFER />
     <!-- pbcast.FLUSH  /-->
 </config>