@harperfast/harper 5.2.4 → 5.2.6

package/bin/restart.ts

@@ -6,13 +6,19 @@ import * as hdbTerms from '../utility/hdbTerms.ts';
 import hdbLogger from '../utility/logging/harper_logger.ts';
 import * as processMan from '../utility/processManagement/processManagement.js';
 import { compactOnStart } from './copyDb.ts';
-import { restartWorkers, onMessageByType, shutdownWorkersNow } from '../server/threads/manageThreads.js';
+import {
+	beginProcessShutdown,
+	restartWorkers,
+	onMessageByType,
+	shutdownWorkersNow,
+} from '../server/threads/manageThreads.js';
 import { handleHDBError, hdbErrors } from '../utility/errors/hdbError.ts';
 const { HTTP_STATUS_CODES } = hdbErrors;
 import * as envMgr from '../utility/environment/environmentManager.ts';
 import * as path from 'node:path';
-import { unlinkSync } from 'node:fs';
+import { rmSync } from 'node:fs';
 import { getThisNodeName } from '../server/nodeName.ts';
+import { armRestartExitWatchdog } from './restartExitWatchdog.ts';
 envMgr.initSync();
 
 const RESTART_RESPONSE = `Restarting Harper. This may take up to ${hdbTerms.RESTART_TIMEOUT_MS / 1000} seconds.`;
@@ -56,30 +62,49 @@ async function restart(req: any) {
 	if (isMainThread) {
 		hdbLogger.notify(RESTART_RESPONSE);
 
-		if (envMgr.get(hdbTerms.CONFIG_PARAMS.STORAGE_COMPACTONSTART)) await compactOnStart();
+		if (envMgr.get(hdbTerms.CONFIG_PARAMS.STORAGE_COMPACTONSTART)) {
+			hdbLogger.info('Compacting storage before restart; the restart timeout begins after compaction completes');
+			await compactOnStart();
+		}
 
 		setTimeout(async () => {
-			// It seems like you should just be able to start the other process and kill this process and everything should
-			// be cleaned up, however that doesn't work for some reason; the socket listening fds somehow get transferred to the
-			// child process if they are not explicitly closed. And when transferred they are orphaned listening, accepting
-			// connections and hanging. So we need to explicitly close down all the workers and then start the new process
-			// and shut down.
-			hdbLogger.debug('Shutdown workers');
-			await shutdownWorkersNow();
-			const { closeServers } = require('../server/threads/threadServer.js');
-			await closeServers();
-			await processMan.cleanupChildrenProcesses(false);
-			// remove pid file so it doesn't trip up the launch
-			unlinkSync(path.join(envMgr.get(hdbTerms.CONFIG_PARAMS.ROOTPATH), hdbTerms.HDB_PID_FILE));
-			hdbLogger.debug('Starting new process...');
-			if (process.env.HARPER_EXIT_ON_RESTART) {
-				// use this to exit the process so that it will be restarted by the
-				// PM/container/orchestrator.
-				hdbLogger.warn('Exiting Harper process to trigger a container restart');
-				process.exit(0);
+			try {
+				// Latch before the watchdog handshake, not at shutdownWorkersNow() below: a component's
+				// debounced requestRestart() landing in between would otherwise reload root components and
+				// pre-start an HTTP replacement into a process that is already exiting.
+				beginProcessShutdown();
+				// Off Linux the watchdog can never arm, and armRestartExitWatchdog() has already warned.
+				if (
+					process.env.HARPER_EXIT_ON_RESTART &&
+					!(await armRestartExitWatchdog(hdbTerms.RESTART_TIMEOUT_MS)) &&
+					process.platform === 'linux'
+				)
+					hdbLogger.error('Restart exit watchdog is unavailable; restart teardown is unbounded');
+				// It seems like you should just be able to start the other process and kill this process and everything should
+				// be cleaned up, however that doesn't work for some reason; the socket listening fds somehow get transferred to the
+				// child process if they are not explicitly closed. And when transferred they are orphaned listening, accepting
+				// connections and hanging. So we need to explicitly close down all the workers and then start the new process
+				// and shut down.
+				hdbLogger.debug('Shutdown workers');
+				await shutdownWorkersNow();
+				const { closeServers } = require('../server/threads/threadServer.js');
+				await closeServers();
+				await processMan.cleanupChildrenProcesses(false);
+				// remove pid file so it doesn't trip up the launch
+				rmSync(path.join(envMgr.get(hdbTerms.CONFIG_PARAMS.ROOTPATH), hdbTerms.HDB_PID_FILE), { force: true });
+				hdbLogger.debug('Starting new process...');
+				if (process.env.HARPER_EXIT_ON_RESTART) {
+					// use this to exit the process so that it will be restarted by the
+					// PM/container/orchestrator.
+					hdbLogger.warn('Exiting Harper process to trigger a container restart');
+					process.exit(0);
+				}
+				// now launch the new process and exit this process
+				await require('./run').launch(true);
+			} catch (error) {
+				hdbLogger.fatal('Restart teardown failed; exiting Harper', error);
+				process.exit(1);
 			}
-			// now launch the new process and exit this process
-			require('./run').launch(true);
 		}, 50); // can't await this because it is going to do an exit(), but wait for 50ms so we give the HTTP thread a
 		// chance to return a response
 	} else {

package/bin/restartExitWatchdog.ts

@@ -0,0 +1,99 @@
+import { spawn, type ChildProcess } from 'node:child_process';
+
+import hdbLogger from '../utility/logging/harper_logger.ts';
+
+// Every way the script below can give up is a silent `exit 0` — an unreadable procfs (a sandbox that
+// does not mount /proc) or a base image without `sleep`. Reporting the watchdog armed in exactly
+// those environments would replace the operator's one signal that teardown is unbounded with a claim
+// that it is not, so arming waits for the script to prove both facilities before it says so.
+export const WATCHDOG_READY_TOKEN = 'harper-restart-exit-watchdog-ready';
+const WATCHDOG_READY_TIMEOUT_MS = 5000;
+
+export const WATCHDOG_SCRIPT = `
+parent_pid=$1
+delay_seconds=$2
+[ "$parent_pid" -gt 1 ] || exit 0
+command -v sleep > /dev/null 2>&1 || exit 0
+# Shell PPID variables are snapshots; procfs reflects reparenting after Harper exits.
+read -r _ _ _ current_parent _ < "/proc/$$/stat" || exit 0
+[ "$current_parent" = "$parent_pid" ] || exit 0
+echo "${WATCHDOG_READY_TOKEN}"
+sleep "$delay_seconds" || exit 0
+read -r _ _ _ current_parent _ < "/proc/$$/stat" || exit 0
+[ "$current_parent" = "$parent_pid" ] || exit 0
+echo "harper: restart exit watchdog force-killing pid $parent_pid after $delay_seconds seconds" >&2
+kill -KILL "$parent_pid"
+`;
+
+export async function armRestartExitWatchdog(timeoutMs: number) {
+	if (process.platform !== 'linux') {
+		hdbLogger.warn('Restart exit watchdog is only available on Linux');
+		return false;
+	}
+	if (process.pid <= 1) {
+		hdbLogger.warn('Restart exit watchdog requires Harper to run below a container init process');
+		return false;
+	}
+	if (!Number.isFinite(timeoutMs) || timeoutMs <= 0) {
+		hdbLogger.warn('Restart exit watchdog requires a positive finite timeout');
+		return false;
+	}
+
+	try {
+		const timeoutSeconds = Math.max(1, Math.ceil(timeoutMs / 1000));
+		const watchdogPath = ['/usr/bin', '/bin', process.env.PATH].filter(Boolean).join(':');
+		const watchdog = spawn(
+			'/bin/sh',
+			['-c', WATCHDOG_SCRIPT, 'harper-restart-exit-watchdog', String(process.pid), String(timeoutSeconds)],
+			{
+				env: { PATH: watchdogPath },
+				stdio: ['ignore', 'pipe', 'inherit'],
+				windowsHide: true,
+			}
+		);
+		// Before the pid check: a spawn failure (EMFILE on the very wedged process this bounds) emits
+		// 'error' asynchronously, and an unhandled one becomes an uncaughtException mid-teardown.
+		watchdog.once('error', (error) => hdbLogger.warn('Restart exit watchdog failed', error));
+		if (watchdog.pid === undefined) {
+			hdbLogger.warn('Restart exit watchdog failed to start');
+			return false;
+		}
+		watchdog.unref();
+
+		const ready = await waitForWatchdogReady(watchdog);
+		// The token is the last thing the script writes to stdout; the force-kill diagnostic goes to the
+		// inherited stderr so it survives a wedged Harper event loop.
+		watchdog.stdout.destroy();
+		if (!ready) {
+			watchdog.kill('SIGKILL');
+			hdbLogger.warn('Restart exit watchdog could not confirm it was armed');
+			return false;
+		}
+		hdbLogger.info(`Restart exit watchdog armed for ${timeoutSeconds} seconds`);
+		return true;
+	} catch (error) {
+		hdbLogger.warn('Restart exit watchdog failed to start', error);
+		return false;
+	}
+}
+
+export function waitForWatchdogReady(watchdog: ChildProcess, timeoutMs = WATCHDOG_READY_TIMEOUT_MS) {
+	return new Promise<boolean>((resolve) => {
+		let settled = false;
+		const settle = (value: boolean) => {
+			if (settled) return;
+			settled = true;
+			clearTimeout(readyTimer);
+			resolve(value);
+		};
+		const readyTimer = setTimeout(() => settle(false), timeoutMs);
+		readyTimer.unref();
+		let output = '';
+		watchdog.stdout?.on('data', (chunk) => {
+			output += chunk;
+			if (output.includes(WATCHDOG_READY_TOKEN)) settle(true);
+		});
+		watchdog.once('error', () => settle(false));
+		watchdog.once('exit', () => settle(false));
+	});
+}

package/bin/run.ts

@@ -23,6 +23,7 @@ import { compactOnStart, migrateOnStart } from './copyDb.ts';
 import minimist from 'minimist';
 import * as keys from '../security/keys.ts';
 import { startHTTPThreads } from '../server/threads/socketRouter.ts';
+import { beginProcessShutdown } from '../server/threads/manageThreads.js';
 import * as hdbInfoController from '../dataLayer/hdbInfoController.ts';
 import { isReadOnlyMode } from '../resources/databases.ts';
 import { getThisNodeName } from '../server/nodeName.ts';
@@ -51,21 +52,25 @@ function addUnhandleRejectionListener() {
 function addExitListeners() {
 	if (!skipExitListeners) {
 		const removeHdbPid = () => {
-			fs.removeSync(path.join(env.get(terms.CONFIG_PARAMS.ROOTPATH), terms.HDB_PID_FILE));
-			process.exit(0);
+			try {
+				fs.removeSync(path.join(env.get(terms.CONFIG_PARAMS.ROOTPATH), terms.HDB_PID_FILE));
+			} catch (error) {
+				hdbLogger.error('Unable to remove the Harper pid file during shutdown', error);
+			}
 		};
+		// Forward defence, not load-bearing today: nothing below can reach a worker start.
 		process.on('exit', () => {
+			beginProcessShutdown();
 			removeHdbPid();
 		});
-		process.on('SIGINT', () => {
+		const exit = () => {
+			beginProcessShutdown();
 			removeHdbPid();
-		});
-		process.on('SIGQUIT', () => {
-			removeHdbPid();
-		});
-		process.on('SIGTERM', () => {
-			removeHdbPid();
-		});
+			process.exit(0);
+		};
+		process.on('SIGINT', exit);
+		process.on('SIGQUIT', exit);
+		process.on('SIGTERM', exit);
 	}
 }
 
@@ -262,6 +267,7 @@ async function launch(exit = true) {
 	}
 }
 
+export { addExitListeners };
 export { launch };
 export { main };
 export { startupLog };

package/components/status/crossThread.ts

@@ -6,7 +6,11 @@
  */
 
 import { sendItcEvent } from '../../server/threads/itc.js';
-import { getWorkerIndex, onMessageByType, getWorkerCount } from '../../server/threads/manageThreads.js';
+import {
+	getWorkerIndex,
+	onMessageByType,
+	getEligibleBroadcastRecipientThreadIds,
+} from '../../server/threads/manageThreads.js';
 import { ITC_EVENT_TYPES } from '../../utility/hdbTerms.ts';
 import { loggerWithTag } from '../../utility/logging/logger.ts';
 import { ComponentStatusRegistry } from './ComponentStatusRegistry.ts';
@@ -21,13 +25,27 @@ import {
 import { ITCError } from './errors.ts';
 
 const logger = loggerWithTag('componentStatus.crossThread');
+const THREAD_IDENTITY_SEPARATOR = '#thread-';
+const STATUS_PRIORITY = [
+	COMPONENT_STATUS_LEVELS.ERROR,
+	COMPONENT_STATUS_LEVELS.WARNING,
+	COMPONENT_STATUS_LEVELS.LOADING,
+	COMPONENT_STATUS_LEVELS.UNKNOWN,
+	COMPONENT_STATUS_LEVELS.HEALTHY,
+];
+
+function stripThreadIdentity(statusKey: string): string {
+	const threadLabelStart = statusKey.lastIndexOf('@') + 1;
+	const identityIndex = statusKey.indexOf(THREAD_IDENTITY_SEPARATOR, threadLabelStart);
+	return identityIndex === -1 ? statusKey : statusKey.substring(0, identityIndex);
+}
 
 /**
  * CrossThreadStatusCollector Class
  * Handles collection of component status from all worker threads
  */
 export class CrossThreadStatusCollector {
-	private awaitingResponses = new Map<number, Array<WorkerComponentStatuses>>();
+	private awaitingResponses = new Map<number, Map<number, WorkerComponentStatuses>>();
 	private responseCheckers = new Map<number, () => void>();
 	private nextRequestId = 1;
 	private listenerAttached = false;
@@ -53,8 +71,9 @@ export class CrossThreadStatusCollector {
 
 			// Find the pending request by requestId
 			const pendingResponses = this.awaitingResponses.get(message.requestId);
-			if (pendingResponses) {
-				pendingResponses.push({
+			if (pendingResponses && typeof message.threadId === 'number') {
+				pendingResponses.set(message.threadId, {
+					threadId: message.threadId,
 					workerIndex: message.workerIndex,
 					isMainThread: message.isMainThread || false,
 					statuses: message.statuses || [],
@@ -115,15 +134,10 @@ export class CrossThreadStatusCollector {
 
 			// Generate unique request ID and set up response collection
 			const requestId = this.nextRequestId++;
-			const responses: Array<WorkerComponentStatuses> = [];
+			const responses = new Map<number, WorkerComponentStatuses>();
 			this.awaitingResponses.set(requestId, responses);
 
-			// Calculate expected number of responses
-			// Total threads = main thread (1) + worker threads (workerCount)
-			const workerCount = getWorkerCount() || 1;
-			const totalThreads = workerCount + 1;
-			// We expect responses from all threads except ourselves
-			const expectedResponses = totalThreads - 1;
+			const expectedThreadIds = getEligibleBroadcastRecipientThreadIds();
 
 			// Set up response collection with timeout
 			const responsePromise = new Promise<Array<WorkerComponentStatuses>>((resolve, reject) => {
@@ -132,26 +146,28 @@ export class CrossThreadStatusCollector {
 				// Check if we've received all expected responses
 				const checkComplete = () => {
 					const collectedResponses = this.awaitingResponses.get(requestId);
-					if (collectedResponses && collectedResponses.length >= expectedResponses && !resolved) {
-						resolved = true;
-						cleanup();
-						logger.trace?.(`Collected all ${collectedResponses.length} expected responses for request ${requestId}`);
-						resolve(collectedResponses);
+					if (!collectedResponses || resolved) return;
+					for (const threadId of expectedThreadIds) {
+						if (!collectedResponses.has(threadId)) return;
 					}
+					resolved = true;
+					cleanup();
+					logger.trace?.(`Collected all ${collectedResponses.size} expected responses for request ${requestId}`);
+					resolve([...collectedResponses.values()]);
 				};
 
 				// Set up timeout as fallback
 				const timeoutHandle = setTimeout(() => {
 					if (!resolved) {
 						resolved = true;
-						const collectedResponses = this.awaitingResponses.get(requestId) || [];
+						const collectedResponses = this.awaitingResponses.get(requestId) || new Map();
 						this.awaitingResponses.delete(requestId);
 						// Log timeout with diagnostic info
 						logger.debug?.(
-							`Collection timeout for request ${requestId}: collected ${collectedResponses.length}/${expectedResponses} responses`
+							`Collection timeout for request ${requestId}: collected ${collectedResponses.size}/${expectedThreadIds.size} responses`
 						);
 						// Resolve with whatever we've collected so far
-						resolve(collectedResponses);
+						resolve([...collectedResponses.values()]);
 					}
 				}, this.timeout);
 
@@ -196,20 +212,14 @@ export class CrossThreadStatusCollector {
 			const localThreadLabel = localWorkerIndex === undefined ? 'main' : `worker-${localWorkerIndex}`;
 
 			for (const [name, status] of localStatuses) {
-				aggregatedStatuses.set(`${name}@${localThreadLabel}`, {
-					...status,
-					workerIndex: localWorkerIndex,
-				});
+				this.setThreadStatus(aggregatedStatuses, name, localThreadLabel, status, localWorkerIndex);
 			}
 
 			// Add responses from other threads
 			for (const response of collectedResponses) {
+				const threadLabel = response.isMainThread ? 'main' : `worker-${response.workerIndex}`;
 				for (const [name, status] of response.statuses) {
-					const threadLabel = response.isMainThread ? 'main' : `worker-${response.workerIndex}`;
-					aggregatedStatuses.set(`${name}@${threadLabel}`, {
-						...status,
-						workerIndex: response.workerIndex,
-					});
+					this.setThreadStatus(aggregatedStatuses, name, threadLabel, status, response.workerIndex, response.threadId);
 				}
 			}
 
@@ -232,6 +242,26 @@ export class CrossThreadStatusCollector {
 		}
 	}
 
+	private setThreadStatus(
+		statuses: Map<string, ComponentStatusSummary>,
+		name: string,
+		threadLabel: string,
+		status: ComponentStatusSummary,
+		workerIndex: number | undefined,
+		threadId?: number
+	): void {
+		const baseKey = `${name}@${threadLabel}`;
+		let key = baseKey;
+		if (statuses.has(baseKey)) {
+			if (threadId === undefined) throw new Error(`Physical thread identity is required for duplicate ${baseKey}`);
+			key += `${THREAD_IDENTITY_SEPARATOR}${threadId}`;
+		}
+		statuses.set(key, {
+			...status,
+			workerIndex,
+		});
+	}
+
 	/**
 	 * Get status from local thread only (fallback when cross-thread collection fails)
 	 */
@@ -242,10 +272,7 @@ export class CrossThreadStatusCollector {
 		const localThreadLabel = localWorkerIndex === undefined ? 'main' : `worker-${localWorkerIndex}`;
 
 		for (const [name, status] of localStatuses) {
-			fallbackStatuses.set(`${name}@${localThreadLabel}`, {
-				...status,
-				workerIndex: localWorkerIndex,
-			});
+			this.setThreadStatus(fallbackStatuses, name, localThreadLabel, status, localWorkerIndex);
 		}
 		return fallbackStatuses;
 	}
@@ -318,7 +345,8 @@ export class StatusAggregator {
 		// Analyze all instances of this component
 		for (const [nameWithThread, status] of statusEntries) {
 			const atIndex = nameWithThread.lastIndexOf('@');
-			const threadLabel = atIndex !== -1 ? nameWithThread.substring(atIndex + 1) : '';
+			const threadLabelWithIdentity = atIndex !== -1 ? nameWithThread.substring(atIndex + 1) : '';
+			const threadLabel = stripThreadIdentity(threadLabelWithIdentity);
 
 			// Convert lastChecked to ms since epoch
 			const checkTime =
@@ -330,7 +358,7 @@ export class StatusAggregator {
 			} else if (threadLabel && threadLabel.startsWith('worker-')) {
 				const workerIndex = parseInt(threadLabel.substring(7)); // 'worker-'.length = 7
 				if (!isNaN(workerIndex)) {
-					lastCheckedTimes.workers[workerIndex] = checkTime;
+					lastCheckedTimes.workers[workerIndex] = Math.max(lastCheckedTimes.workers[workerIndex] ?? 0, checkTime);
 				}
 			}
 
@@ -360,7 +388,12 @@ export class StatusAggregator {
 			// There are inconsistencies - populate abnormalities
 			for (const [nameWithThread, status] of statusEntries) {
 				if (status.status !== determinedStatus) {
-					abnormalities.set(nameWithThread, {
+					const publicNameWithThread = stripThreadIdentity(nameWithThread);
+					const existing = abnormalities.get(publicNameWithThread);
+					if (existing && STATUS_PRIORITY.indexOf(existing.status) <= STATUS_PRIORITY.indexOf(status.status)) {
+						continue;
+					}
+					abnormalities.set(publicNameWithThread, {
 						workerIndex: status.workerIndex !== undefined ? status.workerIndex : -1,
 						status: status.status,
 						message: status.message,
@@ -391,15 +424,7 @@ export class StatusAggregator {
 	 * Determine overall status based on priority
 	 */
 	private static determineOverallStatus(statusCounts: Map<ComponentStatusLevel, number>): ComponentStatusLevel {
-		const statusPriority = [
-			COMPONENT_STATUS_LEVELS.ERROR,
-			COMPONENT_STATUS_LEVELS.WARNING,
-			COMPONENT_STATUS_LEVELS.LOADING,
-			COMPONENT_STATUS_LEVELS.UNKNOWN,
-			COMPONENT_STATUS_LEVELS.HEALTHY,
-		];
-
-		for (const priorityStatus of statusPriority) {
+		for (const priorityStatus of STATUS_PRIORITY) {
 			if (statusCounts.has(priorityStatus) && statusCounts.get(priorityStatus)! > 0) {
 				return priorityStatus;
 			}

package/components/status/types.ts

@@ -75,6 +75,7 @@ export interface AggregatedComponentStatus {
  * Component status information from a worker thread
  */
 export interface WorkerComponentStatuses {
+	threadId?: number;
 	workerIndex: number | undefined;
 	isMainThread: boolean;
 	statuses: Array<[string, ComponentStatusSummary]>;

package/dist/bin/restart.js

@@ -51,6 +51,7 @@ const envMgr = __importStar(require("../utility/environment/environmentManager.j
 const path = __importStar(require("node:path"));
 const node_fs_1 = require("node:fs");
 const nodeName_ts_1 = require("../server/nodeName.js");
+const restartExitWatchdog_ts_1 = require("./restartExitWatchdog.js");
 envMgr.initSync();
 const RESTART_RESPONSE = `Restarting Harper. This may take up to ${hdbTerms.RESTART_TIMEOUT_MS / 1000} seconds.`;
 const INVALID_SERVICE_ERR = 'Invalid service';
@@ -86,30 +87,47 @@ async function restart(req) {
     }
     if (worker_threads_1.isMainThread) {
         harper_logger_ts_1.default.notify(RESTART_RESPONSE);
-        if (envMgr.get(hdbTerms.CONFIG_PARAMS.STORAGE_COMPACTONSTART))
+        if (envMgr.get(hdbTerms.CONFIG_PARAMS.STORAGE_COMPACTONSTART)) {
+            harper_logger_ts_1.default.info('Compacting storage before restart; the restart timeout begins after compaction completes');
             await (0, copyDb_ts_1.compactOnStart)();
+        }
         setTimeout(async () => {
-            // It seems like you should just be able to start the other process and kill this process and everything should
-            // be cleaned up, however that doesn't work for some reason; the socket listening fds somehow get transferred to the
-            // child process if they are not explicitly closed. And when transferred they are orphaned listening, accepting
-            // connections and hanging. So we need to explicitly close down all the workers and then start the new process
-            // and shut down.
-            harper_logger_ts_1.default.debug('Shutdown workers');
-            await (0, manageThreads_js_1.shutdownWorkersNow)();
-            const { closeServers } = require('../server/threads/threadServer.js');
-            await closeServers();
-            await processMan.cleanupChildrenProcesses(false);
-            // remove pid file so it doesn't trip up the launch
-            (0, node_fs_1.unlinkSync)(path.join(envMgr.get(hdbTerms.CONFIG_PARAMS.ROOTPATH), hdbTerms.HDB_PID_FILE));
-            harper_logger_ts_1.default.debug('Starting new process...');
-            if (process.env.HARPER_EXIT_ON_RESTART) {
-                // use this to exit the process so that it will be restarted by the
-                // PM/container/orchestrator.
-                harper_logger_ts_1.default.warn('Exiting Harper process to trigger a container restart');
-                process.exit(0);
+            try {
+                // Latch before the watchdog handshake, not at shutdownWorkersNow() below: a component's
+                // debounced requestRestart() landing in between would otherwise reload root components and
+                // pre-start an HTTP replacement into a process that is already exiting.
+                (0, manageThreads_js_1.beginProcessShutdown)();
+                // Off Linux the watchdog can never arm, and armRestartExitWatchdog() has already warned.
+                if (process.env.HARPER_EXIT_ON_RESTART &&
+                    !(await (0, restartExitWatchdog_ts_1.armRestartExitWatchdog)(hdbTerms.RESTART_TIMEOUT_MS)) &&
+                    process.platform === 'linux')
+                    harper_logger_ts_1.default.error('Restart exit watchdog is unavailable; restart teardown is unbounded');
+                // It seems like you should just be able to start the other process and kill this process and everything should
+                // be cleaned up, however that doesn't work for some reason; the socket listening fds somehow get transferred to the
+                // child process if they are not explicitly closed. And when transferred they are orphaned listening, accepting
+                // connections and hanging. So we need to explicitly close down all the workers and then start the new process
+                // and shut down.
+                harper_logger_ts_1.default.debug('Shutdown workers');
+                await (0, manageThreads_js_1.shutdownWorkersNow)();
+                const { closeServers } = require('../server/threads/threadServer.js');
+                await closeServers();
+                await processMan.cleanupChildrenProcesses(false);
+                // remove pid file so it doesn't trip up the launch
+                (0, node_fs_1.rmSync)(path.join(envMgr.get(hdbTerms.CONFIG_PARAMS.ROOTPATH), hdbTerms.HDB_PID_FILE), { force: true });
+                harper_logger_ts_1.default.debug('Starting new process...');
+                if (process.env.HARPER_EXIT_ON_RESTART) {
+                    // use this to exit the process so that it will be restarted by the
+                    // PM/container/orchestrator.
+                    harper_logger_ts_1.default.warn('Exiting Harper process to trigger a container restart');
+                    process.exit(0);
+                }
+                // now launch the new process and exit this process
+                await require('./run').launch(true);
+            }
+            catch (error) {
+                harper_logger_ts_1.default.fatal('Restart teardown failed; exiting Harper', error);
+                process.exit(1);
             }
-            // now launch the new process and exit this process
-            require('./run').launch(true);
         }, 50); // can't await this because it is going to do an exit(), but wait for 50ms so we give the HTTP thread a
         // chance to return a response
     }

package/dist/bin/restart.js.map

@@ -1 +1 @@
-{"version":3,"file":"restart.js","sourceRoot":"","sources":["../../bin/restart.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"restart.js","sourceRoot":"","sources":["../../bin/restart.ts"],"names":[],"mappings":"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"}

package/dist/bin/restartExitWatchdog.d.ts

@@ -0,0 +1,5 @@
+import { type ChildProcess } from 'node:child_process';
+export declare const WATCHDOG_READY_TOKEN = "harper-restart-exit-watchdog-ready";
+export declare const WATCHDOG_SCRIPT = "\nparent_pid=$1\ndelay_seconds=$2\n[ \"$parent_pid\" -gt 1 ] || exit 0\ncommand -v sleep > /dev/null 2>&1 || exit 0\n# Shell PPID variables are snapshots; procfs reflects reparenting after Harper exits.\nread -r _ _ _ current_parent _ < \"/proc/$$/stat\" || exit 0\n[ \"$current_parent\" = \"$parent_pid\" ] || exit 0\necho \"harper-restart-exit-watchdog-ready\"\nsleep \"$delay_seconds\" || exit 0\nread -r _ _ _ current_parent _ < \"/proc/$$/stat\" || exit 0\n[ \"$current_parent\" = \"$parent_pid\" ] || exit 0\necho \"harper: restart exit watchdog force-killing pid $parent_pid after $delay_seconds seconds\" >&2\nkill -KILL \"$parent_pid\"\n";
+export declare function armRestartExitWatchdog(timeoutMs: number): Promise<boolean>;
+export declare function waitForWatchdogReady(watchdog: ChildProcess, timeoutMs?: number): Promise<boolean>;