From cc9f96b739337ef1e321fa1aeefaa5d84e7d9959 Mon Sep 17 00:00:00 2001
From: Christina Wang <christina@balena.io>
Date: Wed, 20 Apr 2022 15:41:14 -0700
Subject: [PATCH] Also create update lock bind mount dirs on host on startup

Since Supervisor now uses Mounts API, the engine will not auto-create
the bind mount directories. Because update lock directories are in
/tmp, they are removed with every device reboot, so need to be created
on Supervisor startup so that all containers can access them.

Signed-off-by: Christina Wang <christina@balena.io>
---
 src/compose/application-manager.ts           |  1 +
 src/compose/service-manager.ts               | 21 ++++++++++++++------
 test/src/compose/application-manager.spec.ts |  4 ++++
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/compose/application-manager.ts b/src/compose/application-manager.ts
index 30377120..f611d567 100644
--- a/src/compose/application-manager.ts
+++ b/src/compose/application-manager.ts
@@ -135,6 +135,7 @@ export const initialized = (async () => {
 	await cleanup();
 
 	await localModeManager.init();
+	await serviceManager.createBindDirs();
 	await serviceManager.attachToRunning();
 	serviceManager.listenToEvents();
 
diff --git a/src/compose/service-manager.ts b/src/compose/service-manager.ts
index 29363c8e..67ecb584 100644
--- a/src/compose/service-manager.ts
+++ b/src/compose/service-manager.ts
@@ -275,12 +275,7 @@ async function create(service: Service) {
 		logger.logSystemEvent(LogTypes.installService, { service });
 		reportNewStatus(mockContainerId, service, 'Installing');
 
-		// Create directories on host for update lock binds, since Supervisor uses the
-		// Docker Mounts API which means an engine error is thrown if bind doesn't exist on host.
-		const lockDirPath = getPathOnHost(
-			`${BASE_LOCK_DIR}/${service.appId}/${service.serviceName}`,
-		);
-		await mkdirp(lockDirPath);
+		await createBindDir(service.appId, service.serviceName);
 
 		const container = await docker.createContainer(conf);
 		service.containerId = container.id;
@@ -491,6 +486,20 @@ export async function attachToRunning() {
 	}
 }
 
+async function createBindDir(appId: number, serviceName: string) {
+	const lockDirPath = getPathOnHost(`${BASE_LOCK_DIR}/${appId}/${serviceName}`);
+	await mkdirp(lockDirPath);
+}
+
+// Create directories on host for update lock binds, since Supervisor uses the
+// Docker Mounts API which means an engine error is thrown if bind doesn't exist on host.
+export async function createBindDirs() {
+	const services = await getAll();
+	for (const service of services) {
+		await createBindDir(service.appId, service.serviceName);
+	}
+}
+
 async function getContainerIdMap(
 	appIdOrUuid: number | string,
 ): Promise<Dictionary<string>> {
diff --git a/test/src/compose/application-manager.spec.ts b/test/src/compose/application-manager.spec.ts
index 2d734b99..8e4ad23e 100644
--- a/test/src/compose/application-manager.spec.ts
+++ b/test/src/compose/application-manager.spec.ts
@@ -15,6 +15,7 @@ import log from '../../../src/lib/supervisor-console';
 import { InstancedAppState } from '../../../src/types/state';
 
 import * as dbHelper from '../../lib/db-helper';
+import * as fsUtils from '../../../src/lib/fs-utils';
 
 const DEFAULT_NETWORK = Network.fromComposeObject('default', 1, 'appuuid', {});
 
@@ -179,6 +180,9 @@ describe('compose/application-manager', () => {
 		// Stub methods that depend on external dependencies
 		stub(imageManager, 'isCleanupNeeded');
 		stub(networkManager, 'supervisorNetworkReady');
+
+		// Stub mkdirp call for service manager bind directory creation
+		stub(fsUtils, 'mkdirp').resolves();
 	});
 
 	beforeEach(() => {