Merge pull request #693 from globocom/fix-merge-ssddisk-migratedccc-fixbugs

ricardosdias · web-flow · commit 3ea97faaaf50 · 2022-01-24T06:30:21.000-03:00
Fix merge ssddisk migratedccc fixbugs
diff --git a/dbaas/drivers/replication_topologies/base.py b/dbaas/drivers/replication_topologies/base.py
@@ -426,9 +426,10 @@ def get_database_migrate_steps_stage_1(self):
             'Configuring database': (
                 'workflow.steps.util.volume_provider.AttachDataVolume',
                 'workflow.steps.util.volume_provider.MountDataVolume',
+                'workflow.steps.util.plan.Configure',
                 'workflow.steps.util.plan.Initialization',
-                'workflow.steps.util.plan.ConfigureLog',
                 'workflow.steps.util.metric_collector.ConfigureTelegraf',
+                'workflow.steps.util.plan.Configure',
             )}, {
             'Backup and restore': (
                 'workflow.steps.util.volume_provider.TakeSnapshotMigrate',
diff --git a/dbaas/drivers/replication_topologies/mongodb.py b/dbaas/drivers/replication_topologies/mongodb.py
@@ -1156,8 +1156,10 @@ def get_database_migrate_steps_stage_3(self):
                 'workflow.steps.util.infra.DisableSourceInstances',
                 'workflow.steps.util.database.StopSourceDatabaseMigrate',
             )}, {
-            'Cleaning up': (
+            'Removing Disks': (
                 'workflow.steps.util.volume_provider.DestroyOldEnvironment',
+            )}, {
+            'Cleaning up': (
                 'workflow.steps.util.host_provider.DestroyVirtualMachineMigrate',
                 'workflow.steps.util.host_provider.DestroyIPMigrate',
                 'workflow.steps.util.host_provider.DestroyServiceAccountMigrate',
diff --git a/dbaas/drivers/replication_topologies/mysql.py b/dbaas/drivers/replication_topologies/mysql.py
@@ -1538,8 +1538,10 @@ def get_database_migrate_steps_stage_3(self):
                 'workflow.steps.util.vip_provider.DestroySourceIPMigrateMigrate',
                 'workflow.steps.util.vip_provider.DestroySourceVipDatabaseMigrate',
             )}, {
-            'Cleaning up': (
+            'Removing Disks': (
                 'workflow.steps.util.volume_provider.DestroyOldEnvironment',
+            )}, {
+            'Cleaning up': (
                 'workflow.steps.util.host_provider.DestroyVirtualMachineMigrate',
                 'workflow.steps.util.host_provider.DestroyIPMigrate',
                 'workflow.steps.util.host_provider.DestroyServiceAccountMigrate',
diff --git a/dbaas/drivers/replication_topologies/redis.py b/dbaas/drivers/replication_topologies/redis.py
@@ -1040,9 +1040,9 @@ def get_database_migrate_steps_stage_3(self):
                 'workflow.steps.redis.cluster.CheckClusterStatus',
                 'workflow.steps.util.infra.DisableSourceInstances',
                 'workflow.steps.util.database.StopSourceDatabaseMigrate',
+                'workflow.steps.util.volume_provider.DestroyOldEnvironment',
             )}, {
             'Cleaning up 2': (
-                'workflow.steps.util.volume_provider.DestroyOldEnvironment',
                 'workflow.steps.util.host_provider.DestroyVirtualMachineMigrate',
                 'workflow.steps.util.host_provider.DestroyIPMigrate',
                 'workflow.steps.util.host_provider.DestroyServiceAccountMigrate',
diff --git a/dbaas/maintenance/tasks_database_migrate.py b/dbaas/maintenance/tasks_database_migrate.py
@@ -142,8 +142,8 @@ def database_environment_migrate(
 ):
 
     infra = database.infra
-    database.infra.disk_offering_type = database.infra.disk_offering_type.get_type_to(new_environment)
-    database.save()
+    #database.infra.disk_offering_type = database.infra.disk_offering_type.get_type_to(new_environment)
+    #database.save()
     if step_manager:
         migration_stage = step_manager.migration_stage
         if not can_migrate(database, task, migration_stage, False):
@@ -193,6 +193,7 @@ def database_environment_migrate(
             infra.plan = infra.plan.get_equivalent_plan_for_env(
                 database_migrate.environment
             )
+            infra.disk_offering_type = infra.disk_offering_type.get_type_to(new_environment)
             infra.migration_stage = infra.NOT_STARTED
             infra.save()
         database_migrate.set_success()
diff --git a/dbaas/physical/admin/__init__.py b/dbaas/physical/admin/__init__.py
@@ -18,6 +18,7 @@
 from .ip import IpAdmin
 from .vip import VipAdmin
 from .vip_instance_group import VipInstanceGroupAdmin
+from .disk_offering_type import DiskOfferingTypeAdmin
 from .script import ScriptAdmin
 
 admin.site.register(models.DatabaseInfra, DatabaseInfraAdmin)
@@ -38,5 +39,6 @@
 admin.site.register(models.Ip, IpAdmin)
 admin.site.register(models.Vip, VipAdmin)
 admin.site.register(models.VipInstanceGroup, VipInstanceGroupAdmin)
-admin.site.register(models.DiskOfferingType)
+admin.site.register(models.DiskOfferingType, DiskOfferingTypeAdmin)
 admin.site.register(models.Volume)
+
diff --git a/dbaas/physical/admin/disk_offering_type.py b/dbaas/physical/admin/disk_offering_type.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+#from django.contrib import admin
+from django_services import admin as services_admin
+from ..service.diskofferingtype import DiskOfferingTypeService
+
+
+#class DiskOfferingTypeAdmin(admin.ModelAdmin):
+class DiskOfferingTypeAdmin(services_admin.DjangoServicesAdmin):
+    service_class = DiskOfferingTypeService
+    search_fields = ('name', 'type', 'identifier')
+    list_display = ('name', 'type', 'identifier', 'is_default', 'selected_environments')
+    list_filter = ('name', 'type', 'identifier', 'is_default', 'environments')
+
+    def selected_environments(self, obj):
+        return ",".join(obj.environments.values_list('name', flat=True))
+
+    save_on_top = True
+    filter_horizontal = ("environments",)
+
diff --git a/dbaas/physical/service/diskofferingtype.py b/dbaas/physical/service/diskofferingtype.py
@@ -0,0 +1,6 @@
+from django_services import service
+from ..models import DiskOfferingType
+
+
+class DiskOfferingTypeService(service.CRUDService):
+    model_class = DiskOfferingType
diff --git a/dbaas/tsuru/views/serviceAppBind.py b/dbaas/tsuru/views/serviceAppBind.py
@@ -7,7 +7,7 @@
 from rest_framework import status
 
 
-class AclFromHellMissingCredentialException(Exception):
+class AclFromHellNotAllowerForEnvException(Exception):
     pass
 
 
@@ -21,12 +21,13 @@ def add_acl_for_hosts(self, database, app_name):
         hosts = infra.hosts
 
         acl_from_hell_client = ACLFromHellClient(database.environment)
-        if not acl_from_hell_client.credential:
-            raise AclFromHellMissingCredentialException(
+        if not acl_from_hell_client.aclfromhell_allowed:
+            raise AclFromHellNotAllowerForEnvException(
                 "ACL from hell credential not found for env {}".format(
                     database.environment
                 )
             )
+
         for host in hosts:
             acl_from_hell_client.add_acl(database, app_name, host.hostname)
         acl_from_hell_client.add_acl_for_vip_if_needed(database, app_name)
diff --git a/dbaas/workflow/steps/util/acl.py b/dbaas/workflow/steps/util/acl.py
@@ -101,7 +101,7 @@ def __unicode__(self):
 
     @property
     def is_valid(self):
-        return self.acl_from_hell_client.credential is not None
+        return self.acl_from_hell_client.aclfromhell_allowed
 
     @property
     def acl_from_hell_client(self):
diff --git a/dbaas/workflow/steps/util/base.py b/dbaas/workflow/steps/util/base.py
@@ -9,8 +9,7 @@
 from django.utils.encoding import python_2_unicode_compatible
 
 from dbaas_credentials.models import CredentialType
-from util import (get_or_none_credentials_for, AuthRequest,
-                  get_credentials_for)
+from util import get_credentials_for, AuthRequest, GetCredentialException
 from physical.models import Vip
 
 LOG = logging.getLogger(__name__)
@@ -429,12 +428,28 @@ def __init__(self, env):
     @property
     def credential(self):
         if not self._credential:
-            self._credential = get_or_none_credentials_for(
-                self.environment, CredentialType.ACLFROMHELL
-            )
+            try:
+                self._credential = get_credentials_for(
+                    self.environment, CredentialType.ACLFROMHELL
+                )
+            except (IndexError, GetCredentialException):
+                raise Exception(
+                    "Credential ACLFROMHELL for env {} not found".format(
+                        self.environment.name
+                    )
+                )
 
         return self._credential
 
+    @property
+    def aclfromhell_allowed(self):
+        allowed_status = self.credential.get_parameter_by_name(
+            'aclfromhell_allowed'
+        )
+        if allowed_status and allowed_status.lower() == 'false':
+            return False
+        return True
+
     def _request(self, action, url, **kw):
         return action(
             url,
diff --git a/dbaas/workflow/steps/util/volume_provider.py b/dbaas/workflow/steps/util/volume_provider.py
@@ -546,6 +546,15 @@ def _remove_volume(self, volume, host):
     def restore_snapshot_from_master(self):
         return False
 
+    @property
+    def disk_offering_type(self):
+        if self.host_migrate and self.host_migrate.database_migrate:
+            offering_type = self.infra.disk_offering_type.get_type_to(
+                self.environment)
+        else:
+            offering_type = self.infra.disk_offering_type
+        return offering_type.type
+
     def do(self):
         if not self.is_valid:
             return
@@ -568,7 +577,7 @@ def do(self):
             is_active=self.active_volume,
             zone=self.host_vm.zone,
             vm_name=self.host_vm.name,
-            disk_offering_type=self.infra.disk_offering_type.type if self.infra.disk_offering_type else None,
+            disk_offering_type=self.disk_offering_type
         )
 
     def undo(self):
@@ -2332,6 +2341,11 @@ def is_valid(self):
             return False
         return self.should_migrate_with_new_disk
 
+    @property
+    def disk_offering_type(self):
+        return self.infra.disk_offering_type.type
+
     def undo(self):
         if self.is_valid:
-            self._remove_volume(self.latest_disk, self.host)
+            if not self.latest_disk.is_active:
+                self._remove_volume(self.latest_disk, self.host)
