From f61d443773531fccd65e35371622f9d0ce4f0225 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Sat, 6 Jun 2020 11:21:58 -0400 Subject: [PATCH] Allow move of migrated VM to current node Will make the migrate permanent instead of throwing an error. Fixes #96 --- daemon-common/vm.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/daemon-common/vm.py b/daemon-common/vm.py index bcfdbd82..b49fec92 100644 --- a/daemon-common/vm.py +++ b/daemon-common/vm.py @@ -472,6 +472,11 @@ def move_vm(zk_conn, domain, target_node, wait=False): # Verify if node is current node if target_node == current_node: + last_node = zkhandler.readdata(zk_conn, '/domains/{}/lastnode'.format(dom_uuid)) + if last_node: + zkhandler.writedata(zk_conn, {'/domains/{}/lastnode'.format(dom_uuid), ''}) + return True, 'Making temporary migration permanent for VM "{}".'.format(domain) + return False, 'ERROR: VM "{}" is already running on node "{}".'.format(domain, current_node) if not target_node: