7:21 a.m.
Nir Soffer has uploaded a new change for review.
Change subject: vm: Refix vm unpausing during recovery
......................................................................
vm: Refix vm unpausing during recovery
Commit 45f3037ca1 should have fixed vm unpausing during recovery, but it
did not because of unfortunate cherry-pick. The original patch was
initializing vm sdIds list when running a vm in recovery mode. This code
path was removed in commit 93d09f6567 which was merged on the same day.
This patch adds back the missing code path and remove leftover comment
about recovery mode.
Change-Id: Ibbfbed22f1787f727884eeed72d2b15835ebe2dc
Relates-To: http://gerrit.ovirt.org/21649/
Bug-Url: https://bugzilla.redhat.com/1036358
Signed-off-by: Nir Soffer <nsoffer(a)redhat.com>
---
M vdsm/vm.py
1 file changed, 1 insertion(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/92/21892/1
diff --git a/vdsm/vm.py b/vdsm/vm.py
index b272ca2..80359f5 100644
--- a/vdsm/vm.py
+++ b/vdsm/vm.py
@@ -2931,8 +2931,6 @@
self.conf['smp'] = self.conf.get('smp', '1')
devices = self.buildConfDevices()
- # TODO: In recover should loop over disks running on the VM because
- # conf may be outdated if something happened during restart.
if not 'recover' in self.conf:
self.preparePaths(devices[DISK_DEVICES])
self._prepareTransientDisks(devices[DISK_DEVICES])
@@ -2951,7 +2949,7 @@
# So, to get proper device objects during VM recovery flow
# we must to have updated conf before VM run
self.saveState()
-
+ else:
for drive in devices[DISK_DEVICES]:
if drive['device'] == 'disk' and isVdsmImage(drive):
self.sdIds.append(drive['domainID'])
--
To view, visit http://gerrit.ovirt.org/21892
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibbfbed22f1787f727884eeed72d2b15835ebe2dc
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>
11:54 p.m.
Sergey Gotliv has posted comments on this change.
Change subject: vm: Refix vm unpausing during recovery
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit http://gerrit.ovirt.org/21892
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ibbfbed22f1787f727884eeed72d2b15835ebe2dc
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Martin Polednik <mpoledni(a)redhat.com>
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Sergey Gotliv <sgotliv(a)redhat.com>
Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
8:40 a.m.
Nir Soffer has posted comments on this change.
Change subject: vm: Refix vm unpausing during recovery
......................................................................
Patch Set 1: Verified-1
--
To view, visit http://gerrit.ovirt.org/21892
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ibbfbed22f1787f727884eeed72d2b15835ebe2dc
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Martin Polednik <mpoledni(a)redhat.com>
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
8:24 a.m.
Nir Soffer has posted comments on this change.
Change subject: vm: Refix vm unpausing during recovery
......................................................................
Patch Set 1:
This change fix initialization of Vm.sdIds but this does not fix unpausing - seems that
revovery process is broken now by commit 93d09f6567.
--
To view, visit http://gerrit.ovirt.org/21892
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ibbfbed22f1787f727884eeed72d2b15835ebe2dc
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Martin Polednik <mpoledni(a)redhat.com>
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
7:43 a.m.
Allon Mureinik has posted comments on this change.
Change subject: vm: Refix vm unpausing during recovery
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit http://gerrit.ovirt.org/21892
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ibbfbed22f1787f727884eeed72d2b15835ebe2dc
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Martin Polednik <mpoledni(a)redhat.com>
Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
7:24 a.m.
oVirt Jenkins CI Server has posted comments on this change.
Change subject: vm: Refix vm unpausing during recovery
......................................................................
Patch Set 1:
Build Successful
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/5839/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/5931/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/5043/ : SUCCESS
--
To view, visit http://gerrit.ovirt.org/21892
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ibbfbed22f1787f727884eeed72d2b15835ebe2dc
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
4:16 p.m.
Federico Simoncelli has posted comments on this change.
Change subject: vm: Refix vm unpausing during recovery
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit http://gerrit.ovirt.org/21892
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ibbfbed22f1787f727884eeed72d2b15835ebe2dc
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Martin Polednik <mpoledni(a)redhat.com>
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Sergey Gotliv <sgotliv(a)redhat.com>
Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
11:16 a.m.
Dan Kenigsberg has submitted this change and it was merged.
Change subject: vm: Refix vm unpausing during recovery
......................................................................
vm: Refix vm unpausing during recovery
Commit 45f3037ca1 should have fixed vm unpausing during recovery, but it
did not because of unfortunate cherry-pick. The original patch was
initializing vm sdIds list when running a vm in recovery mode. This code
path was removed in commit 93d09f6567 which was merged on the same day.
This patch adds back the missing code path and remove leftover comment
about recovery mode.
Change-Id: Ibbfbed22f1787f727884eeed72d2b15835ebe2dc
Relates-To: http://gerrit.ovirt.org/21649/
Bug-Url: https://bugzilla.redhat.com/1036358
Signed-off-by: Nir Soffer <nsoffer(a)redhat.com>
Reviewed-on: http://gerrit.ovirt.org/21892
Reviewed-by: Allon Mureinik <amureini(a)redhat.com>
Reviewed-by: Sergey Gotliv <sgotliv(a)redhat.com>
Reviewed-by: Federico Simoncelli <fsimonce(a)redhat.com>
---
M vdsm/vm.py
1 file changed, 1 insertion(+), 3 deletions(-)
Approvals:
Nir Soffer: Verified
Federico Simoncelli: Looks good to me, approved
Sergey Gotliv: Looks good to me, but someone else must approve
Allon Mureinik: Looks good to me, but someone else must approve
--
To view, visit http://gerrit.ovirt.org/21892
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibbfbed22f1787f727884eeed72d2b15835ebe2dc
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Martin Polednik <mpoledni(a)redhat.com>
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Sergey Gotliv <sgotliv(a)redhat.com>
Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
9:53 a.m.
Nir Soffer has posted comments on this change.
Change subject: vm: Refix vm unpausing during recovery
......................................................................
Patch Set 1: Verified+1
Verified that vm is unapused on startup and when storage become valid.
--
To view, visit http://gerrit.ovirt.org/21892
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ibbfbed22f1787f727884eeed72d2b15835ebe2dc
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Martin Polednik <mpoledni(a)redhat.com>
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Sergey Gotliv <sgotliv(a)redhat.com>
Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
11:59 p.m.
Allon Mureinik has posted comments on this change.
Change subject: vm: Refix vm unpausing during recovery
......................................................................
Patch Set 1:
@Nir, can you verify?
--
To view, visit http://gerrit.ovirt.org/21892
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ibbfbed22f1787f727884eeed72d2b15835ebe2dc
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Martin Polednik <mpoledni(a)redhat.com>
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Sergey Gotliv <sgotliv(a)redhat.com>
Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
3802
days inactive
3809
days old
vdsm-patches@lists.fedorahosted.org
9 comments
6 participants
participants (6)
-
Allon Mureinik -
Dan Kenigsberg -
Federico Simoncelli -
Jenkins CI RO -
Nir Soffer -
sgotliv＠redhat.com