Merge pull request #1101 from Ubitso/fix-info-packet-send-on-stop

Fix info packet send on stop
moleculerjs · Jul 10, 2022 · 84ef938 · 84ef938
2 parents 49968d7 + db32a9a
commit 84ef938
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 14 deletions.
diff --git a/src/registry/registry.js b/src/registry/registry.js
@@ -443,7 +443,7 @@ class Registry {
 	 *
 	 * @memberof Registry
 	 */
-	regenerateLocalRawInfo(incSeq) {
+	regenerateLocalRawInfo(incSeq, isStopping) {
 		let node = this.nodes.localNode;
 		if (incSeq) node.seq++;
 
@@ -457,8 +457,12 @@ class Registry {
 			"seq",
 			"metadata"
 		]);
-		if (this.broker.started || incSeq) rawInfo.services = this.services.getLocalNodeServices();
-		else rawInfo.services = [];
+
+		if (!isStopping && (this.broker.started || incSeq)) {
+			rawInfo.services = this.services.getLocalNodeServices();
+		} else {
+			rawInfo.services = [];
+		}
 
 		// Make to be safety
 		node.rawInfo = utils.safetyObject(rawInfo, this.broker.options);

diff --git a/src/service-broker.js b/src/service-broker.js
@@ -70,7 +70,8 @@ const defaultOptions = {
 
 	registry: {
 		strategy: "RoundRobin",
-		preferLocal: true
+		preferLocal: true,
+		stopDelay: 100
 	},
 
 	circuitBreaker: {
@@ -499,16 +500,20 @@ class ServiceBroker {
 	 */
 	stop() {
 		this.started = false;
-		this.stopping = true;
 		return this.Promise.resolve()
 			.then(() => {
 				if (this.transit) {
-					this.registry.regenerateLocalRawInfo(true);
+					this.registry.regenerateLocalRawInfo(true, true);
 					// Send empty node info in order to block incoming requests
 					return this.registry.discoverer.sendLocalNodeInfo();
 				}
 			})
 			.then(() => {
+				return this.Promise.delay(this.options.registry.stopDelay);
+			})
+			.then(() => {
+				this.stopping = true;
+
 				return this.callMiddlewareHook("stopping", [this], { reverse: true });
 			})
 			.then(() => {

diff --git a/test/integration/circuit-breaker.spec.js b/test/integration/circuit-breaker.spec.js
@@ -58,11 +58,10 @@ describe("Test circuit breaker", () => {
 			.then(() => (clock = lolex.install({ shouldClearNativeTimers: true })));
 	});
 
-	afterAll(() => {
-		return master1
-			.stop()
-			.then(() => slave1.stop())
-			.then(() => clock.uninstall());
+	afterAll(async () => {
+		await clock.uninstall();
+
+		await master1.stop().then(() => slave1.stop());
 	});
 
 	it("should call 'happy' x5 without problem", () => {

diff --git a/test/unit/cachers/memory-lru.spec.js b/test/unit/cachers/memory-lru.spec.js
@@ -89,6 +89,7 @@ describe("Test MemoryLRUCacher set & get", () => {
 });
 
 describe("Test MemoryLRUCacher set & get with default cloning enabled", () => {
+	let clock = lolex.install({ shouldClearNativeTimers: true });
 	let broker = new ServiceBroker({ logger: false });
 	let cacher = new MemoryLRUCacher({ clone: true });
 	cacher.init(broker);
@@ -104,6 +105,8 @@ describe("Test MemoryLRUCacher set & get with default cloning enabled", () => {
 	};
 
 	afterAll(async () => {
+		await clock.uninstall();
+
 		await cacher.close();
 		await broker.stop();
 	});
@@ -176,6 +179,7 @@ describe("Test MemoryLRUCacher set & get with default cloning disabled", () => {
 });
 
 describe("Test MemoryLRUCacher set & get with custom cloning", () => {
+	let clock;
 	const clone = jest.fn(data => JSON.parse(JSON.stringify(data)));
 	let broker = new ServiceBroker({ logger: false });
 	let cacher = new MemoryLRUCacher({ clone });
@@ -191,7 +195,13 @@ describe("Test MemoryLRUCacher set & get with custom cloning", () => {
 		}
 	};
 
+	beforeAll(async () => {
+		clock = lolex.install({ shouldClearNativeTimers: true });
+	});
+
 	afterAll(async () => {
+		await clock.uninstall();
+
 		await cacher.close();
 		await broker.stop();
 	});
@@ -329,7 +339,7 @@ describe("Test MemoryLRUCacher clean", () => {
 });
 
 describe("Test MemoryLRUCacher expired method", () => {
-	let clock = lolex.install({ shouldClearNativeTimers: true });
+	let clock;
 
 	let broker = new ServiceBroker({ logger: false });
 	let cacher = new MemoryLRUCacher({
@@ -349,6 +359,9 @@ describe("Test MemoryLRUCacher expired method", () => {
 	};
 	let data2 = "Data2";
 
+	beforeAll(async () => {
+		clock = lolex.install({ shouldClearNativeTimers: true });
+	});
 	afterAll(() => clock.uninstall());
 
 	it("should save the data with key", () => {

diff --git a/test/unit/registry/registry.spec.js b/test/unit/registry/registry.spec.js
@@ -19,6 +19,7 @@ describe("Test Registry constructor", () => {
 
 		expect(registry.opts).toEqual({
 			preferLocal: true,
+			stopDelay: 100,
 			strategy: "RoundRobin"
 		});
 		expect(registry.StrategyFactory).toBe(Strategies.RoundRobin);
@@ -42,6 +43,7 @@ describe("Test Registry constructor", () => {
 
 		expect(registry.opts).toEqual({
 			preferLocal: false,
+			stopDelay: 100,
 			strategy: "Random"
 		});
 		expect(registry.StrategyFactory).toBe(Strategies.Random);
@@ -58,6 +60,7 @@ describe("Test Registry constructor", () => {
 
 		expect(registry.opts).toEqual({
 			preferLocal: true,
+			stopDelay: 100,
 			discoverer: "Redis",
 			strategy: "RoundRobin"
 		});

diff --git a/test/unit/service-broker.spec.js b/test/unit/service-broker.spec.js
@@ -233,7 +233,8 @@ describe("Test ServiceBroker constructor", () => {
 			disableBalancer: true,
 			registry: {
 				strategy: Strategies.Random,
-				preferLocal: false
+				preferLocal: false,
+				stopDelay: 100
 			},
 
 			circuitBreaker: {
@@ -761,7 +762,7 @@ describe("Test broker.stop", () => {
 
 			return broker.stop().then(() => {
 				expect(broker.registry.regenerateLocalRawInfo).toBeCalledTimes(1);
-				expect(broker.registry.regenerateLocalRawInfo).toBeCalledWith(true);
+				expect(broker.registry.regenerateLocalRawInfo).toBeCalledWith(true, true);
 				expect(broker.registry.discoverer.sendLocalNodeInfo).toBeCalledTimes(1);
 
 				expect(optStopped).toHaveBeenCalledTimes(1);