Skip to content

Commit 1a9bcbd

Browse files
authored
ZOOKEEPER-4898: FastLeaderElection WorkerSender/WorkerReceiver don't need to be Thread (#2228)
1 parent a39c8d8 commit 1a9bcbd

File tree

1 file changed

+12
-18
lines changed

1 file changed

+12
-18
lines changed

zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/FastLeaderElection.java

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,8 @@ class WorkerReceiver extends ZooKeeperThread {
223223
volatile boolean stop;
224224
QuorumCnxManager manager;
225225

226-
WorkerReceiver(QuorumCnxManager manager) {
227-
super("WorkerReceiver");
226+
WorkerReceiver(QuorumCnxManager manager, String threadName) {
227+
super(threadName);
228228
this.stop = false;
229229
this.manager = manager;
230230
}
@@ -470,7 +470,7 @@ public void run() {
470470
LOG.warn("Interrupted Exception while waiting for new message", e);
471471
}
472472
}
473-
LOG.info("WorkerReceiver is down");
473+
LOG.info("{} is down", getName());
474474
}
475475

476476
}
@@ -485,8 +485,8 @@ class WorkerSender extends ZooKeeperThread {
485485
volatile boolean stop;
486486
QuorumCnxManager manager;
487487

488-
WorkerSender(QuorumCnxManager manager) {
489-
super("WorkerSender");
488+
WorkerSender(QuorumCnxManager manager, String threadName) {
489+
super(threadName);
490490
this.stop = false;
491491
this.manager = manager;
492492
}
@@ -504,7 +504,7 @@ public void run() {
504504
break;
505505
}
506506
}
507-
LOG.info("WorkerSender is down");
507+
LOG.info("{} is down", getName());
508508
}
509509

510510
/**
@@ -523,8 +523,6 @@ void process(ToSend m) {
523523

524524
WorkerSender ws;
525525
WorkerReceiver wr;
526-
Thread wsThread = null;
527-
Thread wrThread = null;
528526

529527
/**
530528
* Constructor of class Messenger.
@@ -533,23 +531,19 @@ void process(ToSend m) {
533531
*/
534532
Messenger(QuorumCnxManager manager) {
535533

536-
this.ws = new WorkerSender(manager);
534+
this.ws = new WorkerSender(manager, "WorkerSender[myid=" + self.getMyId() + "]");
535+
this.ws.setDaemon(true);
537536

538-
this.wsThread = new Thread(this.ws, "WorkerSender[myid=" + self.getMyId() + "]");
539-
this.wsThread.setDaemon(true);
540-
541-
this.wr = new WorkerReceiver(manager);
542-
543-
this.wrThread = new Thread(this.wr, "WorkerReceiver[myid=" + self.getMyId() + "]");
544-
this.wrThread.setDaemon(true);
537+
this.wr = new WorkerReceiver(manager, "WorkerReceiver[myid=" + self.getMyId() + "]");
538+
this.wr.setDaemon(true);
545539
}
546540

547541
/**
548542
* Starts instances of WorkerSender and WorkerReceiver
549543
*/
550544
void start() {
551-
this.wsThread.start();
552-
this.wrThread.start();
545+
this.ws.start();
546+
this.wr.start();
553547
}
554548

555549
/**

0 commit comments

Comments
 (0)