From 7e66c35b5685525538dd65dd3dff75b5346d30d7 Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Tue, 12 May 2009 14:34:10 +0100
Subject: [PATCH] KVM: Abstract runtime file removal in a function
This removes some code which was duplicated in shutdown and migrate.
Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
lib/hypervisor/hv_kvm.py | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/lib/hypervisor/hv_kvm.py b/lib/hypervisor/hv_kvm.py
index 246c7f9f7..aeb21a07d 100644
--- a/lib/hypervisor/hv_kvm.py
+++ b/lib/hypervisor/hv_kvm.py
@@ -107,6 +107,16 @@ class KVMHypervisor(hv_base.BaseHypervisor):
"""
return '%s/%s.runtime' % (cls._CONF_DIR, instance_name)
+ @classmethod
+ def _RemoveInstanceRuntimeFiles(cls, pidfile, instance_name):
+ """Removes an instance's rutime sockets/files.
+
+ """
+ utils.RemoveFile(pidfile)
+ utils.RemoveFile(cls._InstanceMonitor(instance_name))
+ utils.RemoveFile(cls._InstanceSerial(instance_name))
+ utils.RemoveFile(cls._InstanceKVMRuntime(instance_name))
+
def _WriteNetScript(self, instance, seq, nic):
"""Write a script to connect a net interface to the proper bridge.
@@ -492,10 +502,7 @@ class KVMHypervisor(hv_base.BaseHypervisor):
self._RetryInstancePowerdown(instance, pid)
if not utils.IsProcessAlive(pid):
- utils.RemoveFile(pidfile)
- utils.RemoveFile(self._InstanceMonitor(instance.name))
- utils.RemoveFile(self._InstanceSerial(instance.name))
- utils.RemoveFile(self._InstanceKVMRuntime(instance.name))
+ self._RemoveInstanceRuntimeFiles(pidfile, instance.name)
return True
else:
return False
@@ -610,10 +617,7 @@ class KVMHypervisor(hv_base.BaseHypervisor):
time.sleep(2)
utils.KillProcess(pid)
- utils.RemoveFile(pidfile)
- utils.RemoveFile(self._InstanceMonitor(instance_name))
- utils.RemoveFile(self._InstanceSerial(instance_name))
- utils.RemoveFile(self._InstanceKVMRuntime(instance_name))
+ self._RemoveInstanceRuntimeFiles(pidfile, instance.name)
def GetNodeInfo(self):
"""Return information about the node.
--
GitLab