Fixed histrorization prematurely stoping heartbeats

Fortify-Labs · Feb 23, 2021 · c779528 · c779528
1 parent 4f3b20f
commit c779528
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/devops/kubernetes/src/cluster.ts b/devops/kubernetes/src/cluster.ts
@@ -284,7 +284,7 @@ export class Cluster extends Chart {
 						"delivery.timeout.ms": 15 * 60 * 1000, // 15 minutes
 						"session.timeout.ms": 30 * 1000, // 30 seconds
 						"heartbeat.interval.ms": 10 * 1000, // 10 seconds
-						"max.poll.interval.ms": 15 * 60 * 1000, // 5 minutes
+						"max.poll.interval.ms": 15 * 60 * 1000, // 15 minutes
 						"max.poll.records": 10,
 						"auto.offset.reset": "earliest",
 					},

diff --git a/services/historization/package-lock.json b/services/historization/package-lock.json
diff --git a/services/historization/package.json b/services/historization/package.json
@@ -1,6 +1,6 @@
 {
   "name": "historization",
-  "version": "1.12.0",
+  "version": "1.12.1",
   "description": "A historization service responsible for persisting info",
   "author": {
     "name": "Thomas Kosiewski"

diff --git a/services/historization/src/index.ts b/services/historization/src/index.ts
@@ -95,6 +95,7 @@ const {
 			isRunning,
 			isStale,
 		}) => {
+			await heartbeat();
 			const intervalId = setInterval(async () => {
 				try {
 					await heartbeat();
@@ -155,6 +156,12 @@ const {
 					} else {
 						end({ status: 501 });
 					}
+
+					if (KAFKA_AUTO_COMMIT !== "false") {
+						resolveOffset(message.offset);
+					} else {
+						await commitOffsetsIfNecessary();
+					}
 				} catch (e) {
 					const exceptionID = captureException(e, {
 						contexts: {
@@ -187,17 +194,13 @@ const {
 
 					end({ status: 500 });
 
-					throw e;
-				} finally {
 					clearInterval(intervalId);
-				}
 
-				if (KAFKA_AUTO_COMMIT !== "false") {
-					resolveOffset(message.offset);
-				} else {
-					await commitOffsetsIfNecessary();
+					throw e;
 				}
 			}
+
+			clearInterval(intervalId);
 		},
 	});