fixes

Author: dmga44

src/chunkserver/masterconn.cc

@@ -38,6 +38,7 @@
 #include "chunkserver/bgjobs.h"
 #include "chunkserver/hddspacemgr.h"
 #include "chunkserver/master_connection.h"
+#include "chunkserver/network_main_thread.h"
 #include "common/event_loop.h"
 #include "common/massert.h"
 #include "common/network_address.h"
@@ -77,8 +78,6 @@ constexpr uint32_t kDefaultReplicationNumberOfWorkers = 5;
 constexpr uint32_t kMinReplicationNumberOfWorkers = 1;
 static uint32_t gReplicationNumberOfWorkers = kDefaultReplicationNumberOfWorkers;
 
-static std::atomic<bool> gDoTerminate = false;
-
 static void* gReconnectHook;
 
 //  Stats
@@ -145,8 +144,6 @@ JobPool* masterconn_get_job_pool() {
 	return gJobPool.get();
 }
 
-void masterconn_wantexit(void) { gDoTerminate.store(true); }
-
 int masterconn_canexit(void) {
 	if (gJobPool->getJobCount() == 0 && gReplicationJobPool->getJobCount() == 0 &&
 	    gMasterConnSingleton->isOutputQueueEmpty()) {
@@ -187,7 +184,7 @@ void masterconn_desc(std::vector<pollfd> &pdesc) {
 		}
 	}
 
-	eptr->providePollDescriptors(pdesc, gDoTerminate.load());
+	eptr->providePollDescriptors(pdesc, doTerminate());
 }
 
 void masterconn_send_status() {
@@ -323,7 +320,7 @@ int masterconn_init(void) {
 	gReconnectHook =
 	    eventloop_timeregister(TIMEMODE_RUN_LATE, reconnectionDelay,
 	                           rnd_ranged<uint32_t>(reconnectionDelay), masterconn_reconnect);
-	eventloop_wantexitregister(masterconn_wantexit);
+
 	eventloop_canexitregister(masterconn_canexit);
 	eventloop_destructregister(masterconn_term);
 	eventloop_pollregister(masterconn_desc, masterconn_serve);

src/chunkserver/network_main_thread.cc

@@ -64,6 +64,12 @@ static uint32_t gNrOfNetworkWorkers;
 static uint32_t gNrOfHddWorkersPerNetworkWorker;
 static uint32_t gBgjobsCountPerNetworkWorker;
 
+static std::atomic<bool> gDoTerminate = false;
+
+bool doTerminate() {
+	return gDoTerminate.load();
+}
+
 void chunkReplicatorReload() {
 	unsigned rep_total = cfg_get_minmaxvalue<unsigned>("REPLICATION_TOTAL_TIMEOUT_MS",
 	                                                   ChunkReplicator::kDefaultTotalTimeout_ms,
@@ -177,6 +183,10 @@ void mainNetworkThreadReload(void) {
 
 void mainNetworkThreadDesc(std::vector<pollfd> &pdesc) {
 	TRACETHIS();
+	if (doTerminate()) {
+		return;
+	}
+
 	pdesc.push_back({lsock, POLLIN, 0});
 	lsockpdescpos = pdesc.size() - 1;
 }
@@ -196,6 +206,8 @@ void mainNetworkThreadWantExit(void) {
 	for (auto& threadObject : networkThreadObjects) {
 		threadObject.askForTermination();
 	}
+
+	gDoTerminate.store(true);
 }
 
 int mainNetworkThreadCanExit(void) {
@@ -222,6 +234,10 @@ void mainNetworkThreadTerm(void) {
 
 void mainNetworkThreadServe(const std::vector<pollfd> &pdesc) {
 	TRACETHIS();
+	if (doTerminate()) {
+		return;
+	}
+
 	int newSocketFD;
 
 	if (lsockpdescpos >= 0 && (pdesc[lsockpdescpos].revents & POLLIN)) {

src/chunkserver/network_main_thread.h

@@ -28,3 +28,5 @@ int mainNetworkThreadInitThreads(void);
 
 uint32_t mainNetworkThreadGetListenIp();
 uint16_t mainNetworkThreadGetListenPort();
+
+bool doTerminate();

src/chunkserver/network_worker_thread.cc

@@ -335,7 +335,6 @@ void NetworkWorkerThread::askForTermination() {
 	doTerminate = true;
 	std::unique_lock lock(csservheadLock);
 	terminationTimer_.reset();
-	for (auto &entry : csservEntries) { entry.closeJobs(); }
 }
 
 void NetworkWorkerThread::addConnection(int newSocketFD) {