This is an automated email from the ASF dual-hosted git repository.
tison pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/master by this push:
new 1a9bcbd1f ZOOKEEPER-4898: FastLeaderElection
WorkerSender/WorkerReceiver don't need to be Thread (#2228)
1a9bcbd1f is described below
commit 1a9bcbd1facfa435a1b1718d44d264420ff1a021
Author: ZLATAN628 <107628611+zlatan...@users.noreply.github.com>
AuthorDate: Sat Mar 1 00:01:31 2025 +0800
ZOOKEEPER-4898: FastLeaderElection WorkerSender/WorkerReceiver don't need
to be Thread (#2228)
---
.../server/quorum/FastLeaderElection.java | 30 +++++++++-------------
1 file changed, 12 insertions(+), 18 deletions(-)
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/FastLeaderElection.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/FastLeaderElection.java
index 8d2b8263c..86bb4e732 100644
---
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/FastLeaderElection.java
+++
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/FastLeaderElection.java
@@ -223,8 +223,8 @@ class WorkerReceiver extends ZooKeeperThread {
volatile boolean stop;
QuorumCnxManager manager;
- WorkerReceiver(QuorumCnxManager manager) {
- super("WorkerReceiver");
+ WorkerReceiver(QuorumCnxManager manager, String threadName) {
+ super(threadName);
this.stop = false;
this.manager = manager;
}
@@ -470,7 +470,7 @@ public void run() {
LOG.warn("Interrupted Exception while waiting for new
message", e);
}
}
- LOG.info("WorkerReceiver is down");
+ LOG.info("{} is down", getName());
}
}
@@ -485,8 +485,8 @@ class WorkerSender extends ZooKeeperThread {
volatile boolean stop;
QuorumCnxManager manager;
- WorkerSender(QuorumCnxManager manager) {
- super("WorkerSender");
+ WorkerSender(QuorumCnxManager manager, String threadName) {
+ super(threadName);
this.stop = false;
this.manager = manager;
}
@@ -504,7 +504,7 @@ public void run() {
break;
}
}
- LOG.info("WorkerSender is down");
+ LOG.info("{} is down", getName());
}
/**
@@ -523,8 +523,6 @@ void process(ToSend m) {
WorkerSender ws;
WorkerReceiver wr;
- Thread wsThread = null;
- Thread wrThread = null;
/**
* Constructor of class Messenger.
@@ -533,23 +531,19 @@ void process(ToSend m) {
*/
Messenger(QuorumCnxManager manager) {
- this.ws = new WorkerSender(manager);
+ this.ws = new WorkerSender(manager, "WorkerSender[myid=" +
self.getMyId() + "]");
+ this.ws.setDaemon(true);
- this.wsThread = new Thread(this.ws, "WorkerSender[myid=" +
self.getMyId() + "]");
- this.wsThread.setDaemon(true);
-
- this.wr = new WorkerReceiver(manager);
-
- this.wrThread = new Thread(this.wr, "WorkerReceiver[myid=" +
self.getMyId() + "]");
- this.wrThread.setDaemon(true);
+ this.wr = new WorkerReceiver(manager, "WorkerReceiver[myid=" +
self.getMyId() + "]");
+ this.wr.setDaemon(true);
}
/**
* Starts instances of WorkerSender and WorkerReceiver
*/
void start() {
- this.wsThread.start();
- this.wrThread.start();
+ this.ws.start();
+ this.wr.start();
}
/**
