From 3343d53d753d0099c8d4791fa052e41fe67e406d Mon Sep 17 00:00:00 2001 From: Hornwitser Date: Fri, 3 Apr 2020 22:22:23 +0200 Subject: [PATCH] Allow deleting unassigned instances Handle delete instance requests for instances that are not assigned to a slave. --- master.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/master.js b/master.js index c8529f77..5bbb2f20 100644 --- a/master.js +++ b/master.js @@ -411,6 +411,18 @@ class ControlConnection extends BaseConnection { db.instances.set(instanceId, instanceConfig); } + async deleteInstanceRequestHandler(message, request) { + let instanceConfig = db.instances.get(message.data.instance_id); + if (!instanceConfig) { + throw new errors.RequestError(`Instance with ID ${message.data.instance_id} does not exist`); + } + + if (instanceConfig.get('instance.assigned_slave') !== null) { + await this.forwardRequestToInstance(message, request); + } + db.instances.delete(message.data.instance_id); + } + async getInstanceConfigRequestHandler(message) { let instanceConfig = db.instances.get(message.data.instance_id); if (!instanceConfig) {