Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

removed xmit_off (http://jira.jboss.com/jira/browse/JGRP-717)

  • Loading branch information...
commit 2505bddc0d20a23a2e789c3c8e0ba07924922b9f 1 parent 3f7222c
@belaban authored
View
4 conf/flush-tcp-nio.xml
@@ -7,7 +7,7 @@
We currently require use_incoming_packet_handler=true (release 2.4 will support use_incoming_packet_handler=false
due to threadless stack support)
author: Bela Ban
- version: $Id: flush-tcp-nio.xml,v 1.1.2.4 2008/06/16 15:56:32 belaban Exp $
+ version: $Id: flush-tcp-nio.xml,v 1.1.2.5 2008/06/17 08:22:36 belaban Exp $
-->
<config>
<TCP_NIO
@@ -62,7 +62,7 @@
use_mcast_xmit="false" gc_lag="0"
retransmit_timeout="300,600,1200,2400,4800"
discard_delivered_msgs="true"/>
- <UNICAST timeout="300,600,1200" xmit_off="false"/>
+ <UNICAST timeout="300,600,1200" />
<pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
max_bytes="400000"/>
<VIEW_SYNC avg_send_interval="60000"/>
View
2  conf/flush-tcp.xml
@@ -50,7 +50,7 @@
use_mcast_xmit="false" gc_lag="0"
retransmit_timeout="300,600,1200,2400,4800"
discard_delivered_msgs="false"/>
- <UNICAST timeout="300,600,1200" xmit_off="false"/>
+ <UNICAST timeout="300,600,1200" />
<pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
max_bytes="400000"/>
<pbcast.GMS print_local_addr="true" join_timeout="7000"
View
4 conf/mping.xml
@@ -2,7 +2,7 @@
<!--
TCP-based stack with IP multicast-based discovery
-Version: $Id: mping.xml,v 1.7.2.4 2008/06/16 15:56:32 belaban Exp $
+Version: $Id: mping.xml,v 1.7.2.5 2008/06/17 08:22:36 belaban Exp $
Author: Bela Ban
-->
@@ -27,7 +27,7 @@ Author: Bela Ban
<pbcast.NAKACK gc_lag="50"
retransmit_timeout="600,1200,2400,4800"
/>
- <UNICAST timeout="300,600,1200" xmit_off="false"/>
+ <UNICAST timeout="300,600,1200" />
<pbcast.STABLE stability_delay="1000"
desired_avg_gossip="20000"
max_bytes="0"/>
View
10 conf/stacks.xml
@@ -2,7 +2,7 @@
<!--
Sample file that defines a number of stacks, used by the multiplexer
Author: Bela Ban
- Version: $Id: stacks.xml,v 1.35.2.7 2008/06/16 15:56:32 belaban Exp $
+ Version: $Id: stacks.xml,v 1.35.2.8 2008/06/17 08:22:36 belaban Exp $
-->
<protocol_stacks>
<stack name="udp"
@@ -183,7 +183,7 @@
use_mcast_xmit="false" gc_lag="0"
retransmit_timeout="300,600,1200,2400,4800"
discard_delivered_msgs="false"/>
- <UNICAST timeout="300,600,1200" xmit_off="false"/>
+ <UNICAST timeout="300,600,1200" />
<pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
max_bytes="400000"/>
<pbcast.GMS print_local_addr="true" join_timeout="5000"
@@ -247,7 +247,7 @@
use_mcast_xmit="false" gc_lag="0"
retransmit_timeout="300,600,1200,2400,4800"
discard_delivered_msgs="false"/>
- <UNICAST timeout="300,600,1200" xmit_off="false"/>
+ <UNICAST timeout="300,600,1200" />
<pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
max_bytes="400000"/>
<pbcast.GMS print_local_addr="true" join_timeout="5000"
@@ -300,7 +300,7 @@
use_mcast_xmit="false" gc_lag="0"
retransmit_timeout="300,600,1200,2400,4800"
discard_delivered_msgs="false"/>
- <UNICAST timeout="300,600,1200" xmit_off="false"/>
+ <UNICAST timeout="300,600,1200" />
<pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
max_bytes="400000"/>
<pbcast.GMS print_local_addr="true" join_timeout="5000"
@@ -354,7 +354,7 @@
use_mcast_xmit="false" gc_lag="0"
retransmit_timeout="300,600,1200,2400,4800"
discard_delivered_msgs="false"/>
- <UNICAST timeout="300,600,1200" xmit_off="false"/>
+ <UNICAST timeout="300,600,1200" />
<pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
max_bytes="400000"/>
<pbcast.GMS print_local_addr="true" join_timeout="5000"
View
4 conf/tcp-nio.xml
@@ -7,7 +7,7 @@
We currently require use_incoming_packet_handler=true (release 2.4 will support use_incoming_packet_handler=false
due to threadless stack support)
author: Bela Ban
- version: $Id: tcp-nio.xml,v 1.8.2.4 2008/06/16 15:56:32 belaban Exp $
+ version: $Id: tcp-nio.xml,v 1.8.2.5 2008/06/17 08:22:36 belaban Exp $
-->
<config>
<TCP_NIO
@@ -62,7 +62,7 @@
use_mcast_xmit="false" gc_lag="0"
retransmit_timeout="300,600,1200,2400,4800"
discard_delivered_msgs="true"/>
- <UNICAST timeout="300,600,1200" xmit_off="false"/>
+ <UNICAST timeout="300,600,1200" />
<pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
max_bytes="400000"/>
<VIEW_SYNC avg_send_interval="60000"/>
View
4 conf/tcp.xml
@@ -4,7 +4,7 @@
Note that TCP.bind_addr and TCPPING.initial_hosts should be set, possibly via system properties, e.g.
-Djgroups.bind_addr=192.168.5.2 and -Djgroups.tcpping.initial_hosts=192.168.5.2[7800]
author: Bela Ban
- version: $Id: tcp.xml,v 1.18.2.4 2008/06/16 15:56:32 belaban Exp $
+ version: $Id: tcp.xml,v 1.18.2.5 2008/06/17 08:22:36 belaban Exp $
-->
<config>
<TCP start_port="7800"
@@ -52,7 +52,7 @@
use_mcast_xmit="false" gc_lag="0"
retransmit_timeout="300,600,1200,2400,4800"
discard_delivered_msgs="true"/>
- <UNICAST timeout="300,600,1200" xmit_off="false"/>
+ <UNICAST timeout="300,600,1200" />
<pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
max_bytes="400000"/>
<VIEW_SYNC avg_send_interval="60000"/>
View
2  conf/tcpgossip.xml
@@ -10,7 +10,7 @@
<FD timeout="2000" max_tries="4"/>
<VERIFY_SUSPECT timeout="1500" />
<pbcast.NAKACK gc_lag="100" retransmit_timeout="600,1200,2400,4800"/>
- <UNICAST timeout="300,600,1200" xmit_off="false"/>
+ <UNICAST timeout="300,600,1200" />
<pbcast.STABLE stability_delay="1000" desired_avg_gossip="20000" max_bytes="0" />
<VIEW_SYNC avg_send_interval="60000"/>
<pbcast.GMS print_local_addr="true" join_timeout="5000" shun="true"/>
View
10 doc/ReleaseNotes-2.6.3.txt
@@ -2,7 +2,7 @@
Release Notes JGroups 2.6.3
===========================
-Version: $Id: ReleaseNotes-2.6.3.txt,v 1.1.2.4 2008/06/13 14:28:14 belaban Exp $
+Version: $Id: ReleaseNotes-2.6.3.txt,v 1.1.2.5 2008/06/17 08:21:27 belaban Exp $
Author: Bela Ban
JGroups 2.6.3 is still API-backwards compatible with previous versions (down to 2.2.7).
@@ -37,14 +37,6 @@ Section 5.5.5 (http://www.jgroups.org/javagroupsnew/docs/manual/html/user-advanc
discusses the steps to be taken to replace thread pools and / or thread factories.
-Message retransmission can be turned off in UNICAST
----------------------------------------------------
-[http://jira.jboss.com/jira/browse/JGRP-717]
-
-Using the xmit_off property, retransmission can be turned off. Default is on. Turning it off makes sense over
-lossless transports like TCP.
-
-
Eager ACKs for UNICAST
----------------------
[http://jira.jboss.com/jira/browse/JGRP-713]
View
18 src/org/jgroups/protocols/UNICAST.java
@@ -34,7 +34,7 @@
* whenever a message is received: the new message is added and then we try to remove as many messages as
* possible (until we stop at a gap, or there are no more messages).
* @author Bela Ban
- * @version $Id: UNICAST.java,v 1.91.2.13 2008/06/16 08:29:57 belaban Exp $
+ * @version $Id: UNICAST.java,v 1.91.2.14 2008/06/17 08:21:26 belaban Exp $
*/
public class UNICAST extends Protocol implements AckSenderWindow.RetransmitCommand {
private final Vector<Address> members=new Vector<Address>(11);
@@ -55,10 +55,6 @@
/** whether to loop back messages sent to self (will be removed in the future, default=false) */
private boolean loopback=false;
- /** If set to true, messages will not get retransmitted by the sender. This is useful when running
- over a lossless transport, e.g. TCP. The default is false. Do not set this to true if running over UDP */
- private boolean xmit_off=false;
-
/**
* By default, we release the lock on the sender in up() after the up() method call passed up the stack returns.
* However, with eager_lock_release enabled (default), we release the lock as soon as the application calls
@@ -219,12 +215,6 @@ public boolean setProperties(Properties props) {
props.remove("use_gms");
}
- str=props.getProperty("xmit_off");
- if(str != null) {
- xmit_off=Boolean.valueOf(str).booleanValue();
- props.remove("xmit_off");
- }
-
str=props.getProperty("immediate_ack");
if(str != null) {
immediate_ack=Boolean.valueOf(str).booleanValue();
@@ -289,7 +279,7 @@ public Object up(Event evt) {
case UnicastHeader.DATA: // received regular message
// only send an ACK if added to the received_msgs table (bela Aug 2006)
// if in immediate_ack mode, send ack inside handleDataReceived
- if(handleDataReceived(src, hdr.seqno, msg) && !immediate_ack && !xmit_off)
+ if(handleDataReceived(src, hdr.seqno, msg) && !immediate_ack)
sendAck(src, hdr.seqno);
return null; // we pass the deliverable message up in handleDataReceived()
case UnicastHeader.ACK: // received ACK for previously sent message
@@ -358,7 +348,7 @@ public Object down(Event evt) {
try {
seqno=entry.sent_msgs_seqno;
UnicastHeader hdr=new UnicastHeader(UnicastHeader.DATA, seqno);
- if(entry.sent_msgs == null && !xmit_off) { // first msg to peer 'dst'
+ if(entry.sent_msgs == null) { // first msg to peer 'dst'
entry.sent_msgs=new AckSenderWindow(this, new StaticInterval(timeouts), timer, this.local_addr); // use the global timer
}
msg.putHeader(name, hdr);
@@ -584,7 +574,7 @@ private boolean handleDataReceived(Address sender, long seqno, Message msg) {
// http://jira.jboss.com/jira/browse/JGRP-713: // send the ack back *before* we process the message
// to limit unnecessary retransmits
- if(immediate_ack && !xmit_off)
+ if(immediate_ack)
sendAck(sender, seqno); // send an ack regardless of whether the message was added (stops retransmission)
// message is passed up if OOB. Later, when remove() is called, we discard it. This affects ordering !
Please sign in to comment.
Something went wrong with that request. Please try again.