@kapeta/local-cluster-service 0.10.1 → 0.11.1

package/src/instanceManager.ts

@@ -1,5 +1,6 @@
 import _ from 'lodash';
 import request from 'request';
+import AsyncLock from 'async-lock';
 import { BlockInstanceRunner } from './utils/BlockInstanceRunner';
 import { storageService } from './storageService';
 import { socketManager } from './socketManager';
@@ -25,6 +26,8 @@ export class InstanceManager {
 
     private readonly _instances: InstanceInfo[] = [];
 
+    private readonly instanceLocks:AsyncLock = new AsyncLock();
+
     constructor() {
         this._instances = storageService.section('instances', []);
 
@@ -67,6 +70,44 @@ export class InstanceManager {
         return this._instances.find((i) => i.systemId === systemId && i.instanceId === instanceId);
     }
 
+
+    private async exclusive<T = any>(systemId: string, instanceId: string, fn: () => Promise<T>) {
+        systemId = normalizeKapetaUri(systemId);
+        const key = `${systemId}/${instanceId}`;
+        return this.instanceLocks.acquire(key, fn);
+    }
+
+
+    public async getLogs(systemId: string, instanceId: string):Promise<LogEntry[]> {
+        const instance = this.getInstance(systemId, instanceId);
+        if (!instance) {
+            throw new Error(`Instance ${systemId}/${instanceId} not found`);
+        }
+
+        switch (instance.type) {
+            case InstanceType.DOCKER:
+                 return await containerManager.getLogs(instance);
+
+            case InstanceType.UNKNOWN:
+                return [{
+                    level: 'INFO',
+                    message: 'Instance is starting...',
+                    time: Date.now(),
+                    source: 'stdout',
+                }];
+
+            case InstanceType.LOCAL:
+                return [{
+                    level: 'INFO',
+                    message: 'Instance started outside Kapeta - logs not available...',
+                    time: Date.now(),
+                    source: 'stdout',
+                }];
+        }
+
+        return [];
+    }
+
     public async saveInternalInstance(instance: InstanceInfo) {
         instance.systemId = normalizeKapetaUri(instance.systemId);
         if (instance.ref) {
@@ -111,75 +152,76 @@ export class InstanceManager {
         instanceId: string,
         info: Omit<InstanceInfo, 'systemId' | 'instanceId'>
     ) {
-        systemId = normalizeKapetaUri(systemId);
+        return this.exclusive(systemId, instanceId, async () => {
+            systemId = normalizeKapetaUri(systemId);
 
-        let instance = this.getInstance(systemId, instanceId);
+            let instance = this.getInstance(systemId, instanceId);
 
-        //Get target address
-        const address = await serviceManager.getProviderAddress(
-            systemId,
-            instanceId,
-            info.portType ?? DEFAULT_HEALTH_PORT_TYPE
-        );
+            //Get target address
+            const address = await serviceManager.getProviderAddress(
+                systemId,
+                instanceId,
+                info.portType ?? DEFAULT_HEALTH_PORT_TYPE
+            );
 
-        const healthUrl = this.getHealthUrl(info, address);
+            const healthUrl = this.getHealthUrl(info, address);
 
-        if (instance) {
-            if (instance.status === InstanceStatus.STOPPING && instance.desiredStatus === DesiredInstanceStatus.STOP) {
-                //If instance is stopping do not interfere
-                return;
-            }
-
-            if (info.owner === InstanceOwner.EXTERNAL) {
-                //If instance was started externally - then we want to replace the internal instance with that
-                if (
-                    instance.owner === InstanceOwner.INTERNAL &&
-                    (instance.status === InstanceStatus.READY ||
-                        instance.status === InstanceStatus.STARTING ||
-                        instance.status === InstanceStatus.UNHEALTHY)
-                ) {
-                    throw new Error(`Instance ${instanceId} is already running`);
+            if (instance) {
+                if (instance.status === InstanceStatus.STOPPING && instance.desiredStatus === DesiredInstanceStatus.STOP) {
+                    //If instance is stopping do not interfere
+                    return;
                 }
 
-                instance.desiredStatus = info.desiredStatus;
-                instance.owner = info.owner;
-                instance.internal = undefined;
-                instance.status = InstanceStatus.STARTING;
-                instance.startedAt = Date.now();
-            }
+                if (info.owner === InstanceOwner.EXTERNAL) {
+                    //If instance was started externally - then we want to replace the internal instance with that
+                    if (
+                        instance.owner === InstanceOwner.INTERNAL &&
+                        (instance.status === InstanceStatus.READY ||
+                            instance.status === InstanceStatus.STARTING ||
+                            instance.status === InstanceStatus.UNHEALTHY)
+                    ) {
+                        throw new Error(`Instance ${instanceId} is already running`);
+                    }
 
-            instance.pid = info.pid;
-            instance.address = address;
-            if (info.type) {
-                instance.type = info.type;
-            }
-            if (healthUrl) {
-                instance.health = healthUrl;
-            }
+                    instance.desiredStatus = info.desiredStatus;
+                    instance.owner = info.owner;
+                    instance.status = InstanceStatus.STARTING;
+                    instance.startedAt = Date.now();
+                }
 
-            this.emitSystemEvent(systemId, EVENT_STATUS_CHANGED, instance);
-        } else {
-            //If instance was not found - then we're receiving an externally started instance
-            instance = {
-                ...info,
-                systemId,
-                instanceId,
-                status: InstanceStatus.STARTING,
-                startedAt: Date.now(),
-                desiredStatus: DesiredInstanceStatus.EXTERNAL,
-                owner: InstanceOwner.EXTERNAL,
-                health: healthUrl,
-                address,
-            };
+                instance.pid = info.pid;
+                instance.address = address;
+                if (info.type) {
+                    instance.type = info.type;
+                }
+                if (healthUrl) {
+                    instance.health = healthUrl;
+                }
 
-            this._instances.push(instance);
+                this.emitSystemEvent(systemId, EVENT_STATUS_CHANGED, instance);
+            } else {
+                //If instance was not found - then we're receiving an externally started instance
+                instance = {
+                    ...info,
+                    systemId,
+                    instanceId,
+                    status: InstanceStatus.STARTING,
+                    startedAt: Date.now(),
+                    desiredStatus: DesiredInstanceStatus.EXTERNAL,
+                    owner: InstanceOwner.EXTERNAL,
+                    health: healthUrl,
+                    address,
+                };
 
-            this.emitSystemEvent(systemId, EVENT_INSTANCE_CREATED, instance);
-        }
+                this._instances.push(instance);
 
-        this.save();
+                this.emitSystemEvent(systemId, EVENT_INSTANCE_CREATED, instance);
+            }
 
-        return instance;
+            this.save();
+
+            return instance;
+        });
     }
 
     private getHealthUrl(info: Omit<InstanceInfo, 'systemId' | 'instanceId'>, address: string) {
@@ -195,15 +237,17 @@ export class InstanceManager {
     }
 
     public markAsStopped(systemId: string, instanceId: string) {
-        systemId = normalizeKapetaUri(systemId);
-        const instance = _.find(this._instances, { systemId, instanceId });
-        if (instance && instance.owner === InstanceOwner.EXTERNAL && instance.status !== InstanceStatus.STOPPED) {
-            instance.status = InstanceStatus.STOPPED;
-            instance.pid = null;
-            instance.health = null;
-            this.emitSystemEvent(systemId, EVENT_STATUS_CHANGED, instance);
-            this.save();
-        }
+        return this.exclusive(systemId, instanceId, async () => {
+            systemId = normalizeKapetaUri(systemId);
+            const instance = _.find(this._instances, {systemId, instanceId});
+            if (instance && instance.owner === InstanceOwner.EXTERNAL && instance.status !== InstanceStatus.STOPPED) {
+                instance.status = InstanceStatus.STOPPED;
+                instance.pid = null;
+                instance.health = null;
+                this.emitSystemEvent(systemId, EVENT_STATUS_CHANGED, instance);
+                this.save();
+            }
+        })
     }
 
     public async startAllForPlan(systemId: string): Promise<InstanceInfo[]> {
@@ -237,59 +281,67 @@ export class InstanceManager {
         return settled.map((p) => (p.status === 'fulfilled' ? p.value : null)).filter((p) => !!p) as InstanceInfo[];
     }
 
+
     public async stop(systemId: string, instanceId: string) {
-        systemId = normalizeKapetaUri(systemId);
-        const instance = this.getInstance(systemId, instanceId);
-        if (!instance) {
-            return;
-        }
+        return this.stopInner(systemId, instanceId, true);
+    }
 
-        if (instance.status === InstanceStatus.STOPPED) {
-            return;
-        }
+    private async stopInner(systemId: string, instanceId: string, changeDesired:boolean = false) {
+        return this.exclusive(systemId, instanceId, async () => {
+            systemId = normalizeKapetaUri(systemId);
+            const instance = this.getInstance(systemId, instanceId);
+            if (!instance) {
+                return;
+            }
 
-        if (instance.desiredStatus !== DesiredInstanceStatus.EXTERNAL) {
-            instance.desiredStatus = DesiredInstanceStatus.STOP;
-        }
+            if (instance.status === InstanceStatus.STOPPED) {
+                return;
+            }
 
-        instance.status = InstanceStatus.STOPPING;
+            if (changeDesired &&
+                instance.desiredStatus !== DesiredInstanceStatus.EXTERNAL) {
+                instance.desiredStatus = DesiredInstanceStatus.STOP;
+            }
 
-        this.emitSystemEvent(systemId, EVENT_STATUS_CHANGED, instance);
-        console.log('Stopping instance: %s::%s [desired: %s]', systemId, instanceId, instance.desiredStatus);
-        this.save();
+            instance.status = InstanceStatus.STOPPING;
 
-        try {
-            if (instance.type === 'docker') {
-                const containerName = getBlockInstanceContainerName(instance.instanceId);
-                const container = await containerManager.getContainerByName(containerName);
-                if (container) {
-                    try {
-                        await container.stop();
-                        instance.status = InstanceStatus.STOPPED;
-                        this.emitSystemEvent(systemId, EVENT_STATUS_CHANGED, instance);
-                        this.save();
-                    } catch (e) {
-                        console.error('Failed to stop container', e);
+            this.emitSystemEvent(systemId, EVENT_STATUS_CHANGED, instance);
+            console.log('Stopping instance: %s::%s [desired: %s]', systemId, instanceId, instance.desiredStatus);
+            this.save();
+
+            try {
+                if (instance.type === 'docker') {
+                    const containerName = getBlockInstanceContainerName(instance.systemId, instance.instanceId);
+                    const container = await containerManager.getContainerByName(containerName);
+                    if (container) {
+                        try {
+                            await container.stop();
+                            instance.status = InstanceStatus.STOPPED;
+                            this.emitSystemEvent(systemId, EVENT_STATUS_CHANGED, instance);
+                            this.save();
+                        } catch (e) {
+                            console.error('Failed to stop container', e);
+                        }
+                    } else {
+                        console.warn('Container not found', containerName);
                     }
-                } else {
-                    console.warn('Container not found', containerName);
+                    return;
                 }
-                return;
-            }
 
-            if (!instance.pid) {
+                if (!instance.pid) {
+                    instance.status = InstanceStatus.STOPPED;
+                    this.save();
+                    return;
+                }
+
+                process.kill(instance.pid as number, 'SIGTERM');
                 instance.status = InstanceStatus.STOPPED;
+                this.emitSystemEvent(systemId, EVENT_STATUS_CHANGED, instance);
                 this.save();
-                return;
+            } catch (e) {
+                console.error('Failed to stop process', e);
             }
-
-            process.kill(instance.pid as number, 'SIGTERM');
-            instance.status = InstanceStatus.STOPPED;
-            this.emitSystemEvent(systemId, EVENT_STATUS_CHANGED, instance);
-            this.save();
-        } catch (e) {
-            console.error('Failed to stop process', e);
-        }
+        });
     }
 
     public async stopAllForPlan(systemId: string) {
@@ -300,169 +352,134 @@ export class InstanceManager {
     }
 
     public async start(systemId: string, instanceId: string): Promise<InstanceInfo> {
-        systemId = normalizeKapetaUri(systemId);
-        const plan = await assetManager.getPlan(systemId, true);
-        if (!plan) {
-            throw new Error('Plan not found: ' + systemId);
-        }
-
-        const blockInstance = plan.spec && plan.spec.blocks ? _.find(plan.spec.blocks, { id: instanceId }) : null;
-        if (!blockInstance) {
-            throw new Error('Block instance not found: ' + instanceId);
-        }
-
-        const blockRef = normalizeKapetaUri(blockInstance.block.ref);
-
-        const blockAsset = await assetManager.getAsset(blockRef, true);
-        if (!blockAsset) {
-            throw new Error('Block not found: ' + blockRef);
-        }
-
-        const existingInstance = this.getInstance(systemId, instanceId);
-
-        if (existingInstance) {
-            if (existingInstance.status === InstanceStatus.READY) {
-                // Instance is already running
-                return existingInstance;
+        return this.exclusive(systemId, instanceId, async () => {
+            systemId = normalizeKapetaUri(systemId);
+            const plan = await assetManager.getPlan(systemId, true);
+            if (!plan) {
+                throw new Error('Plan not found: ' + systemId);
             }
 
-            if (
-                existingInstance.desiredStatus === DesiredInstanceStatus.RUN &&
-                existingInstance.status === InstanceStatus.STARTING
-            ) {
-                // Internal instance is already starting - don't start it again
-                return existingInstance;
+            const blockInstance = plan.spec && plan.spec.blocks ? _.find(plan.spec.blocks, {id: instanceId}) : null;
+            if (!blockInstance) {
+                throw new Error('Block instance not found: ' + instanceId);
             }
 
-            if (
-                existingInstance.owner === InstanceOwner.EXTERNAL &&
-                existingInstance.status === InstanceStatus.STARTING
-            ) {
-                // External instance is already starting - don't start it again
-                return existingInstance;
-            }
-        }
+            const blockRef = normalizeKapetaUri(blockInstance.block.ref);
 
-        let instance: InstanceInfo = {
-            systemId,
-            instanceId,
-            ref: blockRef,
-            name: blockAsset.data.metadata.name,
-            desiredStatus: DesiredInstanceStatus.RUN,
-            owner: InstanceOwner.INTERNAL,
-            type: InstanceType.UNKNOWN,
-            status: InstanceStatus.STARTING,
-            startedAt: Date.now(),
-        };
-
-        console.log('Starting instance: %s::%s [desired: %s]', systemId, instanceId, instance.desiredStatus);
-        // Save the instance before starting it, so that we can track the status
-        await this.saveInternalInstance(instance);
-
-        if (existingInstance) {
-            // Check if the instance is already running - but after we've commmuicated the desired status
-            const currentStatus = await this.requestInstanceStatus(existingInstance);
-            if (currentStatus === InstanceStatus.READY) {
-                // Instance is already running
-                return existingInstance;
+            const blockAsset = await assetManager.getAsset(blockRef, true);
+            if (!blockAsset) {
+                throw new Error('Block not found: ' + blockRef);
             }
-        }
-
-        const instanceConfig = await configManager.getConfigForSection(systemId, instanceId);
-        const runner = new BlockInstanceRunner(systemId);
 
-        const startTime = Date.now();
-        try {
-            const processInfo = await runner.start(blockRef, instanceId, instanceConfig);
-            //emit stdout/stderr via sockets
-            processInfo.output.on('data', (data: Buffer) => {
-                const payload = {
-                    source: 'stdout',
-                    level: 'INFO',
-                    message: data.toString(),
-                    time: Date.now(),
-                };
-                this.emitInstanceEvent(systemId, instanceId, EVENT_INSTANCE_LOG, payload);
-            });
+            const existingInstance = this.getInstance(systemId, instanceId);
 
-            processInfo.output.on('exit', (exitCode: number) => {
-                const timeRunning = Date.now() - startTime;
-                const instance = this.getInstance(systemId, instanceId);
-                if (instance?.status === InstanceStatus.READY) {
-                    //It's already been running
-                    return;
+            if (existingInstance) {
+                if (existingInstance.status === InstanceStatus.READY) {
+                    // Instance is already running
+                    return existingInstance;
                 }
 
-                if (exitCode === 143 || exitCode === 137) {
-                    //Process got SIGTERM (143) or SIGKILL (137)
-                    //TODO: Windows?
-                    return;
+                if (
+                    existingInstance.desiredStatus === DesiredInstanceStatus.RUN &&
+                    existingInstance.status === InstanceStatus.STARTING
+                ) {
+                    // Internal instance is already starting - don't start it again
+                    return existingInstance;
                 }
 
-                if (exitCode !== 0 || timeRunning < MIN_TIME_RUNNING) {
-                    const instance = this.getInstance(systemId, instanceId);
-                    if (instance) {
-                        instance.status = InstanceStatus.FAILED;
-                        this.save();
-                    }
-
-                    this.emitSystemEvent(systemId, EVENT_INSTANCE_EXITED, {
-                        error: 'Failed to start instance',
-                        status: EVENT_INSTANCE_EXITED,
-                        instanceId: blockInstance.id,
-                    });
+                if (
+                    existingInstance.owner === InstanceOwner.EXTERNAL &&
+                    existingInstance.status === InstanceStatus.STARTING
+                ) {
+                    // External instance is already starting - don't start it again
+                    return existingInstance;
                 }
-            });
+            }
 
-            instance.status = InstanceStatus.READY;
-
-            return this.saveInternalInstance({
-                ...instance,
-                type: processInfo.type,
-                pid: processInfo.pid ?? -1,
-                health: null,
-                portType: processInfo.portType,
-                status: InstanceStatus.READY,
-                internal: {
-                    logs: processInfo.logs,
-                    output: processInfo.output,
-                },
-            });
-        } catch (e: any) {
-            console.warn('Failed to start instance', e);
-            const logs: LogEntry[] = [
-                {
-                    source: 'stdout',
-                    level: 'ERROR',
-                    message: e.message,
-                    time: Date.now(),
-                },
-            ];
-
-            const out = await this.saveInternalInstance({
-                ...instance,
-                type: InstanceType.LOCAL,
-                pid: null,
-                health: null,
-                portType: DEFAULT_HEALTH_PORT_TYPE,
-                status: InstanceStatus.FAILED,
-            });
+            let instance: InstanceInfo = {
+                systemId,
+                instanceId,
+                ref: blockRef,
+                name: blockAsset.data.metadata.name,
+                desiredStatus: DesiredInstanceStatus.RUN,
+                owner: InstanceOwner.INTERNAL,
+                type: existingInstance?.type ?? InstanceType.UNKNOWN,
+                status: InstanceStatus.STARTING,
+                startedAt: Date.now(),
+            };
 
-            this.emitInstanceEvent(systemId, instanceId, EVENT_INSTANCE_LOG, logs[0]);
+            console.log('Starting instance: %s::%s [desired: %s]', systemId, instanceId, instance.desiredStatus);
+            // Save the instance before starting it, so that we can track the status
+            await this.saveInternalInstance(instance);
 
-            this.emitInstanceEvent(systemId, blockInstance.id, EVENT_INSTANCE_EXITED, {
-                error: `Failed to start instance: ${e.message}`,
-                status: EVENT_INSTANCE_EXITED,
-                instanceId: blockInstance.id,
-            });
+            if (existingInstance) {
+                // Check if the instance is already running - but after we've commmuicated the desired status
+                const currentStatus = await this.requestInstanceStatus(existingInstance);
+                if (currentStatus === InstanceStatus.READY) {
+                    // Instance is already running
+                    return existingInstance;
+                }
+            }
 
-            return out;
-        }
+            const instanceConfig = await configManager.getConfigForSection(systemId, instanceId);
+            const runner = new BlockInstanceRunner(systemId);
+
+            const startTime = Date.now();
+            try {
+                const processInfo = await runner.start(blockRef, instanceId, instanceConfig);
+
+                instance.status = InstanceStatus.READY;
+
+                return this.saveInternalInstance({
+                    ...instance,
+                    type: processInfo.type,
+                    pid: processInfo.pid ?? -1,
+                    health: null,
+                    portType: processInfo.portType,
+                    status: InstanceStatus.READY,
+                });
+            } catch (e: any) {
+                console.warn('Failed to start instance', e);
+                const logs: LogEntry[] = [
+                    {
+                        source: 'stdout',
+                        level: 'ERROR',
+                        message: e.message,
+                        time: Date.now(),
+                    },
+                ];
+
+                const out = await this.saveInternalInstance({
+                    ...instance,
+                    type: InstanceType.LOCAL,
+                    pid: null,
+                    health: null,
+                    portType: DEFAULT_HEALTH_PORT_TYPE,
+                    status: InstanceStatus.FAILED,
+                });
+
+                this.emitInstanceEvent(systemId, instanceId, EVENT_INSTANCE_LOG, logs[0]);
+
+                this.emitInstanceEvent(systemId, blockInstance.id, EVENT_INSTANCE_EXITED, {
+                    error: `Failed to start instance: ${e.message}`,
+                    status: EVENT_INSTANCE_EXITED,
+                    instanceId: blockInstance.id,
+                });
+
+                return out;
+            }
+        });
     }
 
     public async restart(systemId: string, instanceId: string) {
         systemId = normalizeKapetaUri(systemId);
-        await this.stop(systemId, instanceId);
+        await this.stopInner(systemId, instanceId);
+
+        const existingInstance = this.getInstance(systemId, instanceId);
+        if (existingInstance?.desiredStatus === DesiredInstanceStatus.STOP) {
+            // Internal instance was marked as stopped - abort restart
+            return existingInstance;
+        }
 
         return this.start(systemId, instanceId);
     }
@@ -482,9 +499,7 @@ export class InstanceManager {
             storageService.put(
                 'instances',
                 this._instances.map((instance) => {
-                    const copy = { ...instance };
-                    delete copy.internal;
-                    return copy;
+                    return { ...instance };
                 })
             );
         } catch (e) {
@@ -498,7 +513,7 @@ export class InstanceManager {
         const all = [...this._instances];
         while (all.length > 0) {
             // Check a few instances at a time - docker doesn't like too many concurrent requests
-            const chunk = all.splice(0, 20);
+            const chunk = all.splice(0, 30);
             const promises = chunk.map(async (instance) => {
                 if (!instance.systemId) {
                     return;
@@ -578,7 +593,7 @@ export class InstanceManager {
                 ) {
                     //If the instance is running but we want it to stop, stop it
                     try {
-                        await this.stop(instance.systemId, instance.instanceId);
+                        await this.stopInner(instance.systemId, instance.instanceId);
                     } catch (e) {
                         console.warn('Failed to stop instance', instance.systemId, instance.instanceId, e);
                     }
@@ -612,7 +627,7 @@ export class InstanceManager {
 
     private async getExternalStatus(instance: InstanceInfo): Promise<InstanceStatus> {
         if (instance.type === InstanceType.DOCKER) {
-            const containerName = getBlockInstanceContainerName(instance.instanceId);
+            const containerName = getBlockInstanceContainerName(instance.systemId, instance.instanceId);
             const container = await containerManager.getContainerByName(containerName);
             if (!container) {
                 // If the container doesn't exist, we consider the instance stopped

package/src/instances/routes.ts

@@ -74,16 +74,21 @@ router.post('/:systemId/:instanceId/stop', async (req: Request, res: Response) =
 /**
  * Get logs for instance in a plan
  */
-router.get('/:systemId/:instanceId/logs', (req: Request, res: Response) => {
+router.get('/:systemId/:instanceId/logs', async (req: Request, res: Response) => {
     const instanceInfo = instanceManager.getInstance(req.params.systemId, req.params.instanceId);
     if (!instanceInfo) {
         res.status(404).send({ ok: false });
         return;
     }
 
-    res.status(202).send({
-        logs: instanceInfo.internal?.logs() ?? [],
-    });
+    try {
+        const logs = await instanceManager.getLogs(req.params.systemId, req.params.instanceId);
+        res.status(200).send({
+            logs,
+        });
+    } catch (e:any) {
+        res.status(500).send({ ok: false, error: e.message });
+    }
 });
 
 /**