Currently some hypervisors (namely kvm) need to do some cleanup after making sure an instance is stopped. With the moving of the retry cycle in backend those cleanups were never done. In order to solve this we add a new optional hypervisor function, CleanupInstance, which gets called at the end of the shutdown procedure, and which interested hypervisors can implement to be sure not to miss cleanup operations.
Signed-off-by: Guido Trotter <[email protected]> --- lib/backend.py | 1 + lib/hypervisor/hv_base.py | 12 ++++++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/lib/backend.py b/lib/backend.py index b903d62..898c75d 100644 --- a/lib/backend.py +++ b/lib/backend.py @@ -1099,6 +1099,7 @@ def InstanceShutdown(instance, timeout): if iname in hyper.ListInstances(): _Fail("Could not shutdown instance %s even by destroy", iname) + hyper.CleanupInstance(instance.name) _RemoveBlockDevLinks(iname, instance.disks) diff --git a/lib/hypervisor/hv_base.py b/lib/hypervisor/hv_base.py index af7aa95..58db395 100644 --- a/lib/hypervisor/hv_base.py +++ b/lib/hypervisor/hv_base.py @@ -130,6 +130,18 @@ class BaseHypervisor(object): """ raise NotImplementedError + def CleanupInstance(self, instance_name): + """Cleanup after a stopped instance + + This is an optional method, used by hypervisors that need to cleanup after + an instance has been stopped. + + @type instance_name: string + @param instance_name: instance name to cleanup after + + """ + pass + def RebootInstance(self, instance): """Reboot an instance.""" raise NotImplementedError -- 1.7.0.3 -- Subscription settings: http://groups.google.com/group/ganeti-devel/subscribe?hl=en
