Fix an issue of referring the out-scoped 'vm_uuid'

Signed-off-by: Qun Li <qun.li@zstack.io>

Author: live4thee

kvmagent/kvmagent/plugins/ha_plugin.py

@@ -43,7 +43,7 @@ def kill_vm(maxAttempts, mountPaths=None, isFileSystem=None):
     logger.debug('vm_in_process_uuid_list:\n' + vm_in_process_uuid_list)
 
     # kill vm's qemu process
-    vm_pids = []
+    vm_pids_dict = {}
     for vm_uuid in vm_in_process_uuid_list.split('\n'):
         vm_uuid = vm_uuid.strip(' \t\n\r')
         if not vm_uuid:
@@ -55,9 +55,9 @@ def kill_vm(maxAttempts, mountPaths=None, isFileSystem=None):
 
         vm_pid = shell.call("ps aux | grep qemu-kvm | grep -v grep | awk '/%s/{print $2}'" % vm_uuid)
         vm_pid = vm_pid.strip(' \t\n\r')
-        vm_pids.append(vm_pid)
+        vm_pids_dict[vm_uuid] = vm_pid
 
-    for vm_pid in vm_pids:
+    for vm_uuid, vm_pid in vm_pids_dict.items():
         kill = shell.ShellCmd('kill -9 %s' % vm_pid)
         kill(False)
         if kill.return_code == 0:
@@ -66,7 +66,7 @@ def kill_vm(maxAttempts, mountPaths=None, isFileSystem=None):
         else:
             logger.warn('failed to kill the vm[uuid:%s, pid:%s] %s' % (vm_uuid, vm_pid, kill.stderr))
 
-    return vm_pids
+    return vm_pids_dict.values()
 
 
 def mount_path_is_nfs(mount_path):