Change in vdsm[master]: virt: Remove all guest sockets on cleanup

vfeenstr at redhat.com vfeenstr at redhat.com
Tue Apr 1 07:07:02 UTC 2014


Vinzenz Feenstra has uploaded a new change for review.

Change subject: virt: Remove all guest sockets on cleanup
......................................................................

virt: Remove all guest sockets on cleanup

Previously vdsm was cleaning up the guest socket files, but when
introducing the symlinks we started leaving behind the real sockets
and just removed the symlinks.
This patch fixes this by first removing the file the symlink points
to and then removes the symlink.

Change-Id: Iaf3bfbd0eedcb6486cbde685d7b6ee64e8dc8d8c
Bug-Url: https://bugzilla.redhat.com/1052097
Signed-off-by: Vinzenz Feenstra <vfeenstr at redhat.com>
---
M vdsm/virt/vm.py
1 file changed, 8 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/78/26278/1

diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py
index 224bf51..944558e 100644
--- a/vdsm/virt/vm.py
+++ b/vdsm/virt/vm.py
@@ -2786,7 +2786,7 @@
         except Exception:
             pass
 
-        utils.rmFile(self._guestSocketFile)
+        self._guestSockCleanup(self._guestSocketFile)
 
     def setDownStatus(self, code, exitReasonCode, exitMessage=''):
         if not exitMessage:
@@ -3061,6 +3061,12 @@
         self._vmStats.start()
         self._guestEventTime = self._startTime
 
+    @staticmethod
+    def _guestSockCleanup(sock):
+        if os.path.islink(sock):
+            utils.rmFile(os.path.realpath(sock))
+        utils.rmFile(sock)
+
     def _cleanup(self):
         """
         General clean up routine
@@ -3069,7 +3075,7 @@
         self._cleanupFloppy()
         self._cleanupGuestAgent()
         utils.rmFile(self._recoveryFile)
-        utils.rmFile(self._qemuguestSocketFile)
+        self._guestSockCleanup(self._qemuguestSocketFile)
 
     def updateGuestCpuRunning(self):
         self._guestCpuRunning = (self._dom.info()[0] ==


-- 
To view, visit http://gerrit.ovirt.org/26278
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf3bfbd0eedcb6486cbde685d7b6ee64e8dc8d8c
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Vinzenz Feenstra <vfeenstr at redhat.com>


More information about the vdsm-patches mailing list