Vinzenz Feenstra has uploaded a new change for review.
Change subject: vdsm: replace self.conf['vmId'] with self.id ......................................................................
vdsm: replace self.conf['vmId'] with self.id
Change-Id: Ie116d8db8d0bf2157bc78be16a03b556443c18ef Signed-off-by: Vinzenz Feenstra vfeenstr@redhat.com --- M vdsm/vm/vm.py 1 file changed, 9 insertions(+), 11 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/44/11744/1
diff --git a/vdsm/vm/vm.py b/vdsm/vm/vm.py index c366a39..a0d4339 100644 --- a/vdsm/vm/vm.py +++ b/vdsm/vm/vm.py @@ -119,11 +119,11 @@ """ self.conf = {'pid': '0'} self.conf.update(params) + self.id = self.conf['vmId'] self.cif = cif - self.log = SimpleLogAdapter(self.log, {"vmId": self.conf['vmId']}) + self.log = SimpleLogAdapter(self.log, {"vmId": self.id}) self.destroyed = False - self._recoveryFile = constants.P_VDSM_RUN + \ - str(self.conf['vmId']) + '.recovery' + self._recoveryFile = constants.P_VDSM_RUN + self.id + '.recovery' self.user_destroy = False self._monitorResponse = 0 self.conf['clientIp'] = '' @@ -137,10 +137,9 @@ self._lastStatus = 'WaitForLaunch' self._migrationSourceThread = self.MigrationSourceThreadClass(self) self._kvmEnable = self.conf.get('kvmEnable', 'true') - self._guestSocketFile = constants.P_VDSM_RUN + self.conf['vmId'] + \ + self._guestSocketFile = constants.P_VDSM_RUN + self.id + \ '.guest.socket' self._incomingMigrationFinished = threading.Event() - self.id = self.conf['vmId'] self._volPrepareLock = threading.Lock() self._initTimePauseCode = None self.guestAgent = None @@ -2202,14 +2201,14 @@ if (e.get_error_code() == libvirt.VIR_ERR_OPERATION_FAILED): self.log.warn("Failed to destroy VM '%s' " - "gracefully", self.conf['vmId']) + "gracefully", self.id) time.sleep(30) self._dom.destroy() except libvirt.libvirtError, e: if e.get_error_code() == libvirt.VIR_ERR_NO_DOMAIN: self.log.warning("libvirt domain not found", exc_info=True) else: - self.log.warn("VM %s is not running", self.conf['vmId']) + self.log.warn("VM %s is not running", self.id)
if not self.cif.mom: self.cif.ksmMonitor.adjust() @@ -2228,12 +2227,11 @@ Clean VM from the system """ try: - del self.cif.vmContainer[self.conf['vmId']] + del self.cif.vmContainer[self.id] self.log.debug("Total desktops after destroy of %s is %d", - self.conf['vmId'], len(self.cif.vmContainer)) + self.id, len(self.cif.vmContainer)) except Exception: - self.log.error("Failed to delete VM %s", self.conf['vmId'], - exc_info=True) + self.log.error("Failed to delete VM %s", self.id, exc_info=True)
def destroy(self): self.log.debug('destroy Called')
-- To view, visit http://gerrit.ovirt.org/11744 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange Gerrit-Change-Id: Ie116d8db8d0bf2157bc78be16a03b556443c18ef Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Vinzenz Feenstra vfeenstr@redhat.com
oVirt Jenkins CI Server has posted comments on this change.
Change subject: vdsm: replace self.conf['vmId'] with self.id ......................................................................
Patch Set 1:
Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/1145/ (1/3)
-- To view, visit http://gerrit.ovirt.org/11744 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ie116d8db8d0bf2157bc78be16a03b556443c18ef Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Vinzenz Feenstra vfeenstr@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: vdsm: replace self.conf['vmId'] with self.id ......................................................................
Patch Set 1:
Build Started http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/1110/ (3/3)
-- To view, visit http://gerrit.ovirt.org/11744 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ie116d8db8d0bf2157bc78be16a03b556443c18ef Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Vinzenz Feenstra vfeenstr@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: vdsm: replace self.conf['vmId'] with self.id ......................................................................
Patch Set 1:
Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/256/ (2/3)
-- To view, visit http://gerrit.ovirt.org/11744 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ie116d8db8d0bf2157bc78be16a03b556443c18ef Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Vinzenz Feenstra vfeenstr@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: vdsm: replace self.conf['vmId'] with self.id ......................................................................
Patch Set 1:
Build Successful
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/1110/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/1145/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/256/ : SUCCESS
-- To view, visit http://gerrit.ovirt.org/11744 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ie116d8db8d0bf2157bc78be16a03b556443c18ef Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Vinzenz Feenstra vfeenstr@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
Vinzenz Feenstra has abandoned this change.
Change subject: vdsm: replace self.conf['vmId'] with self.id ......................................................................
Abandoned
Out of date
vdsm-patches@lists.fedorahosted.org