Merge pull request #690 from globocom/fix-stage3-wrong-host

Fix stage 3 host migrate from new infra

Author: ricardosdias

dbaas/drivers/replication_topologies/redis.py

@@ -708,6 +708,8 @@ def get_database_migrate_steps_stage_3(self):
                 'workflow.steps.util.infra.DisableSourceInstances',
                 'workflow.steps.util.database.StopSourceDatabaseMigrate',
                 'workflow.steps.util.volume_provider.DestroyOldEnvironment',
+            )}, {
+            'Cleaning up 2': (
                 'workflow.steps.util.host_provider.DestroyVirtualMachineMigrate',
                 'workflow.steps.util.host_provider.DestroyIPMigrate',
                 'workflow.steps.util.host_provider.DestroyServiceAccountMigrate',

dbaas/maintenance/tasks_database_migrate.py

@@ -36,10 +36,16 @@ def build_hosts_migrate(hosts_zones, database_migrate):
     return instances
 
 
-def rebuild_hosts_migrate(current_db_migrate, previous_db_migrate):
+def rebuild_hosts_migrate(current_db_migrate,
+                          previous_db_migrate, validate_hosts=False):
     instances = []
     previous_hosts_migrate = previous_db_migrate.hosts.all()
+
     for previous_host_migrate in previous_hosts_migrate:
+        if (validate_hosts and
+            previous_host_migrate.host.first_instance_dns !=
+                previous_host_migrate.host.address):
+            continue
         host = previous_host_migrate.host
         zone = previous_host_migrate.zone
         snapshot = previous_host_migrate.snapshot
@@ -143,7 +149,8 @@ def database_environment_migrate(
         if not can_migrate(database, task, migration_stage, False):
             return
         database_migrate = rebuild_database_migrate(task, step_manager)
-        instances = rebuild_hosts_migrate(database_migrate, step_manager)
+        instances = rebuild_hosts_migrate(database_migrate, step_manager,
+                                          infra.in_last_migration_stage)
     else:
         infra.migration_stage += 1
         if not can_migrate(database, task, infra.migration_stage, False):
@@ -161,7 +168,8 @@ def database_environment_migrate(
                 database=database,
                 status=DatabaseMigrate.SUCCESS
             ).last()
-            instances = rebuild_hosts_migrate(database_migrate, last_db_migrate)
+            instances = rebuild_hosts_migrate(database_migrate, last_db_migrate,
+                                              infra.in_last_migration_stage)
     instances = sorted(instances, key=lambda k: k.id)
     steps = get_migrate_steps(database, infra.migration_stage)
     if not can_migrate_check_steps(
@@ -176,14 +184,11 @@ def database_environment_migrate(
     if result:
         database = database_migrate.database
         infra = database.infra
-        is_ha = infra.plan.is_ha
         migration_stage = infra.migration_stage
-        if ((is_ha and migration_stage == infra.STAGE_3) or
-           (not is_ha and migration_stage == infra.STAGE_2)):
-        
+        if infra.in_last_migration_stage:
             database.environment = database_migrate.environment
             database.save()
-        
+
             infra.environment = database_migrate.environment
             infra.plan = infra.plan.get_equivalent_plan_for_env(
                 database_migrate.environment

dbaas/physical/models.py

@@ -1066,6 +1066,14 @@ def migration_in_progress(self):
     def total_stages_migration(self):
         return 3 if self.plan.is_ha else 2
 
+    @property
+    def in_last_migration_stage(self):
+        if not self.migration_in_progress:
+            return False
+
+        return (self.plan.is_ha and self.migration_stage == self.STAGE_3) or\
+               (not self.plan.is_ha and self.migration_stage == self.STAGE_2)
+
     @classmethod
     def get_unique_databaseinfra_name(cls, base_name):
         """
@@ -1336,6 +1344,13 @@ def non_database_instance(self):
 
         return None
 
+    @property
+    def first_instance_dns(self):
+        for instance in self.instances.all():
+            return instance.dns
+
+        return None
+
     @property
     def is_database(self):
         return self.database_instance() is not None