This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new e82c6c9309 Refactor default cluster buffer sizes to use constants
e82c6c9309 is described below
commit e82c6c9309199d056f7b2012d80a4b523e0ad250
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri May 20 11:58:41 2022 +0100
Refactor default cluster buffer sizes to use constants
Makes it simpler to change the default buffer size
---
java/org/apache/catalina/tribes/io/LocalStrings.properties | 2 +-
java/org/apache/catalina/tribes/io/LocalStrings_de.properties | 2 +-
java/org/apache/catalina/tribes/io/LocalStrings_es.properties | 2 +-
java/org/apache/catalina/tribes/io/LocalStrings_fr.properties | 2 +-
java/org/apache/catalina/tribes/io/LocalStrings_ja.properties | 2 +-
java/org/apache/catalina/tribes/io/LocalStrings_ko.properties | 2 +-
java/org/apache/catalina/tribes/io/LocalStrings_zh_CN.properties | 2 +-
java/org/apache/catalina/tribes/io/ObjectReader.java | 6 ++++--
java/org/apache/catalina/tribes/transport/AbstractSender.java | 8 ++++----
java/org/apache/catalina/tribes/transport/Constants.java | 3 +++
java/org/apache/catalina/tribes/transport/ReceiverBase.java | 8 ++++----
test/org/apache/catalina/tribes/demos/ChannelCreator.java | 9 +++++----
.../org/apache/catalina/tribes/test/transport/SocketReceive.java | 4 +++-
.../catalina/tribes/test/transport/SocketTribesReceive.java | 5 +++--
.../catalina/tribes/test/transport/SocketValidateReceive.java | 4 +++-
15 files changed, 36 insertions(+), 25 deletions(-)
diff --git a/java/org/apache/catalina/tribes/io/LocalStrings.properties
b/java/org/apache/catalina/tribes/io/LocalStrings.properties
index f7ef725719..534d0e4e54 100644
--- a/java/org/apache/catalina/tribes/io/LocalStrings.properties
+++ b/java/org/apache/catalina/tribes/io/LocalStrings.properties
@@ -15,7 +15,7 @@
bufferPool.created=Created a buffer pool with max size:[{0}] bytes of type:
[{1}]
-objectReader.retrieveFailed.socketReceiverBufferSize=Unable to retrieve the
socket receiver buffer size, setting to default 43800 bytes.
+objectReader.retrieveFailed.socketReceiverBufferSize=Unable to retrieve the
socket receiver buffer size, setting to default [{0}] bytes.
replicationStream.conflict=conflicting non-public interface class loaders
diff --git a/java/org/apache/catalina/tribes/io/LocalStrings_de.properties
b/java/org/apache/catalina/tribes/io/LocalStrings_de.properties
index ba50760f31..7967e8f934 100644
--- a/java/org/apache/catalina/tribes/io/LocalStrings_de.properties
+++ b/java/org/apache/catalina/tribes/io/LocalStrings_de.properties
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-objectReader.retrieveFailed.socketReceiverBufferSize=Kann die Größe der Socket
Puffer nicht auslesen. Setze sie auf den Standardwert von 43800 Bytes.
+objectReader.retrieveFailed.socketReceiverBufferSize=Kann die Größe der Socket
Puffer nicht auslesen. Setze sie auf den Standardwert von [{0}] Bytes.
xByteBuffer.no.package=In XByteBuffer existiert kein Paket
xByteBuffer.size.larger.buffer=Größe liegt über dem bestehenden Buffer.
diff --git a/java/org/apache/catalina/tribes/io/LocalStrings_es.properties
b/java/org/apache/catalina/tribes/io/LocalStrings_es.properties
index 583149fdfe..332cd0895c 100644
--- a/java/org/apache/catalina/tribes/io/LocalStrings_es.properties
+++ b/java/org/apache/catalina/tribes/io/LocalStrings_es.properties
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-objectReader.retrieveFailed.socketReceiverBufferSize=Incapáz de recuperar el
tamaño del buffer receptor, fijando el valor por defecto a 43800 bytes.\n
+objectReader.retrieveFailed.socketReceiverBufferSize=Incapáz de recuperar el
tamaño del buffer receptor, fijando el valor por defecto a [{0}] bytes.\n
replicationStream.conflict=hay conflicto en la clase de los cargadores de la
interfaz no pública
diff --git a/java/org/apache/catalina/tribes/io/LocalStrings_fr.properties
b/java/org/apache/catalina/tribes/io/LocalStrings_fr.properties
index 12437458c4..2450c0ca3d 100644
--- a/java/org/apache/catalina/tribes/io/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/tribes/io/LocalStrings_fr.properties
@@ -15,7 +15,7 @@
bufferPool.created=Création d''un pool de tampons de taille maximale : [{0}]
octets de type : [{1}]
-objectReader.retrieveFailed.socketReceiverBufferSize=Incapacité de récupérer
la taille du tampon du socket de réception, forcé à 43800 octets
+objectReader.retrieveFailed.socketReceiverBufferSize=Incapacité de récupérer
la taille du tampon du socket de réception, forcé à [{0}] octets
replicationStream.conflict=Conflit entre des interfaces non-publics ayant des
chargeurs de classe différents
diff --git a/java/org/apache/catalina/tribes/io/LocalStrings_ja.properties
b/java/org/apache/catalina/tribes/io/LocalStrings_ja.properties
index 95b632219b..cd1fa28e91 100644
--- a/java/org/apache/catalina/tribes/io/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/tribes/io/LocalStrings_ja.properties
@@ -15,7 +15,7 @@
bufferPool.created=最大サイズ [{1}] のタイプの [{0}] バイトのバッファプールを作成しました
-objectReader.retrieveFailed.socketReceiverBufferSize=TCP
ソケットのレシーバーバッファサイズを取得できなかったため既定値として 43800 byte を設定します。
+objectReader.retrieveFailed.socketReceiverBufferSize=TCP
ソケットのレシーバーバッファサイズを取得できなかったため既定値として [{0}] byte を設定します。
replicationStream.conflict=public でないインターフェイスのクラスローダーが複数存在します
diff --git a/java/org/apache/catalina/tribes/io/LocalStrings_ko.properties
b/java/org/apache/catalina/tribes/io/LocalStrings_ko.properties
index fbdf7e2ce2..88c2681430 100644
--- a/java/org/apache/catalina/tribes/io/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/tribes/io/LocalStrings_ko.properties
@@ -15,7 +15,7 @@
bufferPool.created=타입이 [{1}](이)고 최대 크기가 [{0}] 바이트를 사용하여 버퍼 풀을 생성했습니다.
-objectReader.retrieveFailed.socketReceiverBufferSize=소켓 receiver의 버퍼 크기를 알 수
없습니다. 기본 값인 43800 바이트로 설정합니다.
+objectReader.retrieveFailed.socketReceiverBufferSize=소켓 receiver의 버퍼 크기를 알 수
없습니다. 기본 값인 [{0}] 바이트로 설정합니다.
replicationStream.conflict=해당 클래스의 클래스로더와, 그 클래스의 특정 non-public 인터페이스의 클래스로더가
일치하지 않아 충돌합니다.
diff --git a/java/org/apache/catalina/tribes/io/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/tribes/io/LocalStrings_zh_CN.properties
index 3e79933931..ba016d3bca 100644
--- a/java/org/apache/catalina/tribes/io/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/tribes/io/LocalStrings_zh_CN.properties
@@ -15,7 +15,7 @@
bufferPool.created=已创建缓冲池，最大大小为：[{0}]字节，类型为：[{1}]
-objectReader.retrieveFailed.socketReceiverBufferSize=无法检索套接字接收器缓冲区大小，设置为默认43800字节。
+objectReader.retrieveFailed.socketReceiverBufferSize=无法检索套接字接收器缓冲区大小，设置为默认[{0}]字节。
replicationStream.conflict=和非公开接口类加载器冲突
diff --git a/java/org/apache/catalina/tribes/io/ObjectReader.java
b/java/org/apache/catalina/tribes/io/ObjectReader.java
index 20eed9e300..7851352bde 100644
--- a/java/org/apache/catalina/tribes/io/ObjectReader.java
+++ b/java/org/apache/catalina/tribes/io/ObjectReader.java
@@ -22,6 +22,7 @@ import java.nio.ByteBuffer;
import java.nio.channels.SocketChannel;
import org.apache.catalina.tribes.ChannelMessage;
+import org.apache.catalina.tribes.transport.Constants;
import org.apache.catalina.tribes.util.StringManager;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -67,8 +68,9 @@ public class ObjectReader {
this.buffer = new XByteBuffer(socket.getReceiveBufferSize(), true);
}catch ( IOException x ) {
//unable to get buffer size
-
log.warn(sm.getString("objectReader.retrieveFailed.socketReceiverBufferSize"));
- this.buffer = new XByteBuffer(43800,true);
+
log.warn(sm.getString("objectReader.retrieveFailed.socketReceiverBufferSize",
+
Integer.toString(Constants.DEFAULT_CLUSTER_MSG_BUFFER_SIZE)));
+ this.buffer = new
XByteBuffer(Constants.DEFAULT_CLUSTER_MSG_BUFFER_SIZE, true);
}
}
diff --git a/java/org/apache/catalina/tribes/transport/AbstractSender.java
b/java/org/apache/catalina/tribes/transport/AbstractSender.java
index b12d59a9a4..b61a546926 100644
--- a/java/org/apache/catalina/tribes/transport/AbstractSender.java
+++ b/java/org/apache/catalina/tribes/transport/AbstractSender.java
@@ -25,10 +25,10 @@ import org.apache.catalina.tribes.Member;
public abstract class AbstractSender implements DataSender {
private volatile boolean connected = false;
- private int rxBufSize = 25188;
- private int txBufSize = 43800;
- private int udpRxBufSize = 25188;
- private int udpTxBufSize = 43800;
+ private int rxBufSize = Constants.DEFAULT_CLUSTER_ACK_BUFFER_SIZE;
+ private int txBufSize = Constants.DEFAULT_CLUSTER_MSG_BUFFER_SIZE;
+ private int udpRxBufSize = Constants.DEFAULT_CLUSTER_ACK_BUFFER_SIZE;
+ private int udpTxBufSize = Constants.DEFAULT_CLUSTER_MSG_BUFFER_SIZE;
private boolean directBuffer = false;
private int keepAliveCount = -1;
private int requestCount = 0;
diff --git a/java/org/apache/catalina/tribes/transport/Constants.java
b/java/org/apache/catalina/tribes/transport/Constants.java
index c83e6bb1c8..fe0515409f 100644
--- a/java/org/apache/catalina/tribes/transport/Constants.java
+++ b/java/org/apache/catalina/tribes/transport/Constants.java
@@ -27,6 +27,9 @@ public class Constants {
public static final String Package =
"org.apache.catalina.tribes.transport";
+ public static final int DEFAULT_CLUSTER_MSG_BUFFER_SIZE = 43800;
+ public static final int DEFAULT_CLUSTER_ACK_BUFFER_SIZE = 25188;
+
/*
* Do not change any of these values!
*/
diff --git a/java/org/apache/catalina/tribes/transport/ReceiverBase.java
b/java/org/apache/catalina/tribes/transport/ReceiverBase.java
index 20547cccd2..ee4efd56ba 100644
--- a/java/org/apache/catalina/tribes/transport/ReceiverBase.java
+++ b/java/org/apache/catalina/tribes/transport/ReceiverBase.java
@@ -56,10 +56,10 @@ public abstract class ReceiverBase implements
ChannelReceiver, ListenCallback, R
private int port = 4000;
private int udpPort = -1;
private int securePort = -1;
- private int rxBufSize = 43800;
- private int txBufSize = 25188;
- private int udpRxBufSize = 43800;
- private int udpTxBufSize = 25188;
+ private int rxBufSize = Constants.DEFAULT_CLUSTER_MSG_BUFFER_SIZE;
+ private int txBufSize = Constants.DEFAULT_CLUSTER_ACK_BUFFER_SIZE;
+ private int udpRxBufSize = Constants.DEFAULT_CLUSTER_MSG_BUFFER_SIZE;
+ private int udpTxBufSize = Constants.DEFAULT_CLUSTER_ACK_BUFFER_SIZE;
private volatile boolean listen = false;
private RxTaskPool pool;
diff --git a/test/org/apache/catalina/tribes/demos/ChannelCreator.java
b/test/org/apache/catalina/tribes/demos/ChannelCreator.java
index 7d00b7ee4c..9566e0f80e 100644
--- a/test/org/apache/catalina/tribes/demos/ChannelCreator.java
+++ b/test/org/apache/catalina/tribes/demos/ChannelCreator.java
@@ -33,6 +33,7 @@ import
org.apache.catalina.tribes.group.interceptors.TcpFailureDetector;
import org.apache.catalina.tribes.group.interceptors.ThroughputInterceptor;
import org.apache.catalina.tribes.membership.McastService;
import org.apache.catalina.tribes.membership.MemberImpl;
+import org.apache.catalina.tribes.transport.Constants;
import org.apache.catalina.tribes.transport.MultiPointSender;
import org.apache.catalina.tribes.transport.ReceiverBase;
import org.apache.catalina.tribes.transport.ReplicationTransmitter;
@@ -177,8 +178,8 @@ public class ChannelCreator {
rx.setMaxThreads(tcpthreadcount);
rx.setMinThreads(tcpthreadcount);
rx.getBind();
- rx.setRxBufSize(43800);
- rx.setTxBufSize(25188);
+ rx.setRxBufSize(Constants.DEFAULT_CLUSTER_MSG_BUFFER_SIZE);
+ rx.setTxBufSize(Constants.DEFAULT_CLUSTER_ACK_BUFFER_SIZE);
rx.setAutoBind(autoBind);
@@ -188,8 +189,8 @@ public class ChannelCreator {
transport,true,ChannelCreator.class.getClassLoader()).getConstructor().newInstance();
sender.setTimeout(acktimeout);
sender.setMaxRetryAttempts(2);
- sender.setRxBufSize(43800);
- sender.setTxBufSize(25188);
+ sender.setRxBufSize(Constants.DEFAULT_CLUSTER_MSG_BUFFER_SIZE);
+ sender.setTxBufSize(Constants.DEFAULT_CLUSTER_ACK_BUFFER_SIZE);
for (Object o : transportProperties.keySet()) {
String key = (String) o;
diff --git a/test/org/apache/catalina/tribes/test/transport/SocketReceive.java
b/test/org/apache/catalina/tribes/test/transport/SocketReceive.java
index fc746c0e06..2cfac6d6ea 100644
--- a/test/org/apache/catalina/tribes/test/transport/SocketReceive.java
+++ b/test/org/apache/catalina/tribes/test/transport/SocketReceive.java
@@ -22,6 +22,8 @@ import java.net.ServerSocket;
import java.net.Socket;
import java.text.DecimalFormat;
+import org.apache.catalina.tribes.transport.Constants;
+
public class SocketReceive {
static long start = 0;
static double mb = 0;
@@ -38,7 +40,7 @@ public class SocketReceive {
try (ServerSocket srvSocket = new ServerSocket(9999)) {
System.out.println("Listening on 9999");
Socket socket = srvSocket.accept();
- socket.setReceiveBufferSize(43800);
+
socket.setReceiveBufferSize(Constants.DEFAULT_CLUSTER_MSG_BUFFER_SIZE);
InputStream in = socket.getInputStream();
Thread t = new Thread() {
@Override
diff --git
a/test/org/apache/catalina/tribes/test/transport/SocketTribesReceive.java
b/test/org/apache/catalina/tribes/test/transport/SocketTribesReceive.java
index 5534cc093b..9300100656 100644
--- a/test/org/apache/catalina/tribes/test/transport/SocketTribesReceive.java
+++ b/test/org/apache/catalina/tribes/test/transport/SocketTribesReceive.java
@@ -23,6 +23,7 @@ import java.net.Socket;
import java.text.DecimalFormat;
import org.apache.catalina.tribes.io.XByteBuffer;
+import org.apache.catalina.tribes.transport.Constants;
public class SocketTribesReceive {
static long start = 0;
@@ -37,7 +38,7 @@ public class SocketTribesReceive {
public static void main(String[] args) throws Exception {
- int size = 43800;
+ int size = Constants.DEFAULT_CLUSTER_MSG_BUFFER_SIZE;
if (args.length > 0 ) {
try {
size = Integer.parseInt(args[0]);
@@ -45,7 +46,7 @@ public class SocketTribesReceive {
/* Ignore */
}
}
- XByteBuffer xbuf = new XByteBuffer(43800,true);
+ XByteBuffer xbuf = new
XByteBuffer(Constants.DEFAULT_CLUSTER_MSG_BUFFER_SIZE, true);
try (ServerSocket srvSocket = new ServerSocket(9999)) {
System.out.println("Listening on 9999");
Socket socket = srvSocket.accept();
diff --git
a/test/org/apache/catalina/tribes/test/transport/SocketValidateReceive.java
b/test/org/apache/catalina/tribes/test/transport/SocketValidateReceive.java
index df02a83b70..0b742126c5 100644
--- a/test/org/apache/catalina/tribes/test/transport/SocketValidateReceive.java
+++ b/test/org/apache/catalina/tribes/test/transport/SocketValidateReceive.java
@@ -22,6 +22,8 @@ import java.net.ServerSocket;
import java.net.Socket;
import java.text.DecimalFormat;
+import org.apache.catalina.tribes.transport.Constants;
+
public class SocketValidateReceive {
static long start = 0;
static double mb = 0;
@@ -34,7 +36,7 @@ public class SocketValidateReceive {
public static void main(String[] args) throws Exception {
- int size = 43800;
+ int size = Constants.DEFAULT_CLUSTER_MSG_BUFFER_SIZE;
if (args.length > 0 ) {
try {size=Integer.parseInt(args[0]);}catch(Exception x){ /* Ignore
*/ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
