Commit 72dc3fb3 authored by Guido Trotter's avatar Guido Trotter
Browse files

Merge branch 'stable-2.5' into devel-2.5



* stable-2.5:
  Migrate: don't check for free memory on cleanup
Signed-off-by: default avatarGuido Trotter <ultrotter@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
parents bf5338b3 6b826dfa
......@@ -7163,7 +7163,7 @@ class TLMigrateInstance(Tasklet):
i_be = self.cfg.GetClusterInfo().FillBE(instance)
# check memory requirements on the secondary node
if not self.failover or instance.admin_up:
if not self.cleanup and (not self.failover or instance.admin_up):
_CheckNodeFreeMemory(self.lu, target_node, "migrating instance %s" %
instance.name, i_be[constants.BE_MEMORY],
instance.hypervisor)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment