cleanup

Author: Daan Hoogland

engine/schema/src/main/resources/META-INF/db/schema-41910to41920.sql

@@ -43,7 +43,3 @@ CALL `cloud`.`IDEMPOTENT_UPDATE_API_PERMISSION`('Read-Only Admin - Default', 'va
 
 CALL `cloud`.`IDEMPOTENT_UPDATE_API_PERMISSION`('Support Admin - Default', 'setupUserTwoFactorAuthentication', 'ALLOW');
 CALL `cloud`.`IDEMPOTENT_UPDATE_API_PERMISSION`('Support Admin - Default', 'validateUserTwoFactorAuthenticationCode', 'ALLOW');
-
--- add status warn and unknown to router health checks
-
-CALL `cloud`.`IDEMPOTENT_CHANGE_COLUMN`('cloud.router_health_check', 'check_result', 'check_result', 'VACHAR(16) NOT NULL COMMENT "check executions for success or (fatal) failure"')

engine/schema/src/main/resources/META-INF/db/schema-42000to42010.sql

@@ -128,9 +128,3 @@ CALL `cloud`.`IDEMPOTENT_UPDATE_API_PERMISSION`('Read-Only Admin - Default', 'va
 
 CALL `cloud`.`IDEMPOTENT_UPDATE_API_PERMISSION`('Support Admin - Default', 'setupUserTwoFactorAuthentication', 'ALLOW');
 CALL `cloud`.`IDEMPOTENT_UPDATE_API_PERMISSION`('Support Admin - Default', 'validateUserTwoFactorAuthenticationCode', 'ALLOW');
-
--- Re-apply VPC: update default network offering for vpc tier to conserve_mode=1 (#8309)
-UPDATE `cloud`.`network_offerings` SET conserve_mode=1 WHERE name='DefaultIsolatedNetworkOfferingForVpcNetworks';
-
--- health check status as enum
-CALL `cloud`.`IDEMPOTENT_CHANGE_COLUMN`('router_health_check', 'check_result', 'check_result', 'varchar(16) NOT NULL COMMENT "check executions result: SUCCESS, FAILURE, WARNING, UNKNOWN"');

engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql

@@ -755,5 +755,8 @@ SET `cs`.`domain_id` = (
     WHERE `acc`.`id` = `cs`.`account_id`
 );
 
+-- health check status as enum
+CALL `cloud`.`IDEMPOTENT_CHANGE_COLUMN`('router_health_check', 'check_result', 'check_result', 'varchar(16) NOT NULL COMMENT "check executions result: SUCCESS, FAILURE, WARNING, UNKNOWN"');
+
 -- Re-apply VPC: update default network offering for vpc tier to conserve_mode=1 (#8309)
 UPDATE `cloud`.`network_offerings` SET conserve_mode = 1 WHERE name = 'DefaultIsolatedNetworkOfferingForVpcNetworks';

engine/schema/src/main/resources/META-INF/db/schema-42010to42100cleanup.sql

@@ -306,8 +306,9 @@ def execute(script, checkType = "basic"):
     output = pout.communicate()[0].decode().strip()
     checkEndTime = time.time()
 
-    if not len(output) > 0:
-        output = ""
+    # we run all scripts and have to ignore the ones that do nothing
+    if not len(output) > 0 and exitStatus == 0:
+        return {}
 
     routerHealth = RouterHealthStatus.SUCCESS
     match exitStatus: