Prechádzať zdrojové kódy

Merge pull request #175 from aznashwan/replica-deployment-minion-reuse-bug

Prevent Migrations-from-Replica from inheriting source/target minion pools.
Nashwan Azhari 5 rokov pred
rodič
commit
835eeec330
1 zmenil súbory, kde vykonal 4 pridanie a 3 odobranie
  1. 4 3
      coriolis/conductor/rpc/server.py

+ 4 - 3
coriolis/conductor/rpc/server.py

@@ -1301,9 +1301,10 @@ class ConductorServerEndpoint(object):
         migration.replica = replica
         migration.replica = replica
         migration.info = replica.info
         migration.info = replica.info
         migration.user_scripts = user_scripts
         migration.user_scripts = user_scripts
-        migration.origin_minion_pool_id = replica.origin_minion_pool_id
-        migration.destination_minion_pool_id = (
-            replica.destination_minion_pool_id)
+        # NOTE: Migrations-from-Replica have no use for the source/target
+        # pools of the parent Replica so these can be omitted:
+        migration.origin_minion_pool_id = None
+        migration.destination_minion_pool_id = None
         migration.instance_osmorphing_minion_pool_mappings = (
         migration.instance_osmorphing_minion_pool_mappings = (
             replica.instance_osmorphing_minion_pool_mappings)
             replica.instance_osmorphing_minion_pool_mappings)
         if instance_osmorphing_minion_pool_mappings:
         if instance_osmorphing_minion_pool_mappings: