July 2015 - vdsm-patches - Fedora mailing-lists

Change in vdsm[master]: vm: event: send status event on RTC update
by automation＠ovirt.org 08 Jul '15

08 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: send status event on RTC update ...................................................................... Patch Set 1: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43310 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I2e17262812547ea64365aa4fe77b64d27d579de5 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: send status event on reboot
by automation＠ovirt.org 08 Jul '15

08 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: send status event on reboot ...................................................................... Patch Set 1: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43309 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I748b187228a39e55982c1b7d05ab47681481801c Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: introduce _send_event helper
by automation＠ovirt.org 08 Jul '15

08 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: introduce _send_event helper ...................................................................... Patch Set 2: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43287 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4c25ba9f520e6409cc06e99a2450d2c0d98c26fb Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: emit event on setDownStatus
by automation＠ovirt.org 08 Jul '15

08 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: emit event on setDownStatus ...................................................................... Patch Set 3: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43270 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9a99d074461bcc2b61d15dd46f7d020abbe48afe Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: emit event on domDependentInit
by automation＠ovirt.org 08 Jul '15

08 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: emit event on domDependentInit ...................................................................... Patch Set 3: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43269 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie379911a374a9ba3e82658592c295f7a9a0ac8a0 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: virt: events: extract function to make event info
by automation＠ovirt.org 08 Jul '15

08 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: virt: events: extract function to make event info ...................................................................... Patch Set 3: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43268 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If60e8422d06fb1ff45a846858856ad68d52fd6ce Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: add minimal running stats to status
by automation＠ovirt.org 08 Jul '15

08 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: add minimal running stats to status ...................................................................... Patch Set 2: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43290 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I894a1b10d3cc3dd33664ea9f0842cbc7f1eb07b3 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: emit event on guest status change
by automation＠ovirt.org 08 Jul '15

08 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: emit event on guest status change ...................................................................... Patch Set 2: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43289 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib98d64a250a6d2de70f7fe5206e5a0ad648c151d Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: emit event when domDependentInit is done
by michal.skrivanek＠redhat.com 08 Jul '15

08 Jul '15

Michal Skrivanek has posted comments on this change. Change subject: vm: emit event when domDependentInit is done ...................................................................... Patch Set 2: (1 comment) https://gerrit.ovirt.org/#/c/43269/2/vdsm/virt/vm.py File vdsm/virt/vm.py: Line 775: self.recovering = False Line 776: self.saveState() Line 777: Line 778: self._send_event( Line 779: self._getVmStatus(), I wonder... is it better to send the status we see right now (which could have been changed since 763) or always send an explicit UP ? Line 780: **self._getRunningVmStats() Line 781: ) Line 782: Line 783: except MissingLibvirtDomainError as e: -- To view, visit https://gerrit.ovirt.org/43269 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie379911a374a9ba3e82658592c295f7a9a0ac8a0 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: vm: event: emit event on setDownStatus
by michal.skrivanek＠redhat.com 08 Jul '15

08 Jul '15

Michal Skrivanek has posted comments on this change. Change subject: vm: event: emit event on setDownStatus ...................................................................... Patch Set 2: (3 comments) https://gerrit.ovirt.org/#/c/43270/2/vdsm/virt/vm.py File vdsm/virt/vm.py: Line 1308: exitMessage, exitReasonCode) Line 1309: # DoubleDownError is protecting us here Line 1310: event_data = self._getExitedVmStats() Line 1311: except DoubleDownError: Line 1312: event_data = {} > is this really needed? I don't think so. it raises when another lastStatus = DOWN happens...which is the first thing here at line 1298 Line 1313: pass Line 1314: try: Line 1315: self.guestAgent.stop() Line 1316: except Exception: Line 1316: except Exception: Line 1317: pass Line 1318: self.saveState() Line 1319: if event_data: Line 1320: self._send_event( too long for a single line? Line 1321: vmstatus.DOWN, Line 1322: **event_data Line 1323: ) Line 1324: Line 1367: def _getExitedVmStats(self): Line 1368: stats = { Line 1369: 'exitCode': self.conf['exitCode'], Line 1370: 'exitMessage': self.conf['exitMessage'], Line 1371: 'exitReason': self.conf['exitReason'] whitespace or I just don't understand gerrit diff? Line 1372: } Line 1373: if 'timeOffset' in self.conf: Line 1374: stats['timeOffset'] = self.conf['timeOffset'] Line 1375: return stats -- To view, visit https://gerrit.ovirt.org/43270 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9a99d074461bcc2b61d15dd46f7d020abbe48afe Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: virt: events: extract function to make event info
by michal.skrivanek＠redhat.com 08 Jul '15

08 Jul '15

Michal Skrivanek has posted comments on this change. Change subject: virt: events: extract function to make event info ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/43268 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If60e8422d06fb1ff45a846858856ad68d52fd6ce Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: report minimal running vm stats
by fromani＠redhat.com 08 Jul '15

08 Jul '15

Francesco Romani has posted comments on this change. Change subject: vm: event: report minimal running vm stats ...................................................................... Patch Set 1: (3 comments) https://gerrit.ovirt.org/#/c/43290/1//COMMIT_MSG Commit Message: Line 3: AuthorDate: 2015-07-07 14:59:30 +0200 Line 4: Commit: Francesco Romani <fromani(a)redhat.com> Line 5: CommitDate: 2015-07-07 17:08:53 +0200 Line 6: Line 7: vm: event: report minimal running vm stats confusing and obscure. Rephrase. Line 8: Line 9: When we receive an event from libvirt, we still Line 10: send back an event to Engine, to make sure Line 11: we are not losing any event. Line 7: vm: event: report minimal running vm stats Line 8: Line 9: When we receive an event from libvirt, we still Line 10: send back an event to Engine, to make sure Line 11: we are not losing any event. ok, and what about races with events sent by vm? We will deliver only one event thanks with eventLock, and we not lie to Engine, but there is a risk to lose the extra data. Line 12: Line 13: Change-Id: I894a1b10d3cc3dd33664ea9f0842cbc7f1eb07b3 https://gerrit.ovirt.org/#/c/43290/1/vdsm/virt/vm.py File vdsm/virt/vm.py: Line 381: def send_status_event(self): Line 382: self._send_event( Line 383: self._getVmStatus(), Line 384: **self._getUpVmStats() Line 385: ) ok, but probably better to call this explicitely per-recognized lifecycle events (in clientIF). Line 386: Line 387: def _send_event(self, vm_status, **kwargs); Line 388: event_data = {} Line 389: with self._eventLock: -- To view, visit https://gerrit.ovirt.org/43290 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I894a1b10d3cc3dd33664ea9f0842cbc7f1eb07b3 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: vm: event: emit event on setDownStatus
by fromani＠redhat.com 08 Jul '15

08 Jul '15

Francesco Romani has posted comments on this change. Change subject: vm: event: emit event on setDownStatus ...................................................................... Patch Set 2: (2 comments) https://gerrit.ovirt.org/#/c/43270/2/vdsm/virt/vm.py File vdsm/virt/vm.py: Line 1308: exitMessage, exitReasonCode) Line 1309: # DoubleDownError is protecting us here Line 1310: event_data = self._getExitedVmStats() Line 1311: except DoubleDownError: Line 1312: event_data = {} is this really needed? Line 1313: pass Line 1314: try: Line 1315: self.guestAgent.stop() Line 1316: except Exception: Line 1355: stats['status'] = self._getVmStatus() Line 1356: stats.update(self._getGuestStats()) Line 1357: return stats Line 1358: Line 1359: def _getDownVmStats(self): split in a separate patch? Line 1360: stats = { Line 1361: 'vmId': self.conf['vmId'], Line 1362: 'status': self.lastStatus Line 1363: } -- To view, visit https://gerrit.ovirt.org/43270 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9a99d074461bcc2b61d15dd46f7d020abbe48afe Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: vm: event: introduce _send_event helper
by fromani＠redhat.com 08 Jul '15

08 Jul '15

Francesco Romani has posted comments on this change. Change subject: vm: event: introduce _send_event helper ...................................................................... Patch Set 1: (1 comment) https://gerrit.ovirt.org/#/c/43287/1/vdsm/virt/vm.py File vdsm/virt/vm.py: Line 383: self._getVmStatus() Line 384: ) Line 385: Line 386: def _send_event(self, vm_status, **kwargs); Line 387: event_data = {} useful but unneeded rename - drop or move it in a separate trivial patch Line 388: with self._eventLock: Line 389: if vm_status != self._evaluatedStatus: Line 390: self._evaluatedStatus = vm_status Line 391: current_status = self.lastStatus -- To view, visit https://gerrit.ovirt.org/43287 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4c25ba9f520e6409cc06e99a2450d2c0d98c26fb Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: freeze: Avoid unneeded freeze during snapshot
by fromani＠redhat.com 08 Jul '15

08 Jul '15

Francesco Romani has posted comments on this change. Change subject: freeze: Avoid unneeded freeze during snapshot ...................................................................... Patch Set 4: Code-Review+1 (1 comment) looks OK. please add annotation to schema, see comment inside. https://gerrit.ovirt.org/#/c/43293/4/vdsm/rpc/vdsmapi-schema.json File vdsm/rpc/vdsmapi-schema.json: Line 7881: # @snapMemory: #optional str representation of the volumes in which Line 7882: # the memory dump and vm configuration should be saved Line 7883: # Line 7884: # @frozen: #optional Boolean value set to true if the vm is frozen Line 7885: # and does not need to be freezed during the snapshot. please add (new in version 4.17.0) Line 7886: # Line 7887: # Since: 4.10.0 Line 7888: ## Line 7889: {'command': {'class': 'VM', 'name': 'snapshot'}, -- To view, visit https://gerrit.ovirt.org/43293 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I328470f700ab74daeed5375c0ade83628d16c387 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <mskrivan(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: migration: replace boolean with proper Events
by automation＠ovirt.org 08 Jul '15

08 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: migration: replace boolean with proper Events ...................................................................... Patch Set 5: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/42887 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I02639749ab884c3542c4d29715756044d777f738 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: freeze: Avoid unneeded freeze during snapshot
by Nir Soffer 08 Jul '15

08 Jul '15

Nir Soffer has posted comments on this change. Change subject: freeze: Avoid unneeded freeze during snapshot ...................................................................... Patch Set 4: Fix pep8 error. -- To view, visit https://gerrit.ovirt.org/43293 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I328470f700ab74daeed5375c0ade83628d16c387 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <mskrivan(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: freeze: Avoid unneeded freeze during snapshot
by automation＠ovirt.org 08 Jul '15

08 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: freeze: Avoid unneeded freeze during snapshot ...................................................................... Patch Set 4: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43293 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I328470f700ab74daeed5375c0ade83628d16c387 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <mskrivan(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: freeze: Avoid unneeded freeze during snapshot
by automation＠ovirt.org 07 Jul '15

07 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: freeze: Avoid unneeded freeze during snapshot ...................................................................... Patch Set 3: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43293 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I328470f700ab74daeed5375c0ade83628d16c387 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <mskrivan(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: freeze: Avoid unneeded freeze during snapshot
by automation＠ovirt.org 07 Jul '15

07 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: freeze: Avoid unneeded freeze during snapshot ...................................................................... Patch Set 2: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43293 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I328470f700ab74daeed5375c0ade83628d16c387 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <mskrivan(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: StorageDomainManifest: move BlockSD.getVSize
by alitke＠redhat.com 07 Jul '15

07 Jul '15

Adam Litke has uploaded a new change for review. Change subject: StorageDomainManifest: move BlockSD.getVSize ...................................................................... StorageDomainManifest: move BlockSD.getVSize getVSize is one of the first functions needed by the VolumeMetadata refactoring later on in the series. BlockVolume.getVolumeSize currently calls into the StorageDomain to get the volume size. Since VolumeMetadata cannot create StorageDomain objects we move getVSize into the manifest which can be safely instantiated. Change-Id: Ib00eba218cfb4af201aebcdc5071f95164c31687 Signed-off-by: Adam Litke <alitke(a)redhat.com> --- M vdsm/storage/blockSD.py 1 file changed, 16 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/94/41994/1 diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py index 8674dba..362ee28 100644 --- a/vdsm/storage/blockSD.py +++ b/vdsm/storage/blockSD.py @@ -404,6 +404,21 @@ metadata = selectMetadata(sdUUID) sd.StorageDomainManifest.__init__(self, sdUUID, domaindir, metadata) + def getVSize(self, imgUUUID, volUUID): + """ Return the block volume size in bytes. """ + try: + size = _tellEnd(lvm.lvPath(self.sdUUID, volUUID)) + except IOError as e: + if e.errno == os.errno.ENOENT: + # Inactive volume has no /dev entry. Fallback to lvm way. + size = lvm.getLV(self.sdUUID, volUUID).size + else: + self.log.warn("Could not get size for vol %s/%s", + self.sdUUID, volUUID, exc_info=True) + raise + + return int(size) + class BlockStorageDomain(sd.StorageDomain): ManifestClass = BlockStorageDomainManifest @@ -612,19 +627,7 @@ return blockVolume.BlockVolume def getVSize(self, imgUUID, volUUID): - """ Return the block volume size in bytes. """ - try: - size = _tellEnd(lvm.lvPath(self.sdUUID, volUUID)) - except IOError as e: - if e.errno == os.errno.ENOENT: - # Inactive volume has no /dev entry. Fallback to lvm way. - size = lvm.getLV(self.sdUUID, volUUID).size - else: - self.log.warn("Could not get size for vol %s/%s", - self.sdUUID, volUUID, exc_info=True) - raise - - return int(size) + return self.manifest.getVSize(imgUUID, volUUID) getVAllocSize = getVSize -- To view, visit https://gerrit.ovirt.org/41994 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib00eba218cfb4af201aebcdc5071f95164c31687 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke <alitke(a)redhat.com>

5 34

Change in vdsm[master]: StorageDomainManifest: introduce class heirarchy
by alitke＠redhat.com 07 Jul '15

07 Jul '15

Adam Litke has uploaded a new change for review. Change subject: StorageDomainManifest: introduce class heirarchy ...................................................................... StorageDomainManifest: introduce class heirarchy Many of the functions in the StorageDomain class family serve to provide information about the storage domain and its contents (ie. images and volumes). Other functions manipulate image or volume metadata in a fine-grained, reusable way (ie. extendVolume). As we refactor the storage code to operate without an SPM the new code will benefit from reusing these Storage Domain "manifest" functions. In order to make reuse clean and safe, we want to refactor the StorageDomain class by splitting the reusable elements into a StorageDomainManifest class. The StorageDomain object will initialize and use a StorageDomainManifest object for much of its normal operations. Meanwhile, the new SDM code may use a StorageDomainManifest object directly without having access to the non-sharable parts of StorageDomain. In an effort to reduce churn during the refactoring, when moving a method into its new class, I will leave behind a stub in the original class which simply passes the call through to the method's new location. Once all code has been refactored, I'll remove stubs for any methods which are not currently accessed outside of the class. Change-Id: Ia275424a8d423722efb229a4d8545f035fe5fa51 Signed-off-by: Adam Litke <alitke(a)redhat.com> --- M vdsm/storage/blockSD.py M vdsm/storage/fileSD.py M vdsm/storage/imageRepository/formatConverter.py M vdsm/storage/sd.py 4 files changed, 64 insertions(+), 19 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/93/41993/1 diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py index 490b624..8674dba 100644 --- a/vdsm/storage/blockSD.py +++ b/vdsm/storage/blockSD.py @@ -395,14 +395,22 @@ return {'mdathreshold': mda_free_ok, 'mdavalid': mda_size_ok} -class BlockStorageDomain(sd.StorageDomain): +class BlockStorageDomainManifest(sd.StorageDomainManifest): mountpoint = os.path.join(sd.StorageDomain.storage_repository, sd.DOMAIN_MNT_POINT, sd.BLOCKSD_DIR) def __init__(self, sdUUID): domaindir = os.path.join(self.mountpoint, sdUUID) metadata = selectMetadata(sdUUID) - sd.StorageDomain.__init__(self, sdUUID, domaindir, metadata) + sd.StorageDomainManifest.__init__(self, sdUUID, domaindir, metadata) + + +class BlockStorageDomain(sd.StorageDomain): + ManifestClass = BlockStorageDomainManifest + + def __init__(self, sdUUID): + manifest = self.ManifestClass(sdUUID) + sd.StorageDomain.__init__(self, manifest) lvm.activateLVs(self.sdUUID, SPECIAL_LVS) self.metavol = lvm.lvPath(self.sdUUID, sd.METADATA) @@ -1316,7 +1324,7 @@ def refresh(self): self.refreshDirTree() lvm.invalidateVG(self.sdUUID) - self._metadata = selectMetadata(self.sdUUID) + self.replaceMetadata(selectMetadata(self.sdUUID)) @staticmethod def findDomainPath(sdUUID): diff --git a/vdsm/storage/fileSD.py b/vdsm/storage/fileSD.py index 9ceda8d..6add0f4 100644 --- a/vdsm/storage/fileSD.py +++ b/vdsm/storage/fileSD.py @@ -145,26 +145,34 @@ PersistentDict(FileMetadataRW(metafile)), FILE_SD_MD_FIELDS) -class FileStorageDomain(sd.StorageDomain): +class FileStorageDomainManifest(sd.StorageDomainManifest): def __init__(self, domainPath): + sdUUID = os.path.basename(domainPath) + # Using glob might look like the simplest thing to do but it isn't # If one of the mounts is stuck it'll cause the entire glob to fail # and you wouldn't be able to access any domain self.log.debug("Reading domain in path %s", domainPath) self.mountpoint = os.path.dirname(domainPath) self.remotePath = os.path.basename(self.mountpoint) + domaindir = os.path.join(self.mountpoint, sdUUID) self.metafile = os.path.join(domainPath, sd.DOMAIN_META_DATA, sd.METADATA) - - sdUUID = os.path.basename(domainPath) - validateFileSystemFeatures(sdUUID, self.mountpoint) - metadata = FileSDMetadata(self.metafile) - domaindir = os.path.join(self.mountpoint, sdUUID) - sd.StorageDomain.__init__(self, sdUUID, domaindir, metadata) + sd.StorageDomainManifest.__init__(self, sdUUID, domaindir, metadata) - if not self.oop.fileUtils.pathExists(self.metafile): - raise se.StorageDomainMetadataNotFound(sdUUID, self.metafile) + +class FileStorageDomain(sd.StorageDomain): + ManifestClass = FileStorageDomainManifest + + def __init__(self, domainPath): + manifest = self.ManifestClass(domainPath) + validateFileSystemFeatures(manifest.sdUUID, manifest.mountpoint) + sd.StorageDomain.__init__(self, manifest) + + if not self.oop.fileUtils.pathExists(manifest.metafile): + raise se.StorageDomainMetadataNotFound(manifest.sdUUID, + manifest.metafile) self.imageGarbageCollector() self._registerResourceNamespaces() @@ -259,7 +267,7 @@ }) def getReadDelay(self): - stats = misc.readspeed(self.metafile, 4096) + stats = misc.readspeed(self.manifest.metafile, 4096) return stats['seconds'] def getFileList(self, pattern, caseSensitive): @@ -537,7 +545,7 @@ return True def getRemotePath(self): - return self.remotePath + return self.manifest.remotePath def getRealPath(self): """ diff --git a/vdsm/storage/imageRepository/formatConverter.py b/vdsm/storage/imageRepository/formatConverter.py index b0720ca..5aaafef 100644 --- a/vdsm/storage/imageRepository/formatConverter.py +++ b/vdsm/storage/imageRepository/formatConverter.py @@ -60,7 +60,7 @@ if chkMetadata[sd.DMDK_VERSION] == int(targetVersion): # Switching to the newMetadata (successful upgrade), the oldMetadata # was cleared after all. - domain._metadata = chkMetadata + domain.replaceMetadata(chkMetadata) log.debug("Conversion of domain %s to tag based metadata completed, " "target version = %s", domain.sdUUID, targetVersion) else: diff --git a/vdsm/storage/sd.py b/vdsm/storage/sd.py index a771abf..ab86987 100644 --- a/vdsm/storage/sd.py +++ b/vdsm/storage/sd.py @@ -291,6 +291,15 @@ } +class StorageDomainManifest(object): + log = logging.getLogger("Storage.StorageDomainManifest") + + def __init__(self, sdUUID, domaindir, metadata): + self.sdUUID = sdUUID + self.domaindir = domaindir + self._metadata = metadata + + class StorageDomain(object): log = logging.getLogger("Storage.StorageDomain") storage_repository = config.get('irs', 'repository') @@ -304,10 +313,8 @@ 3: (clusterlock.SANLock, True), } - def __init__(self, sdUUID, domaindir, metadata): - self.sdUUID = sdUUID - self.domaindir = domaindir - self._metadata = metadata + def __init__(self, manifest): + self.manifest = manifest self._lock = threading.Lock() self.stat = None self._clusterLock = self._makeClusterLock() @@ -316,6 +323,28 @@ if self.stat: threading.Thread(target=self.stat.stop).start() + @property + def sdUUID(self): + return self.manifest.sdUUID + + @property + def domaindir(self): + return self.manifest.domaindir + + @property + def mountpoint(self): + return self.manifest.mountpoint + + @property + def _metadata(self): + return self.manifest._metadata + + def replaceMetadata(self, md): + """ + Used by FormatConverter to replace the metadata reader/writer + """ + self.manifest._metadata = md + def prepareMailbox(self): """ This method has been introduced in order to prepare the mailbox -- To view, visit https://gerrit.ovirt.org/41993 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia275424a8d423722efb229a4d8545f035fe5fa51 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke <alitke(a)redhat.com>

5 49

Change in vdsm[master]: password: Allow pickling of protected password
by Nir Soffer 07 Jul '15

07 Jul '15

Nir Soffer has uploaded a new change for review. Change subject: password: Allow pickling of protected password ...................................................................... password: Allow pickling of protected password In commit 862d6440176c (password: Prevent password logging and persisting), we bloked pickling of protected passwords, to prevent accidental persisting of sensitive information. Turns out that when using iSCSI CHAP authentication, supervdsm is running iscsi.readSessionInfo(), returning a protected password. Under the hood, it tries to pickle the results and fails. We raise a very clear error when trying to pickle a ProtectePassword: TypeError: ProtectedPassword object cannot be pickled However, this error is swallowed in supervdsm or in the underlying multiprocessing magic, and we get this unhelpful error in vdsm: RuntimeError: Broken communication with supervdsm. Failed call to readSessionInfo Since we run lot of code via supervdsm, and returning objects transparently is extremely convenient, it seems that blocking pickling was not a good idea. This patch enables pickling of ProtectedPassword, fixing iSCSI storage when using CHAP authentication. Change-Id: I198f418d88348a2bae33b71e323a9741ae295d30 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M lib/vdsm/password.py M tests/passwordsTests.py 2 files changed, 3 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/56/43256/1 diff --git a/lib/vdsm/password.py b/lib/vdsm/password.py index 52588b1..9e0756d 100644 --- a/lib/vdsm/password.py +++ b/lib/vdsm/password.py @@ -33,10 +33,6 @@ def __ne__(self, other): return not self.__eq__(other) - def __getstate__(self): - """ Do not serialize the the real password """ - raise TypeError("ProtectedPassword object cannot be pickled") - def __str__(self): return "********" diff --git a/tests/passwordsTests.py b/tests/passwordsTests.py index 33bec3e..418d634 100644 --- a/tests/passwordsTests.py +++ b/tests/passwordsTests.py @@ -51,9 +51,10 @@ p2 = ProtectedPassword("12345678") self.assertFalse(p1 != p2) - def test_no_pickle(self): + def test_pickle_copy(self): p1 = ProtectedPassword("12345678") - self.assertRaises(TypeError, pickle.dumps, p1) + p2 = pickle.loads(pickle.dumps(p1)) + self.assertEqual(p1, p2) def test_no_marshal(self): p1 = ProtectedPassword("12345678") -- To view, visit https://gerrit.ovirt.org/43256 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I198f418d88348a2bae33b71e323a9741ae295d30 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

4 6

Change in vdsm[master]: vdsm: removed optional markers for volUUID
by cshereme＠redhat.com 07 Jul '15

07 Jul '15

Candace Sheremeta has uploaded a new change for review. Change subject: vdsm: removed optional markers for volUUID ...................................................................... vdsm: removed optional markers for volUUID after examining the code, it's clear that the volUUID parameter for vdsClient's prepareImage command is NOT optional. therefore, I have removed any comments marking it as optional in the vdsClient documentation and in vdsmapi-schema.json Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1115556 Change-Id: Ic88bc322bbf84bf79e51edd714687565b123a9c8 Signed-off-by: Candace Sheremeta <cshereme(a)redhat.com> --- M client/vdsClient.py M vdsm/rpc/vdsmapi-schema.json 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/40/38440/1 diff --git a/client/vdsClient.py b/client/vdsClient.py index 07dbaa2..c8aa7cf 100644 --- a/client/vdsClient.py +++ b/client/vdsClient.py @@ -2595,7 +2595,7 @@ 'methodArgs.' )), 'prepareImage': (serv.prepareImage, ( - '<spUUID> <sdUUID> <imgUUID> [<volUUID>]', + '<spUUID> <sdUUID> <imgUUID> <volUUID>', 'Prepare an image, making the needed volumes available.' )), 'teardownImage': (serv.teardownImage, ( diff --git a/vdsm/rpc/vdsmapi-schema.json b/vdsm/rpc/vdsmapi-schema.json index 1d919e8..5b99aaa 100644 --- a/vdsm/rpc/vdsmapi-schema.json +++ b/vdsm/rpc/vdsmapi-schema.json @@ -4715,13 +4715,13 @@ # # @imageID: The UUID of the Image # -# @volumeID: #optional The UUID of the Volume (optional) +# @volumeID: The UUID of the Volume # # Since: 4.15.0 ## {'command': {'class': 'Image', 'name': 'prepare'}, 'data': {'storagepoolID': 'UUID', 'storagedomainID': 'UUID', - 'imageID': 'UUID', '*volumeID': 'UUID'}} + 'imageID': 'UUID', 'volumeID': 'UUID'}} ## # @Image.teardown: -- To view, visit https://gerrit.ovirt.org/38440 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic88bc322bbf84bf79e51edd714687565b123a9c8 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Candace Sheremeta <cshereme(a)redhat.com>

7 12

Change in vdsm[master]: ceph: Support OVF_STORE upload for ceph.
by automation＠ovirt.org 07 Jul '15

07 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: ceph: Support OVF_STORE upload for ceph. ...................................................................... Patch Set 2: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43296 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iffcc1af9861a5580786340c2e5a325d1663b3a5e Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: ceph: Support OVF_STORE upload for ceph.
by automation＠ovirt.org 07 Jul '15

07 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: ceph: Support OVF_STORE upload for ceph. ...................................................................... Patch Set 1: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43296 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iffcc1af9861a5580786340c2e5a325d1663b3a5e Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: freeze: Avoid unneeded freeze during snapshot
by Nir Soffer 07 Jul '15

07 Jul '15

Nir Soffer has posted comments on this change. Change subject: freeze: Avoid unneeded freeze during snapshot ...................................................................... Patch Set 1: (1 comment) https://gerrit.ovirt.org/#/c/43293/1/vdsm/virt/vm.py File vdsm/virt/vm.py: Line 3123 Line 3124 Line 3125 Line 3126 Line 3127 This is not needed since we have same cleanup code in the finally in line 3153 -- To view, visit https://gerrit.ovirt.org/43293 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I328470f700ab74daeed5375c0ade83628d16c387 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <mskrivan(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: freeze: Avoid unneeded freeze during snapshot
by Nir Soffer 07 Jul '15

07 Jul '15

Nir Soffer has posted comments on this change. Change subject: freeze: Avoid unneeded freeze during snapshot ...................................................................... Patch Set 1: I'm not very happy with this version - it is little too big, and make messy code even more messy. Basically this is here so engine side can tested while we refine the implementation. -- To view, visit https://gerrit.ovirt.org/43293 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I328470f700ab74daeed5375c0ade83628d16c387 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <mskrivan(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: freeze: Avoid unneeded freeze during snapshot
by automation＠ovirt.org 07 Jul '15

07 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: freeze: Avoid unneeded freeze during snapshot ...................................................................... Patch Set 1: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43293 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I328470f700ab74daeed5375c0ade83628d16c387 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: migration: replace boolean with proper Events
by automation＠ovirt.org 07 Jul '15

07 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: migration: replace boolean with proper Events ...................................................................... Patch Set 4: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/42887 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I02639749ab884c3542c4d29715756044d777f738 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: net: ignore bondingOptions in persistent networks.
by ibarkan＠redhat.com 07 Jul '15

07 Jul '15

Ido Barkan has uploaded a new change for review. Change subject: net: ignore bondingOptions in persistent networks. ...................................................................... net: ignore bondingOptions in persistent networks. Up until https://gerrit.ovirt.org/#/c/42146/ bondingOptions were mistakenly part of persistent network attributes. So, if we are upgrading from an older enough version, we should drop this entry it the copied persistent networks. Change-Id: I1c29d4e6c109d4fa7b2d293133b8551e423ec139 Signed-off-by: Ido Barkan <ibarkan(a)redhat.com> --- M lib/vdsm/netconfpersistence.py 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/33/43233/1 diff --git a/lib/vdsm/netconfpersistence.py b/lib/vdsm/netconfpersistence.py index 9b041ae..fa59edb 100644 --- a/lib/vdsm/netconfpersistence.py +++ b/lib/vdsm/netconfpersistence.py @@ -366,6 +366,11 @@ bond_attr.get('options')) bond_attr['options'] = self._netinfo.bondOptsForIfcfg( normalized_opts) + # before d18e2f10 bondingOptions were also part of networks, so in case + # we are upgrading from an older version, they should be ignored if + # they exist. + for net_attr in config_copy.networks.itervalues(): + net_attr.pop('bondingOptions') def _normalize_bonding_nics(self, config_copy): for bond_attr in config_copy.bonds.itervalues(): -- To view, visit https://gerrit.ovirt.org/43233 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1c29d4e6c109d4fa7b2d293133b8551e423ec139 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ido Barkan <ibarkan(a)redhat.com>

4 14

Change in vdsm[master]: xmlrpc: do not block forever when waiting on incoming messages
by Piotr Kliczewski 07 Jul '15

07 Jul '15

Piotr Kliczewski has uploaded a new change for review. Change subject: xmlrpc: do not block forever when waiting on incoming messages ...................................................................... xmlrpc: do not block forever when waiting on incoming messages get_request method is used in BaseServer#_handle_request_noblock and it is explicitly stated in docstring that the method should not block. We can't use xmlrpc built-in timeout handling because we detect a protocol and pass socket for processing. Change-Id: I295e3099ea06d786741164e1f240f4662631bf8a Signed-off-by: pkliczewski <piotr.kliczewski(a)gmail.com> --- M lib/vdsm/xmlrpc.py M vdsm/rpc/bindingxmlrpc.py 2 files changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/15/42915/2 diff --git a/lib/vdsm/xmlrpc.py b/lib/vdsm/xmlrpc.py index b98282b..6036527 100644 --- a/lib/vdsm/xmlrpc.py +++ b/lib/vdsm/xmlrpc.py @@ -128,7 +128,11 @@ self.queue.put((connected_socket, socket_address)) def get_request(self): - return self.queue.get(True) + """ + We do not want to block so we wait 3 seconds for incoming + requests and Empty exception is raised. + """ + return self.queue.get(block=True, timeout=3) def server_close(self): self.queue.put((None, None)) diff --git a/vdsm/rpc/bindingxmlrpc.py b/vdsm/rpc/bindingxmlrpc.py index 21a545d..6e68c19 100644 --- a/vdsm/rpc/bindingxmlrpc.py +++ b/vdsm/rpc/bindingxmlrpc.py @@ -24,6 +24,7 @@ import logging import libvirt import threading +import Queue import re import sys @@ -66,6 +67,8 @@ while self._enabled: try: self.server.handle_request() + except Queue.Empty: + pass except Exception as e: if e[0] != EINTR: self.log.error("xml-rpc handler exception", -- To view, visit https://gerrit.ovirt.org/42915 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I295e3099ea06d786741164e1f240f4662631bf8a Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

5 44

Change in vdsm[master]: vm: event: report minimal running vm stats
by automation＠ovirt.org 07 Jul '15

07 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: report minimal running vm stats ...................................................................... Patch Set 1: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43290 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I894a1b10d3cc3dd33664ea9f0842cbc7f1eb07b3 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: emit event on guest status change
by automation＠ovirt.org 07 Jul '15

07 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: emit event on guest status change ...................................................................... Patch Set 1: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43289 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib98d64a250a6d2de70f7fe5206e5a0ad648c151d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: introduce _send_event helper
by automation＠ovirt.org 07 Jul '15

07 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: introduce _send_event helper ...................................................................... Patch Set 1: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43287 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4c25ba9f520e6409cc06e99a2450d2c0d98c26fb Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: emit event on setDownStatus
by automation＠ovirt.org 07 Jul '15

07 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: emit event on setDownStatus ...................................................................... Patch Set 2: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43270 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9a99d074461bcc2b61d15dd46f7d020abbe48afe Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: emit event when domDependentInit is done
by automation＠ovirt.org 07 Jul '15

07 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: emit event when domDependentInit is done ...................................................................... Patch Set 2: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43269 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie379911a374a9ba3e82658592c295f7a9a0ac8a0 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: virt: events: extract function to make event info
by automation＠ovirt.org 07 Jul '15

07 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: virt: events: extract function to make event info ...................................................................... Patch Set 2: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43268 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If60e8422d06fb1ff45a846858856ad68d52fd6ce Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: net: SetupNetworks small cleanups.
by ibarkan＠redhat.com 07 Jul '15

07 Jul '15

Ido Barkan has uploaded a new change for review. Change subject: net: SetupNetworks small cleanups. ...................................................................... net: SetupNetworks small cleanups. Extracted the logic that alters network parameters for bonding and nics to functions, did some internal renaming and few small cleanups. Change-Id: Ib054e144dccbff40b40b5967dca0bf840bce8ab9 Signed-off-by: Ido Barkan <ibarkan(a)redhat.com> --- M lib/vdsm/netconfpersistence.py M vdsm/network/api.py 2 files changed, 55 insertions(+), 28 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/22/42022/1 diff --git a/lib/vdsm/netconfpersistence.py b/lib/vdsm/netconfpersistence.py index 656a588..cdb6d2e 100644 --- a/lib/vdsm/netconfpersistence.py +++ b/lib/vdsm/netconfpersistence.py @@ -413,5 +413,6 @@ else: # isolated bridged network return [] + def unicodize(d): return json.loads(json.dumps(d)) diff --git a/vdsm/network/api.py b/vdsm/network/api.py index 828d67c..3eee1e8 100755 --- a/vdsm/network/api.py +++ b/vdsm/network/api.py @@ -608,27 +608,6 @@ configurator.configureBond(bond) -def _buildBondOptions(bondName, bondings, _netinfo): - logger = logging.getLogger("_buildBondOptions") - - bond = {} - if bondings.get(bondName): - bond['nics'] = bondings[bondName]['nics'] - bond['bondingOptions'] = bondings[bondName].get('options', None) - elif bondName in _netinfo.bondings: - # We may not receive any information about the bonding device if it is - # unchanged. In this case check whether this bond exists on host and - # take its parameters. - logger.debug("Fetching bond %r info", bondName) - existingBond = _netinfo.bondings[bondName] - bond['nics'] = existingBond['slaves'] - bond['bondingOptions'] = existingBond['cfg'].get('BONDING_OPTS', None) - else: - raise ConfigNetworkError(ne.ERR_BAD_PARAMS, "No bonding option given, " - "nor existing bond %s found." % bondName) - return bond - - def _buildSetupHookDict(req_networks, req_bondings, req_options): hook_dict = {'request': {'networks': dict(req_networks), @@ -675,17 +654,14 @@ if 'remove' in attrs: continue - d = dict(attrs) - if 'bonding' in d: - d.update(_buildBondOptions(d['bonding'], bondings, _netinfo)) - else: - d['nics'] = [d.pop('nic')] if 'nic' in d else [] - d['force'] = force + _verify_bond_params(attrs, bondings, _netinfo) + net_attr = update_underlying_device_params(attrs, bondings, _netinfo) + net_attr['force'] = force logger.debug("Adding network %r", network) try: _addNetwork(network, configurator=configurator, - implicitBonding=True, _netinfo=_netinfo, **d) + implicitBonding=True, _netinfo=_netinfo, **net_attr) except ConfigNetworkError as cne: if cne.errCode == ne.ERR_FAILED_IFUP: logger.debug("Adding network %r failed. Running " @@ -697,6 +673,56 @@ _netinfo.updateDevices() # Things like a bond mtu can change +def _verify_bond_params(attrs, bondings, _netinfo): + if 'bonding' in attrs: + bondName = attrs['bonding'] + if bondName not in bondings and bondName not in _netinfo.bondings: + raise ConfigNetworkError( + ne.ERR_BAD_PARAMS, "No bonding option given, nor existing " + "bond %s found." % bondName) + + +def update_underlying_device_params(attrs, bondings, _netinfo): + """update a specific network attributes with relevant bonding/ nic + info.""" + net_attr = dict(attrs) + if 'bonding' in net_attr: + net_attr.update(build_bond_options( + net_attr['bonding'], bondings, _netinfo)) + else: + net_attr['nics'] = ( + [net_attr.pop('nic')] if 'nic' in net_attr else []) + return net_attr + + +def build_bond_options(bond_name, bondings, _netinfo): + """If VDSM is alsed to cinfigure a network over a bonding there are 2 + options: + 1. VDSM needs to create this bond. This is indicated by describing the bond + and it's nics in the 'bonding' dictionary. + 2. Bonding already exists on the host. This is indicated bu just naming + the bonding name in the network attributes dictionary. In this case + VDSM tries to get bonding options and nics from the kernel. User might + add extra configuration to change an existing bond. + Etherway, bonding name, options and nics are places in the network + attributes before given to the configurator. This is also how the network + is persisted VDSM. + """ + bond = {} + non_existing_bond = bondings.get(bond_name) + if non_existing_bond: + bond['nics'] = non_existing_bond['nics'] + bond['bondingOptions'] = non_existing_bond.get('options') + else: + # bondName must be in _netinfo.bondings at this point + logging.debug("Fetching bond %r info", bond_name) + existing_bond = _netinfo.bondings[bond_name] + bond['nics'] = existing_bond['slaves'] + bond['bondingOptions'] = existing_bond['cfg'].get('BONDING_OPTS') + + return bond + + def _get_connectivity_timeout(options): return int(options.get('connectivityTimeout', CONNECTIVITY_TIMEOUT_DEFAULT)) -- To view, visit https://gerrit.ovirt.org/42022 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib054e144dccbff40b40b5967dca0bf840bce8ab9 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ido Barkan <ibarkan(a)redhat.com>

4 34

Change in vdsm[ovirt-3.5]: net: unify imports
by ibarkan＠redhat.com 07 Jul '15

07 Jul '15

Ido Barkan has uploaded a new change for review. Change subject: net: unify imports ...................................................................... net: unify imports Change-Id: I06f041af33dbd247518b7074a65f767b4fec569a Signed-off-by: Ido Barkan <ibarkan(a)redhat.com> --- M vdsm/vdsm-restore-net-config 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/75/43275/1 diff --git a/vdsm/vdsm-restore-net-config b/vdsm/vdsm-restore-net-config index f40df51..c4a9288 100755 --- a/vdsm/vdsm-restore-net-config +++ b/vdsm/vdsm-restore-net-config @@ -29,7 +29,6 @@ from vdsm import ipwrapper from vdsm import netinfo from vdsm.constants import P_VDSM_RUN -from vdsm.netconfpersistence import KernelConfig, BaseConfig # Ifcfg persistence restoration from network.configurators import ifcfg @@ -37,7 +36,8 @@ # Unified persistence restoration from network.api import setupNetworks from network import configurators -from vdsm.netconfpersistence import RunningConfig, PersistentConfig +from vdsm.netconfpersistence import (RunningConfig, PersistentConfig, + KernelConfig, BaseConfig) import pkgutil _NETS_RESTORED_MARK = os.path.join(P_VDSM_RUN, 'nets_restored') -- To view, visit https://gerrit.ovirt.org/43275 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I06f041af33dbd247518b7074a65f767b4fec569a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Ido Barkan <ibarkan(a)redhat.com>

2 3

Change in vdsm[ovirt-3.5]: net tests: unbreak f20 pep8
by Dan Kenigsberg 07 Jul '15

07 Jul '15

Dan Kenigsberg has uploaded a new change for review. Change subject: net tests: unbreak f20 pep8 ...................................................................... net tests: unbreak f20 pep8 commit e837ce2 moved a lot of code and disturbed indentation. Bug-Url: https://bugzilla.redhat.com/1203422 Label: ovirt-3.5-only Change-Id: Ie428df7f34800eca4327a956770e3d1e6c513c9a Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M tests/functional/networkTests.py 1 file changed, 4 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/90/43190/1 diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py index 37979ba..adc7d1c 100644 --- a/tests/functional/networkTests.py +++ b/tests/functional/networkTests.py @@ -929,8 +929,8 @@ # Try to add additional VLANed bridged network, should succeed netNameVlanBridged = NETWORK_NAME + '-5' d['vlan'], d['bridged'] = '200', True - status, msg = self.setupNetworks({netNameVlanBridged: - d}, {}, NOCHK) + status, msg = self.setupNetworks( + {netNameVlanBridged: d}, {}, NOCHK) self.assertEqual(status, SUCCESS, msg) self.assertNetworkDoesntExist(netNameBridgeless) @@ -1003,9 +1003,8 @@ self.assertNetworkDoesntExist(netNameBridged) # Clean all - status, msg = self.setupNetworks({NETWORK_NAME: - dict(remove=True)}, - {}, NOCHK) + status, msg = self.setupNetworks( + {NETWORK_NAME: dict(remove=True)}, {}, NOCHK) self.assertEquals(status, SUCCESS, msg) self.assertNetworkDoesntExist(NETWORK_NAME) -- To view, visit https://gerrit.ovirt.org/43190 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie428df7f34800eca4327a956770e3d1e6c513c9a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

6 9

Change in vdsm[master]: snapshot: Add vdsClient freeze() and thaw() APIs
by Nir Soffer 07 Jul '15

07 Jul '15

Nir Soffer has uploaded a new change for review. Change subject: snapshot: Add vdsClient freeze() and thaw() APIs ...................................................................... snapshot: Add vdsClient freeze() and thaw() APIs These verbs are needed if you want to create a snapshot manually via the shell on a vm containing a ceph disk. Note that this requires access to cinder cli for creating the ceph snapshot, so this may not be very useful. However, having these verbs in vdsClient make it easy to test and debug these features. Change-Id: I98872132767f3edd6d028cd9545e282e89f12777 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M client/vdsClient.py 1 file changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/98/43098/1 diff --git a/client/vdsClient.py b/client/vdsClient.py index 195e79b..011f3cf 100755 --- a/client/vdsClient.py +++ b/client/vdsClient.py @@ -1865,6 +1865,20 @@ status = self.s.stopMonitoringDomain(sdUUID) return status['status']['code'], status['status']['message'] + def freeze(self, args): + validateArgTypes(args, [str], requiredArgsNumber=1) + vmUUID = args[0] + mountpoints = args[1:] + res = self.s.vmFreeze(vmUUID, mountpoints) + return res['status']['code'], res['status']['message'] + + def thaw(self, args): + validateArgTypes(args, [str], requiredArgsNumber=1) + vmUUID = args[0] + mountpoints = args[1:] + res = self.s.vmThaw(vmUUID, mountpoints) + return res['status']['code'], res['status']['message'] + def snapshot(self, args): vmUUID, sdUUID, imgUUID, baseVolUUID, volUUID = args @@ -2806,6 +2820,18 @@ ('<sdUUID>', 'Stop monitoring SD: sdUUID' )), + 'freeze': (serv.freeze, + ('<vmId> [<mountpoint> ...]', + 'Freeze specified guest filesystems. If no mountpoint ' + 'is specified, every mounted filesystem in the guest ' + 'is frozen.' + )), + 'thaw': (serv.thaw, + ('<vmId> [<mountpoint> ...]', + 'Thaw specified guest filesystems. If no mountpoint ' + 'is specified, every mounted filesystem in the guest ' + 'is thawed.' + )), 'snapshot': (serv.snapshot, ('<vmId> <sdUUID> <imgUUID> <baseVolUUID> <volUUID>', 'Take a live snapshot' -- To view, visit https://gerrit.ovirt.org/43098 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I98872132767f3edd6d028cd9545e282e89f12777 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

8 16

Change in vdsm[master]: snapshot: Add VM.freeze() and VM.thaw() verbs
by automation＠ovirt.org 07 Jul '15

07 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: snapshot: Add VM.freeze() and VM.thaw() verbs ...................................................................... Patch Set 8: * Update tracker::IGNORE, no Bug-Url found * Set MODIFIED::IGNORE, no Bug-Url found. -- To view, visit https://gerrit.ovirt.org/43058 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I44c4237841e44548f48f626f4241d3f2e484930e Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Martin Polednik <mpolednik(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: snapshot: Add VM.freeze() and VM.thaw() verbs
by Dan Kenigsberg 07 Jul '15

07 Jul '15

Dan Kenigsberg has submitted this change and it was merged. Change subject: snapshot: Add VM.freeze() and VM.thaw() verbs ...................................................................... snapshot: Add VM.freeze() and VM.thaw() verbs This patch adds new verbs exposing Vm.freeze() and Vm.thaw(), required for taking a snapshot of network disks (such as Ceph). Change-Id: I44c4237841e44548f48f626f4241d3f2e484930e Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> Reviewed-on: https://gerrit.ovirt.org/43058 Reviewed-by: Michal Skrivanek <michal.skrivanek(a)redhat.com> Reviewed-by: Francesco Romani <fromani(a)redhat.com> Reviewed-by: Martin Polednik <mpolednik(a)redhat.com> Continuous-Integration: Jenkins CI Reviewed-by: Vinzenz Feenstra <vfeenstr(a)redhat.com> Tested-by: Daniel Erez <derez(a)redhat.com> Reviewed-by: Dan Kenigsberg <danken(a)redhat.com> --- M vdsm/API.py M vdsm/rpc/bindingxmlrpc.py M vdsm/rpc/vdsmapi-schema.json 3 files changed, 48 insertions(+), 0 deletions(-) Approvals: Nir Soffer: Verified Daniel Erez: Verified Jenkins CI: Passed CI tests Vinzenz Feenstra: Looks good to me, but someone else must approve Dan Kenigsberg: Looks good to me, approved Francesco Romani: Looks good to me, but someone else must approve Michal Skrivanek: Looks good to me, but someone else must approve Martin Polednik: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/43058 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I44c4237841e44548f48f626f4241d3f2e484930e Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Martin Polednik <mpolednik(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

1 0

Change in vdsm[master]: snapshot: Add VM.freeze() and VM.thaw() verbs
by Dan Kenigsberg 07 Jul '15

07 Jul '15

Dan Kenigsberg has posted comments on this change. Change subject: snapshot: Add VM.freeze() and VM.thaw() verbs ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.ovirt.org/43058 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I44c4237841e44548f48f626f4241d3f2e484930e Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Martin Polednik <mpolednik(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: snapshot: Start the snapshot module
by Nir Soffer 07 Jul '15

07 Jul '15

Nir Soffer has uploaded a new change for review. Change subject: snapshot: Start the snapshot module ...................................................................... snapshot: Start the snapshot module This module will hold the code taking a vm snapshot. Currently it include only the GuestAgent class, responsible for freezing and thawing guest file systems during a snapshot. This module is an attempt to add testable vm code without adding more code to the Vm class. Change-Id: I8e4c54f461039de99823c3b80a10be0a960c4273 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M debian/vdsm.install M tests/Makefile.am A tests/vmSnapshotTests.py M tests/vmfakelib.py M vdsm.spec.in M vdsm/virt/Makefile.am A vdsm/virt/snapshot.py 7 files changed, 117 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/18/43018/1 diff --git a/debian/vdsm.install b/debian/vdsm.install index 35fcba7..aac35c0 100644 --- a/debian/vdsm.install +++ b/debian/vdsm.install @@ -152,6 +152,7 @@ ./usr/share/vdsm/virt/periodic.py ./usr/share/vdsm/virt/sampling.py ./usr/share/vdsm/virt/secret.py +./usr/share/vdsm/virt/snapshot.py ./usr/share/vdsm/virt/vm.py ./usr/share/vdsm/virt/vmchannels.py ./usr/share/vdsm/virt/vmexitreason.py diff --git a/tests/Makefile.am b/tests/Makefile.am index b9b8e72..a472ee6 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -110,6 +110,7 @@ vmApiTests.py \ vmfakelibTests.py \ vmMigrationTests.py \ + vmSnapshotTests.py \ vmSecretTests.py \ vmStorageTests.py \ vmTests.py \ diff --git a/tests/vmSnapshotTests.py b/tests/vmSnapshotTests.py new file mode 100644 index 0000000..23f0c9b --- /dev/null +++ b/tests/vmSnapshotTests.py @@ -0,0 +1,41 @@ +# +# Copyright 2015 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# +# Refer to the README and COPYING files for full details of the license +# + +import logging +from testlib import VdsmTestCase +import vmfakelib +from virt import snapshot + + +class SnapshotGuestAgentTests(VdsmTestCase): + + def test_freeze_filesystems(self): + dom = vmfakelib.Domain() + guest = snapshot.GuestAgent(dom, logging.getLogger()) + guest.freeze_filesystems() + self.assertEqual(dom.__recording__, + [("fsFreeze", (), {"mountpoints": None})]) + + def test_thaw_filesystems(self): + dom = vmfakelib.Domain() + guest = snapshot.GuestAgent(dom, logging.getLogger()) + guest.thaw_filesystems() + self.assertEqual(dom.__recording__, + [("fsThaw", (), {"mountpoints": None})]) diff --git a/tests/vmfakelib.py b/tests/vmfakelib.py index 2c841ca..cfdea00 100644 --- a/tests/vmfakelib.py +++ b/tests/vmfakelib.py @@ -244,6 +244,14 @@ def getDowntimes(self): return self._downtimes + @recorded + def fsFreeze(self, mountpoints=None, flags=0): + self._failIfRequested() + + @recorded + def fsThaw(self, mountpoints=None, flags=0): + self._failIfRequested() + class GuestAgent(object): def __init__(self): diff --git a/vdsm.spec.in b/vdsm.spec.in index 2f5ffc8..91ffcbb 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -921,6 +921,7 @@ %{_datadir}/%{vdsm_name}/virt/periodic.py* %{_datadir}/%{vdsm_name}/virt/sampling.py* %{_datadir}/%{vdsm_name}/virt/secret.py* +%{_datadir}/%{vdsm_name}/virt/snapshot.py* %{_datadir}/%{vdsm_name}/virt/vmchannels.py* %{_datadir}/%{vdsm_name}/virt/vmstats.py* %{_datadir}/%{vdsm_name}/virt/vmstatus.py* diff --git a/vdsm/virt/Makefile.am b/vdsm/virt/Makefile.am index 745e7dc..aec4981 100644 --- a/vdsm/virt/Makefile.am +++ b/vdsm/virt/Makefile.am @@ -31,6 +31,7 @@ periodic.py \ sampling.py \ secret.py \ + snapshot.py \ vm.py \ vmchannels.py \ vmexitreason.py \ diff --git a/vdsm/virt/snapshot.py b/vdsm/virt/snapshot.py new file mode 100644 index 0000000..2629ed6 --- /dev/null +++ b/vdsm/virt/snapshot.py @@ -0,0 +1,64 @@ +# +# Copyright 2015 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# +# Refer to the README and COPYING files for full details of the license +# + +""" +snapshot - take vm snapshot + +This module will implement vm snapshot. Currently it only contains the +GuestAgent class, implementing filesystem freezing and thawing, using during a +snapshot flow. +""" + + +class GuestAgent(object): + """ + For consistent snapshot, we must freeze the guest filesystems before the + snapshot, and thaw them when the snapshot is done. These operations are + implemented by a guest agent, and application specific code on the guest. + + If a guest agent supporiting these operation is not installed or libvirt + fail to communicate with the guest agent, these operations will fail. + """ + + def __init__(self, dom, log): + self._dom = dom + self._log = log + + def freeze_filesystems(self, mountpoints=None): + """ + Freeze specified filesystems within the guest (hence guest agent may be + required depending on hypervisor used). + + If mountpoints is None every mounted filesystem on the guest is frozen. + """ + self._log.info("Freezing guest filesystems (moutpoints=%s)", + mountpoints) + self._dom.fsFreeze(mountpoints=mountpoints) + + def thaw_filesystems(self, mountpoints=None): + """ + Thaw specified filesystems within the guest (hence guest agent may be + required depending on hypervisor used). + + If mountpoints is None every mounted filesystem on the guest is thawed. + """ + self._log.info("Thawing guest filesystems (moutpoints=%s)", + mountpoints) + self._dom.fsThaw(mountpoints=mountpoints) -- To view, visit https://gerrit.ovirt.org/43018 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8e4c54f461039de99823c3b80a10be0a960c4273 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

8 50

Change in vdsm[ovirt-3.5-gluster]: gluster: rename glusterCreateBrick to glusterBrickCreate
by barumuga＠redhat.com 07 Jul '15

07 Jul '15

Hello Piotr Kliczewski, Timothy Asir, Dan Kenigsberg, I'd like you to do a code review. Please visit https://gerrit.ovirt.org/43263 to review the following change. Change subject: gluster: rename glusterCreateBrick to glusterBrickCreate ...................................................................... gluster: rename glusterCreateBrick to glusterBrickCreate To make consistency in function names in supervdsm and verb names in vdsm, this patch renames verb glusterCreateBrick to glusterBrickCreate Change-Id: I367a864bc9bf4aa9b6a0d36b64f541fa89c61c0d Signed-off-by: Bala.FA <barumuga(a)redhat.com> --- M client/vdsClientGluster.py M vdsm/gluster/api.py M vdsm/gluster/apiwrapper.py M vdsm/gluster/storagedev.py M vdsm/rpc/vdsmapi-gluster-schema.json 5 files changed, 11 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/63/43263/1 diff --git a/client/vdsClientGluster.py b/client/vdsClientGluster.py index a4bce63..76b91e1 100644 --- a/client/vdsClientGluster.py +++ b/client/vdsClientGluster.py @@ -633,7 +633,7 @@ pp.pprint(status) return status['status']['code'], status['status']['message'] - def do_glusterCreateBrick(self, args): + def do_glusterBrickCreate(self, args): params = self._eqSplit(args) devList = params.get('devices', '').split(',') brickName = params.get('brickName', '') @@ -646,7 +646,7 @@ raidParams['stripeSize'] = int(params.get('stripeSize', 0)) raidParams['pdCount'] = int(params.get('pdCount', 0)) - status = self.s.glusterCreateBrick(brickName, mountPoint, + status = self.s.glusterBrickCreate(brickName, mountPoint, devList, fsType, raidParams) pp.pprint(status) return status['status']['code'], status['status']['message'] @@ -1172,8 +1172,8 @@ ('[volumeName=<volume_name>]', 'snapshot list for given volume' )), - 'glusterCreateBrick': ( - serv.do_glusterCreateBrick, + 'glusterBrickCreate': ( + serv.do_glusterBrickCreate, ('brickName=<brick_name> mountPoint=<mountPoint> ' 'devices=<device[,device, ...]> ' '[raidType=<raid_type>] [stripeSize=<stripe_size>] ' diff --git a/vdsm/gluster/api.py b/vdsm/gluster/api.py index 0c5829f..361e0c5 100644 --- a/vdsm/gluster/api.py +++ b/vdsm/gluster/api.py @@ -677,9 +677,9 @@ return {'snapshotList': status} @exportAsVerb - def createBrick(self, name, mountPoint, devList, fsType=None, + def brickCreate(self, name, mountPoint, devList, fsType=None, raidParams={}, options=None): - status = self.svdsmProxy.glusterCreateBrick(name, + status = self.svdsmProxy.glusterBrickCreate(name, mountPoint, devList, fsType, diff --git a/vdsm/gluster/apiwrapper.py b/vdsm/gluster/apiwrapper.py index 4768a86..f607dd4 100644 --- a/vdsm/gluster/apiwrapper.py +++ b/vdsm/gluster/apiwrapper.py @@ -81,9 +81,9 @@ def storageDevicesList(self, options=None): return self._gluster.storageDevicesList() - def createBrick(self, name, mountPoint, devList, fsType=None, + def brickCreate(self, name, mountPoint, devList, fsType=None, raidParams={}): - return self._gluster.createBrick(name, mountPoint, + return self._gluster.brickCreate(name, mountPoint, devList, fsType, raidParams) diff --git a/vdsm/gluster/storagedev.py b/vdsm/gluster/storagedev.py index eb8b103..4fffef8 100644 --- a/vdsm/gluster/storagedev.py +++ b/vdsm/gluster/storagedev.py @@ -129,7 +129,7 @@ @makePublic -def createBrick(brickName, mountPoint, devNameList, fsType=DEFAULT_FS_TYPE, +def brickCreate(brickName, mountPoint, devNameList, fsType=DEFAULT_FS_TYPE, raidParams={}): def _getDeviceList(devNameList): return [blivetEnv.devicetree.getDeviceByName(devName.split("/")[-1]) diff --git a/vdsm/rpc/vdsmapi-gluster-schema.json b/vdsm/rpc/vdsmapi-gluster-schema.json index d83344c..51dd699 100644 --- a/vdsm/rpc/vdsmapi-gluster-schema.json +++ b/vdsm/rpc/vdsmapi-gluster-schema.json @@ -1271,7 +1271,7 @@ 'data': {'type': 'str', 'stripeSize': 'int', 'diskCnt': 'int'}} ## -# @GlusterHost.createBrick: +# @GlusterHost.brickCreate: # # Create a brick for the gluster volume # @@ -1290,7 +1290,7 @@ # # Since: 4.17.0 ## -{'command': {'class': 'GlusterHost', 'name': 'createBrick'}, +{'command': {'class': 'GlusterHost', 'name': 'brickCreate'}, 'data': {'name': 'str', 'mountPoint': 'str', 'devList': ['str'], '*fsType': 'str', '*raidParams': 'RaidDevice'}, 'returns': 'bool'} -- To view, visit https://gerrit.ovirt.org/43263 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I367a864bc9bf4aa9b6a0d36b64f541fa89c61c0d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5-gluster Gerrit-Owner: Bala.FA <barumuga(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Timothy Asir <tjeyasin(a)redhat.com>

3 2

Change in vdsm[master]: snapshot: Add VM.freeze() and VM.thaw() verbs
by derez＠redhat.com 07 Jul '15

07 Jul '15

Daniel Erez has posted comments on this change. Change subject: snapshot: Add VM.freeze() and VM.thaw() verbs ...................................................................... Patch Set 7: Verified+1 -- To view, visit https://gerrit.ovirt.org/43058 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I44c4237841e44548f48f626f4241d3f2e484930e Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Martin Polednik <mpolednik(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vdsm: pep8 - adding missing new lines
by mmirecki＠redhat.com 07 Jul '15

07 Jul '15

Marcin Mirecki has uploaded a new change for review. Change subject: vdsm: pep8 - adding missing new lines ...................................................................... vdsm: pep8 - adding missing new lines Changes: Added blank lines to make pep8 compliant Change-Id: I8d2bfaf6e2655ef7088e5e73ead7f1cdd453b422 Signed-off-by: mmirecki <mmirecki(a)redhat.com> Signed-off-by: Marcin Mirecki <mmirecki(a)redhat.com> --- M lib/vdsm/response.py 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/88/43188/1 diff --git a/lib/vdsm/response.py b/lib/vdsm/response.py index 4e5d8c2..410b581 100644 --- a/lib/vdsm/response.py +++ b/lib/vdsm/response.py @@ -41,6 +41,7 @@ } } + def error_raw(code, message): return { "status": { @@ -49,5 +50,6 @@ } } + def is_failure(res): return res["status"]["code"] != doneCode["code"] -- To view, visit https://gerrit.ovirt.org/43188 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8d2bfaf6e2655ef7088e5e73ead7f1cdd453b422 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Marcin Mirecki <mmirecki(a)redhat.com>

3 4

Change in vdsm[master]: network: disable IPv6 via sysctl if no IPv6 functionality wa...
by osvoboda＠redhat.com 07 Jul '15

07 Jul '15

Ondřej Svoboda has uploaded a new change for review. Change subject: network: disable IPv6 via sysctl if no IPv6 functionality was requested ...................................................................... network: disable IPv6 via sysctl if no IPv6 functionality was requested This applies to bridges. On CentOS/RHEL 7, disable_ipv6=0 is the default so bridges allowed IPv6 traffic even though it was not enabled by setting a static address or using DHCPv6. Change-Id: I2314d4bc120c15af44ff9e20c9281ab69c84ad0a Bug-Url: https://bugzilla.redhat.com/1219363 Signed-off-by: Ondřej Svoboda <osvoboda(a)redhat.com> --- M tests/functional/networkTests.py M vdsm/network/configurators/ifcfg.py M vdsm/network/configurators/iproute2.py 3 files changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/52/43252/1 diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py index f3dff3f..94ee4db 100644 --- a/tests/functional/networkTests.py +++ b/tests/functional/networkTests.py @@ -1685,6 +1685,9 @@ if 6 in families: self.assertIn(IPv6_ADDRESS_AND_CIDR, test_net['ipv6addrs']) self.assertEqual(IPv6_GATEWAY, test_net['ipv6gateway']) + else: + # VDSM disables IPv6 via sysctl if IPv6 is not requested + self.assertEqual([], test_net['ipv6addrs']) delete = {NETWORK_NAME: {'remove': True}} status, msg = self.vdsm_net.setupNetworks(delete, {}, {}) self.assertEqual(status, SUCCESS, msg) diff --git a/vdsm/network/configurators/ifcfg.py b/vdsm/network/configurators/ifcfg.py index e008994..1b36199 100644 --- a/vdsm/network/configurators/ifcfg.py +++ b/vdsm/network/configurators/ifcfg.py @@ -35,6 +35,7 @@ from vdsm import constants from vdsm import ipwrapper from vdsm import netinfo +from vdsm import sysctl from vdsm import utils from vdsm.netconfpersistence import RunningConfig @@ -93,6 +94,10 @@ bridge.port.configure(**opts) self._addSourceRoute(bridge) _ifup(bridge) + if not bridge.ipv6.address and not bridge.ipv6.ipv6autoconf and ( + not bridge.ipv6.dhcpv6): + # disallow IPv6 traffic on the bridge if IPv6 is not requested + sysctl.disable_ipv6(bridge.name) def configureVlan(self, vlan, **opts): self.configApplier.addVlan(vlan, **opts) diff --git a/vdsm/network/configurators/iproute2.py b/vdsm/network/configurators/iproute2.py index 9a8b751..31b1cf4 100644 --- a/vdsm/network/configurators/iproute2.py +++ b/vdsm/network/configurators/iproute2.py @@ -25,6 +25,7 @@ from vdsm.constants import EXT_BRCTL from vdsm.ipwrapper import routeAdd, routeDel, ruleAdd, ruleDel, IPRoute2Error from vdsm.netconfpersistence import RunningConfig +from vdsm import sysctl from vdsm.utils import CommandPath from vdsm.utils import execCmd @@ -72,6 +73,10 @@ self.configApplier.addBridgePort(bridge) DynamicSourceRoute.addInterfaceTracking(bridge) self.configApplier.setIfaceConfigAndUp(bridge) + if not bridge.ipv6.address and not bridge.ipv6.ipv6autoconf and ( + not bridge.ipv6.dhcpv6): + # disallow IPv6 traffic on the bridge if IPv6 is not requested + sysctl.disable_ipv6(bridge.name) self._addSourceRoute(bridge) if 'custom' in opts and 'bridge_opts' in opts['custom']: self.configApplier._setBridgeOpts(bridge, -- To view, visit https://gerrit.ovirt.org/43252 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2314d4bc120c15af44ff9e20c9281ab69c84ad0a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ondřej Svoboda <osvoboda(a)redhat.com>

3 7

Change in vdsm[master]: api: use recommended logging
by fromani＠redhat.com 07 Jul '15

07 Jul '15

Francesco Romani has uploaded a new change for review. Change subject: api: use recommended logging ...................................................................... api: use recommended logging Update the logging in setLogLevel to use less convoluted and more modern idiom. Change-Id: I91c3b4aa3344b5093d13fb11e017394cf0bf52b2 Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M vdsm/API.py 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/22/38422/1 diff --git a/vdsm/API.py b/vdsm/API.py index 42c471e..6b8da3a 100644 --- a/vdsm/API.py +++ b/vdsm/API.py @@ -1369,8 +1369,7 @@ Doesn't survive a restart """ - logging.getLogger('clientIF.setLogLevel').info('Setting loglevel ' - 'to %s' % level) + logging.info('Setting loglevel to %s', level) handlers = logging.getLogger().handlers [fileHandler] = [h for h in handlers if isinstance(h, logging.FileHandler)] -- To view, visit https://gerrit.ovirt.org/38422 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I91c3b4aa3344b5093d13fb11e017394cf0bf52b2 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

5 16

Change in vdsm[master]: vm: clock: always use rtc timer
by fromani＠redhat.com 07 Jul '15

07 Jul '15

Francesco Romani has uploaded a new change for review. Change subject: vm: clock: always use rtc timer ...................................................................... vm: clock: always use rtc timer We should always use the <timer name='rtc' tickpolicy='catchup'/> attribute. It was removed only because of a misunderstandment of the libvirt docs. Change-Id: If9c3996e95ac0848f9b0a6c7c77b1aeb6da860d7 Bug-Url: https://bugzilla.redhat.com/1215610 Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M tests/vmTests.py M vdsm/virt/vmxml.py 2 files changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/95/43195/1 diff --git a/tests/vmTests.py b/tests/vmTests.py index 038ffcc..96765af 100644 --- a/tests/vmTests.py +++ b/tests/vmTests.py @@ -338,6 +338,7 @@ clockXML = """ <clock adjustment="-3600" offset="variable"> <timer name="hypervclock"/> + <timer name="rtc" tickpolicy="catchup"/> <timer name="pit" tickpolicy="delay"/> <timer name="hpet" present="no"/> </clock>""" diff --git a/vdsm/virt/vmxml.py b/vdsm/virt/vmxml.py index 38d2200..7c0be12 100644 --- a/vdsm/virt/vmxml.py +++ b/vdsm/virt/vmxml.py @@ -189,6 +189,7 @@ for hyperv: <clock offset="variable" adjustment="-3600"> <timer name="hypervclock"> + <timer name="rtc" tickpolicy="catchup"> </clock> """ @@ -196,8 +197,7 @@ adjustment=str(self.conf.get('timeOffset', 0))) if utils.tobool(self.conf.get('hypervEnable', 'false')): m.appendChildWithArgs('timer', name='hypervclock') - else: - m.appendChildWithArgs('timer', name='rtc', tickpolicy='catchup') + m.appendChildWithArgs('timer', name='rtc', tickpolicy='catchup') m.appendChildWithArgs('timer', name='pit', tickpolicy='delay') if self.arch == caps.Architecture.X86_64: -- To view, visit https://gerrit.ovirt.org/43195 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If9c3996e95ac0848f9b0a6c7c77b1aeb6da860d7 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

5 9

Change in vdsm[master]: vm: event: emit event on setDownStatus
by automation＠ovirt.org 07 Jul '15

07 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: emit event on setDownStatus ...................................................................... Patch Set 1: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43270 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9a99d074461bcc2b61d15dd46f7d020abbe48afe Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: emit event when domDependentInit is done
by automation＠ovirt.org 07 Jul '15

07 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: emit event when domDependentInit is done ...................................................................... Patch Set 1: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43269 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie379911a374a9ba3e82658592c295f7a9a0ac8a0 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: virt: events: extract function to make event info
by automation＠ovirt.org 07 Jul '15

07 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: virt: events: extract function to make event info ...................................................................... Patch Set 1: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43268 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If60e8422d06fb1ff45a846858856ad68d52fd6ce Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: gluster.hostname: simplify by using a constant for the 'host...
by osvoboda＠redhat.com 07 Jul '15

07 Jul '15

Ondřej Svoboda has uploaded a new change for review. Change subject: gluster.hostname: simplify by using a constant for the 'hostname' executable ...................................................................... gluster.hostname: simplify by using a constant for the 'hostname' executable Change-Id: Ic4b4a0062bedc41bee6528c1d06d707b4f7547e6 Signed-off-by: Ondřej Svoboda <osvoboda(a)redhat.com> --- M lib/vdsm/constants.py.in M vdsm/gluster/Makefile.am R vdsm/gluster/hostname.py 3 files changed, 5 insertions(+), 16 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/21/37621/1 diff --git a/lib/vdsm/constants.py.in b/lib/vdsm/constants.py.in index 89bdebd..fa65b0c 100644 --- a/lib/vdsm/constants.py.in +++ b/lib/vdsm/constants.py.in @@ -114,6 +114,8 @@ EXT_GREP = '@GREP_PATH@' +EXT_HOSTNAME = '@HOSTNAME_PATH@' + EXT_IFDOWN = '@IFDOWN_PATH@' EXT_IFUP = '@IFUP_PATH@' EXT_IONICE = '@IONICE_PATH@' diff --git a/vdsm/gluster/Makefile.am b/vdsm/gluster/Makefile.am index 96b8054..da32685 100644 --- a/vdsm/gluster/Makefile.am +++ b/vdsm/gluster/Makefile.am @@ -22,10 +22,6 @@ vdsmglusterdir = $(vdsmdir)/gluster -nodist_vdsmgluster_PYTHON = \ - hostname.py - $(NULL) - dist_vdsmgluster_PYTHON = \ __init__.py \ api.py \ @@ -33,19 +29,9 @@ cli.py \ exception.py \ gfapi.py \ + hostname.py \ hooks.py \ services.py \ storagedev.py \ tasks.py \ $(NULL) - -EXTRA_DIST = \ - hostname.py.in - $(NULL) - -CLEANFILES = \ - hostname.py - $(NULL) - -all-local: \ - $(nodist_vdsmgluster_PYTHON) diff --git a/vdsm/gluster/hostname.py.in b/vdsm/gluster/hostname.py similarity index 91% rename from vdsm/gluster/hostname.py.in rename to vdsm/gluster/hostname.py index c817b0a..6b30ac3 100644 --- a/vdsm/gluster/hostname.py.in +++ b/vdsm/gluster/hostname.py @@ -18,6 +18,7 @@ # Refer to the README and COPYING files for full details of the license # +from vdsm import constants from vdsm import utils @@ -31,7 +32,7 @@ def getHostNameFqdn(): - rc, out, err = utils.execCmd(['@HOSTNAME_PATH@', '--fqdn']) + rc, out, err = utils.execCmd([constants.EXT_HOSTNAME, '--fqdn']) if rc: raise HostNameException(rc) else: -- To view, visit http://gerrit.ovirt.org/37621 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic4b4a0062bedc41bee6528c1d06d707b4f7547e6 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ondřej Svoboda <osvoboda(a)redhat.com>

6 19

Change in vdsm[master]: snapshot: Add VM.freeze() and VM.thaw() verbs
by Vinzenz Feenstra 07 Jul '15

07 Jul '15

Vinzenz Feenstra has posted comments on this change. Change subject: snapshot: Add VM.freeze() and VM.thaw() verbs ...................................................................... Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/43058 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I44c4237841e44548f48f626f4241d3f2e484930e Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Martin Polednik <mpolednik(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vdsm-reg: remove the sub-project
by Douglas Schilling Landgraf 06 Jul '15

06 Jul '15

Douglas Schilling Landgraf has posted comments on this change. Change subject: vdsm-reg: remove the sub-project ...................................................................... Patch Set 1: Verified+1 I could generate vdsm without vdsm-reg package. RIP vdsm-reg. -- To view, visit https://gerrit.ovirt.org/43254 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I5d19ddb0e65657515e2dc0eb9eeae320d8d6bf71 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vdsm-reg: remove the sub-project
by automation＠ovirt.org 06 Jul '15

06 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vdsm-reg: remove the sub-project ...................................................................... Patch Set 1: * Update tracker::#1231379::OK * Check Bug-Url::OK * Check Public Bug::#1231379::OK, public bug * Check Product::#1231379::OK, Correct product Red Hat Enterprise Virtualization Manager * Check TR::SKIP, not in a monitored branch (ovirt-3.5 ovirt-3.4 ovirt-3.3 ovirt-3.2) * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43254 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I5d19ddb0e65657515e2dc0eb9eeae320d8d6bf71 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: tests: restore default timeout value
by Piotr Kliczewski 06 Jul '15

06 Jul '15

Piotr Kliczewski has uploaded a new change for review. Change subject: tests: restore default timeout value ...................................................................... tests: restore default timeout value CI machines are overloaded with work so we need to give the test a bit more time before we assume that the response not arrived. Change-Id: Ia9edf74e5a06f8ceb8e64000dcaea9dee8247bae Signed-off-by: pkliczewski <piotr.kliczewski(a)gmail.com> --- M tests/jsonRpcTests.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/18/42918/1 diff --git a/tests/jsonRpcTests.py b/tests/jsonRpcTests.py index 3606bba..7bd6dbc 100644 --- a/tests/jsonRpcTests.py +++ b/tests/jsonRpcTests.py @@ -41,7 +41,7 @@ JsonRpcRequest -CALL_TIMEOUT = 3 +CALL_TIMEOUT = 15 CALL_ID = '2c8134fd-7dd4-4cfc-b7f8-6b7549399cb6' -- To view, visit https://gerrit.ovirt.org/42918 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia9edf74e5a06f8ceb8e64000dcaea9dee8247bae Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>

4 12

Change in vdsm[master]: net: maintain legacy addNetwork/delNetwork APIs
by Dan Kenigsberg 06 Jul '15

06 Jul '15

Dan Kenigsberg has uploaded a new change for review. Change subject: net: maintain legacy addNetwork/delNetwork APIs ...................................................................... net: maintain legacy addNetwork/delNetwork APIs commits 43a6b9 and 167b02 changed the signature of addNetwork and delNetwork respectively. This must not happen, as Engine 3.5 uses argument names in its API. With http://www.ovirt.org/Features/HostNetworkingApi implemented in engine-3.6, no one is going to call Vdsm's addNetwork/delNetwork any more. However, we must keep backward compatibility as long as engine-3.5 is supported. Bug-Url: https://bugzilla.redhat.com/1229632 Change-Id: I2eaf2b41e3e1c88721d855af0ccc3abd6c200034 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M vdsm/API.py 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/87/43187/1 diff --git a/vdsm/API.py b/vdsm/API.py index 89f35ac..eafceb7 100644 --- a/vdsm/API.py +++ b/vdsm/API.py @@ -1453,13 +1453,14 @@ finally: self._cif._networkSemaphore.release() - def addNetwork(self, network, vlan=None, bond=None, nics=None, + def addNetwork(self, bridge, vlan=None, bond=None, nics=None, options=None): """Add a new network to this vds. Network topology is network--[vlan--][bond--]nics. vlan(number) and bond are optional - pass the empty string to discard them. """ + network = bridge if options is None: options = {} @@ -1501,9 +1502,10 @@ finally: self._cif._networkSemaphore.release() - def delNetwork(self, network, vlan=None, bond=None, nics=None, + def delNetwork(self, bridge, vlan=None, bond=None, nics=None, options=None): """Delete a network from this vds.""" + network = bridge if options is None: options = {} self.translateNetOptionsToNew(options) -- To view, visit https://gerrit.ovirt.org/43187 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2eaf2b41e3e1c88721d855af0ccc3abd6c200034 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

4 7

Change in vdsm[master]: net: contrib: add veth cleanup to emergency_net_cleanup
by ibarkan＠redhat.com 06 Jul '15

06 Jul '15

Ido Barkan has uploaded a new change for review. Change subject: net: contrib: add veth cleanup to emergency_net_cleanup ...................................................................... net: contrib: add veth cleanup to emergency_net_cleanup Change-Id: I8947588e178ffbe6392d06be536149260d08f5b7 Signed-off-by: Ido Barkan <ibarkan(a)redhat.com> --- M contrib/shell_helper 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/13/43213/1 diff --git a/contrib/shell_helper b/contrib/shell_helper index 07a82c1..7dc2984 100755 --- a/contrib/shell_helper +++ b/contrib/shell_helper @@ -112,6 +112,13 @@ sudo rm /etc/sysconfig/network-scripts/ifcfg-dummy* } +del_veths() { + for nic in `ip l | awk '{print $2;}' | egrep "^veth"`; do + sudo ip link del dev ${nic%:*} + done + sudo rm /etc/sysconfig/network-scripts/ifcfg-veth* +} + del_bonds() { for nic in `ip l | awk '{print $2;}' | egrep "^bond"`; do echo "-${nic%:*}" | sudo tee /sys/class/net/bonding_masters @@ -173,6 +180,7 @@ emergency_net_cleanup() { del_dummies + del_veths del_bonds del_bridges del_test_nets -- To view, visit https://gerrit.ovirt.org/43213 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8947588e178ffbe6392d06be536149260d08f5b7 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ido Barkan <ibarkan(a)redhat.com>

3 6

Change in vdsm[master]: migration: avoid stacktrace on known errors
by fromani＠redhat.com 06 Jul '15

06 Jul '15

Francesco Romani has uploaded a new change for review. Change subject: migration: avoid stacktrace on known errors ...................................................................... migration: avoid stacktrace on known errors In migration code, if VM.migrationCreate() fails on destination host, we raise RuntimeError to abort the normal flow. However, in the recovery flow, we inconditionally log the stacktrace of the exception we catched. This is good for troubleshooiting, but it is a little pointless in this specific use case: we know already and precisely what failed. This patch adds a special-purpose exception for this specific, yet important, failure scenario, and avoids the stacktrace only when catching this exception. Change-Id: Ib35cf08a305018912991a47d0de645395a177e9e Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M vdsm/virt/migration.py 1 file changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/63/43063/1 diff --git a/vdsm/virt/migration.py b/vdsm/virt/migration.py index b8e155f..7ea8753 100644 --- a/vdsm/virt/migration.py +++ b/vdsm/virt/migration.py @@ -52,6 +52,12 @@ VIR_MIGRATE_PARAM_GRAPHICS_URI = 'graphics_uri' +class MigrationDestinationSetupError(RuntimeError): + """ + Failed to create migration destination VM. + """ + + class SourceThread(threading.Thread): """ A thread that takes care of migration on the source vdsm. @@ -295,6 +301,9 @@ if '_migrationParams' in self._vm.conf: del self._vm.conf['_migrationParams'] SourceThread._ongoingMigrations.release() + except MigrationDestinationSetupError as e: + self._recover(str(e)) + # we know what happened, no need to dump hollow stack trace except Exception as e: self._recover(str(e)) self.log.exception("Failed to migrate") @@ -326,8 +335,9 @@ if result['status']['code']: self.status = result - raise RuntimeError('migration destination error: ' + - result['status']['message']) + raise MigrationDestinationSetupError( + 'migration destination error: ' + + result['status']['message']) if config.getboolean('vars', 'ssl'): transport = 'tls' else: -- To view, visit https://gerrit.ovirt.org/43063 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib35cf08a305018912991a47d0de645395a177e9e Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

6 10

Change in vdsm[master]: Removing support in sysv and upstart
by ybronhei＠redhat.com 05 Jul '15

05 Jul '15

Yaniv Bronhaim has uploaded a new change for review. Change subject: Removing support in sysv and upstart ...................................................................... Removing support in sysv and upstart sysvinit scripts used to support rhel >=6.6. upstart scripts used to support debian. Both not required in later versions. systemd scripts become the standard in fedora rhel and debian. Change-Id: Ib9af14b3d78badc5250042508d25f294dc514a2d Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com> --- M configure.ac M init/Makefile.am D init/sysvinit/Makefile.am D init/sysvinit/respawn D init/sysvinit/supervdsmd.init.in D init/sysvinit/vdsmd.init.in D init/upstart/Makefile.am D init/upstart/supervdsmd.upstart.in D init/upstart/vdsm-tmpfiles.upstart.in D init/upstart/vdsmd.upstart.in 10 files changed, 1 insertion(+), 659 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/26/40726/1 diff --git a/configure.ac b/configure.ac index 4e6943a..e1d2544 100644 --- a/configure.ac +++ b/configure.ac @@ -341,8 +341,6 @@ debian/Makefile init/Makefile init/systemd/Makefile - init/sysvinit/Makefile - init/upstart/Makefile lib/Makefile lib/vdsm/Makefile lib/vdsm/netlink/Makefile diff --git a/init/Makefile.am b/init/Makefile.am index 15a5c03..62a226b 100644 --- a/init/Makefile.am +++ b/init/Makefile.am @@ -18,7 +18,7 @@ # Refer to the README and COPYING files for full details of the license # -SUBDIRS = systemd sysvinit upstart +SUBDIRS = systemd include $(top_srcdir)/build-aux/Makefile.subs diff --git a/init/sysvinit/Makefile.am b/init/sysvinit/Makefile.am deleted file mode 100644 index 7beba50..0000000 --- a/init/sysvinit/Makefile.am +++ /dev/null @@ -1,44 +0,0 @@ -# -# Copyright 2008-2012 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# - -include $(top_srcdir)/build-aux/Makefile.subs - -nodist_noinst_DATA = \ - supervdsmd.init \ - vdsmd.init \ - $(NULL) - -dist_vdsm_SCRIPTS = \ - respawn \ - $(NULL) - -CLEANFILES = \ - config.log \ - $(nodist_noinst_DATA) \ - $(NULL) - -EXTRA_DIST = \ - supervdsmd.init.in \ - vdsmd.init.in \ - $(NULL) - -all-local: \ - $(nodist_noinst_DATA) \ - $(NULL) diff --git a/init/sysvinit/respawn b/init/sysvinit/respawn deleted file mode 100755 index d13effc..0000000 --- a/init/sysvinit/respawn +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash -e - -# Copyright 2010 Red Hat, Inc. and/or its affiliates. -# Released under GPL v2 -# -# Author: Dan Kenigsberg <danken(a)redhat.com> -# -# Please contact me if something similar, but more standard, is available. - -MINLIFETIME=2 -MAX_THRASH_INTERVAL=30 -POST_FAIL_INTERVAL=900 - -usage() { - echo usage: - echo "$0 [options] <slave> [args]" - echo " --masterpid pidfile" - echo " --slavepid pidfile" - echo " --daemon" - echo " --minlifetime seconds" - echo " --thrash seconds" - echo - echo "make <slave> run, and respawn it on exit" - exit 1 -} - -while [ "$1" != "${1##-}" ]; -do - case "$1" in - --minlifetime) - MINLIFETIME="$2" - shift 2 - ;; - --thrash) - MAX_THRASH_INTERVAL="$2" - shift 2 - ;; - --masterpid) - masterpidfile="$2" - shift 2 - ;; - --slavepid) - slavepidfile="$2" - shift 2 - ;; - --daemon) - daemonize=1 - shift - ;; - --) - shift - break - ;; - *) usage - ;; - esac -done - -if [ -z "$*" ]; -then - usage -fi - -loop() { - local d0 d1 - local thrash_start - - # must use BASHPID since $$ is not updated by & - [ ! -z "$masterpidfile" ] && echo $BASHPID > "$masterpidfile" - d0=`date +%s` - while true - do - "$@" & - [ ! -z "$slavepidfile" ] && echo $! > "$slavepidfile" - wait $! || : - d1=`date +%s` - if [ $[d1-d0] -lt "$MINLIFETIME" ]; - then - if [[ -n "$thrash_start" ]] && \ - [[ $[d1-thrash_start] -gt "$MAX_THRASH_INTERVAL" ]]; then - logger -t respawn -- "slave '$*' died too quickly for more than $MAX_THRASH_INTERVAL seconds, master sleeping for $POST_FAIL_INTERVAL seconds" - thrash_start= - sleep "$POST_FAIL_INTERVAL" - else - logger -t respawn -- "slave '$*' died too quickly, respawning slave" - [[ -z "$thrash_start" ]] && thrash_start=$d1 - fi - else - logger -t respawn -- "slave '$*' died, respawning slave" - thrash_start= - fi - d0=$d1 - done -} - -if [ -z "$daemonize" ]; -then - loop "$@" -else - loop "$@" >/dev/null 2>/dev/null & -fi diff --git a/init/sysvinit/supervdsmd.init.in b/init/sysvinit/supervdsmd.init.in deleted file mode 100755 index f3369c2..0000000 --- a/init/sysvinit/supervdsmd.init.in +++ /dev/null @@ -1,116 +0,0 @@ -#! /bin/sh -# -# Copyright 2006-2013 Red Hat, Inc. and/or its affiliates. -# -# Licensed to you under the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. See the files README and -# LICENSE_GPL_v2 which accompany this distribution. -# - -# chkconfig: 2345 99 00 -# -### BEGIN INIT INFO -# Provides: supervdsmd -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Description: init script for the Super VDS management server -# Short-Description: init script for the Super VDS management server -### END INIT INFO - -SUPERVDSM_BIN=@VDSMDIR@/supervdsmServer -PIDFILE=@VDSMRUNDIR@/supervdsmd.pid -RESPAWNPIDFILE=@VDSMRUNDIR@/supervdsm_respawn.pid -SOCKFILE=@VDSMRUNDIR@/svdsm.sock -prog=supervdsm - -[ -f /etc/sysconfig/supervdsmd ] && . /etc/sysconfig/supervdsmd -. /etc/init.d/functions - -log_failure_msg() { echo -n "$@"; failure "$@"; echo; } -log_success_msg() { echo -n "$@"; success "$@"; echo; } - -RETVAL=0 - -start(){ - test_already_running && return 0 - - DAEMON_COREFILE_LIMIT=unlimited daemon \ - "@VDSMDIR@/daemonAdapter" -0 /dev/null -1 /dev/null -2 /dev/null \ - "@VDSMDIR@/respawn" --minlifetime 10 --daemon \ - --masterpid "${RESPAWNPIDFILE}" "${SUPERVDSM_BIN}" \ - --sockfile "${SOCKFILE}" --pidfile "${PIDFILE}" - RETVAL=$? - [ "$RETVAL" -eq 0 ] && log_success_msg "$prog start" || log_failure_msg "$prog start" -} - -test_already_running() -{ - if pidofproc -p $RESPAWNPIDFILE >/dev/null || \ - pidofproc -p $PIDFILE $SUPERVDSM_BIN >/dev/null; then - log_success_msg "$prog: already running" - return 0 - fi - return 1 -} - -stop(){ - echo "Shutting down supervdsm daemon: " - if killproc -p "$RESPAWNPIDFILE"; then - log_success_msg "$prog watchdog stop" - fi - if ! pidofproc -p "$PIDFILE" >/dev/null; then - log_failure_msg "$prog: not running" - RETVAL=0 - else - killproc -p "$PIDFILE" -d 2 - RETVAL=$? - [ "$RETVAL" -eq 0 ] && log_success_msg "$prog stop" || log_failure_msg "$prog stop" - fi - return "$RETVAL" -} - -case "$1" in - start) - start - RETVAL=$? - ;; - stop) - stop - RETVAL=$? - ;; - status) - pidofproc -p "$PIDFILE" "$SUPERVDSM_BIN" >/dev/null - RETVAL=$? - if [ "$RETVAL" -eq 0 ]; then - echo "Super VDSM daemon server is running" - else - echo -n "Super VDSM daemon is not running" - if pidofproc -p "$RESPAWNPIDFILE" >/dev/null; then - echo ", but its watchdog is" - else - echo - fi - fi - ;; - condrestart) - pidofproc -p "$PIDFILE" "$SUPERVDSM_BIN" >/dev/null - RETVAL=$? - if [ "$RETVAL" -eq 0 ]; then - $0 stop && $0 start; - RETVAL=$?; - fi; - ;; - try-restart|restart|force-reload) - $0 stop && $0 start - RETVAL=$? - ;; - *) - echo "Usage: $0 {start|stop|status|restart|condrestart|force-reload|try-restart}" - RETVAL=2 -esac - -exit "$RETVAL" - - - diff --git a/init/sysvinit/vdsmd.init.in b/init/sysvinit/vdsmd.init.in deleted file mode 100755 index 6edd89f..0000000 --- a/init/sysvinit/vdsmd.init.in +++ /dev/null @@ -1,270 +0,0 @@ -#! /bin/sh -# -# Copyright 2006-2010 Red Hat, Inc. and/or its affiliates. -# -# Licensed to you under the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. See the files README and -# LICENSE_GPL_v2 which accompany this distribution. -# - -# chkconfig: 2345 99 00 -# -### BEGIN INIT INFO -# Provides: vdsmd -# Required-Start: $syslog $network -# Should-Start: $time -# Required-Stop: $syslog -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Description: init script for the VDS management server -# Short-Description: init script for the VDS management server -### END INIT INFO - -VDSM_BIN="@VDSMDIR@/vdsm" -prog=vdsm -PIDFILE=@VDSMRUNDIR@/vdsmd.pid -RESPAWNPIDFILE=@VDSMRUNDIR@/respawn.pid -NEEDED_SERVICES="multipathd rpcbind ntpd wdmd sanlock libvirtd supervdsmd" -CONFLICTING_SERVICES="libvirt-guests ksmtuned" -LOCK_FILE="/var/lock/subsys/vdsmd" -VDSM_TOOL="@BINDIR@/vdsm-tool" -NICE_LOWEST=-20 -VDSMD_INIT_COMMON="@LIBEXECDIR@/vdsmd_init_common.sh" -RETVAL=0 - -SYSTEMCTL_SKIP_REDIRECT=true - -[ -f /etc/sysconfig/vdsm ] && . /etc/sysconfig/vdsm -. /etc/init.d/functions - -log_failure_msg() { printf "$@"; failure "$@"; echo; } -log_success_msg() { printf "$@"; success "$@"; echo; } - -shutdown_conflicting_srv() { - local srv - local ret_val - local conflicting_services="$1" - - for srv in ${conflicting_services}; do - if initctl status "${srv}" >/dev/null 2>&1; then - # When srv is Upstart service, status srv always returns 0 - initctl stop "${srv}" || : # stop fails when already down - initctl status "${srv}" | grep -q stop/waiting - elif [ -x "/etc/init.d/${srv}" ]; then - if service "${srv}" status >/dev/null 2>&1; then - service "${srv}" stop - fi - else - true - fi - ret_val=$? - if [ "${ret_val}" -ne 0 ]; then - log_failure_msg "${prog}: Stop conflicting ${srv}" - return "${ret_val}" - fi - done - return 0 -} - -start_needed_srv() { - local srv - local ret_val - local needed_services="$1" - - for srv in ${needed_services}; do - if initctl status "${srv}" >/dev/null 2>&1; then - # When srv is Upstart service, status srv always returns 0 - initctl start "${srv}" || : # start fails when already running - initctl status "${srv}" | grep -q start/running - else - service "${srv}" status >/dev/null 2>&1 || service "${srv}" start - fi - ret_val=$? - if [ "${ret_val}" -ne 0 ]; then - log_failure_msg "${prog}: Start dependent ${srv}" - return "${ret_val}" - fi - done -} - -start_network() { - # Check if there are unactivated VDSM devices - local interfaces dev static_devs activated_devs - - pushd /etc/sysconfig/network-scripts/ > /dev/null - - # copied from /etc/init.d/network - interfaces=$(ls ifcfg-* | \ - LC_ALL=C sed -e "$__sed_discard_ignored_files" \ - -e '/$ifcfg-lo$\|:\|ifcfg-.*-range$/d' \ - -e '{ s/^ifcfg-//g;s/[0-9]/ &/}' | \ - LC_ALL=C sort -k 1,1 -k 2n | \ - LC_ALL=C sed 's/ //') - - for dev in $interfaces; do - ifcfg="ifcfg-$dev" - grep -q '# Generated by VDSM version' "$ifcfg" || continue - grep -q 'ONBOOT=yes' "$ifcfg" || continue - static_devs="$static_devs $dev" - done - popd > /dev/null - - activated_devs="`service network status | tail -1`" - - for static_dev in $static_devs; do - if [[ $activated_devs != *"$static_dev"* ]]; then - service network start - ret_val=$? - if [ "${ret_val}" -ne 0 ]; then - log_failure_msg "${prog}: Start dependent network" - return "${ret_val}" - fi - break - fi - done -} - -test_already_running() -{ - if pidofproc -p "$RESPAWNPIDFILE" >/dev/null || \ - pidofproc -p "$PIDFILE" "$VDSM_BIN" >/dev/null; then - log_success_msg "$prog: already running" - return 0 - fi - return 1 -} - -reconfigure() { - if [ "${1}" = "force" ] || ! "$VDSM_TOOL" is-configured; then - "$VDSM_TOOL" configure "--force" - fi -} - -restore_nets(){ - "$VDSM_TOOL" restore-nets - return 0 -} - -unified_network_persistence_upgrade(){ - echo 'Upgrading to unified persistence if needed' - "$VDSM_TOOL" ${UPGRADE_LOGGING_PARAMS} upgrade-unified-persistence -} - -upgrade_300_nets(){ - echo 'Upgrading to v3.x networking if needed' - "$VDSM_TOOL" ${UPGRADE_LOGGING_PARAMS} upgrade-3.0.0-networks -} - -start() { - test_already_running && return 0 - - start_network || return 1 - shutdown_conflicting_srv "${CONFLICTING_SERVICES}" || return 1 - start_needed_srv "${NEEDED_SERVICES}" || return 1 - - # "service iscsid start" may not start becasue we configure node.startup to - # manual. See /etc/init.d/iscsid. - service iscsid status >/dev/null 2>&1 || service iscsid force-start \ - || return 1 - - "${VDSMD_INIT_COMMON}" --pre-start || return 1 - - unified_network_persistence_upgrade || return 1 - restore_nets || return 1 - upgrade_300_nets || return 1 - - - echo $"Starting up vdsm daemon: " - DAEMON_COREFILE_LIMIT=unlimited NICELEVEL="${NICE_LOWEST}" daemon \ - --user=vdsm "@VDSMDIR@/daemonAdapter" -0 /dev/null -1 /dev/null \ - -2 /dev/null --syslog "@VDSMDIR@/respawn" --minlifetime 10 \ - --daemon --masterpid "${RESPAWNPIDFILE}" "${VDSM_BIN}" \ - --pidfile "${PIDFILE}" || return 1 - touch "${LOCK_FILE}" - return 0 -} - -stop() { - echo $"Shutting down vdsm daemon: " - if killproc -p "$RESPAWNPIDFILE"; then - log_success_msg $"$prog watchdog stop" - fi - if ! pidofproc -p "$PIDFILE" >/dev/null; then - log_failure_msg "$prog: not running" - RETVAL=0 - else - killproc -p "$PIDFILE" -d @SERVICE_STOP_TIMEOUT@ - RETVAL=$? - [ "$RETVAL" = 0 ] && "@RM_PATH@" -f "$LOCK_FILE" > /dev/null 2>&1 - fi - "${VDSMD_INIT_COMMON}" --post-stop - return "$RETVAL" -} - -lock_op() { - { - if ! flock -n 9; then - log_failure_msg $"cannot ${1} ${prog}, operation is locked" - false - elif ( "${1}" 9<&- ); then - log_success_msg $"${prog} ${1}" - else - log_failure_msg $"${prog} ${1}" - false - fi - } 9<$0 -} - -case "$1" in - start) - lock_op start - RETVAL=$? - ;; - stop) - lock_op stop - RETVAL=$? - ;; - status) - pidofproc -p "$PIDFILE" "$VDSM_BIN" >/dev/null - RETVAL=$? - if [ "$RETVAL" -eq 0 ]; then - echo "VDS daemon server is running" - else - printf "VDS daemon is not running" - if pidofproc -p "$RESPAWNPIDFILE" >/dev/null; then - echo ", and its watchdog is running" - else - echo - fi - fi - ;; - condrestart) - pidofproc -p "$PIDFILE" "$VDSM_BIN" >/dev/null - RETVAL=$? - if [ "$RETVAL" -eq 0 ]; then - "$0" stop && "$0" start; - RETVAL=$?; - fi; - ;; - try-restart) - "$0" stop && "$0" start - RETVAL=$? - ;; - restart|force-reload) - "$0" stop - "$0" start - RETVAL=$? - ;; - reconfigure) - # Jump over 'reconfigure' - shift 1 - reconfigure "$@" - RETVAL=$? - ;; - *) - echo "Usage: $0 {start|stop|status|restart|force-reload|try-restart|condrestart}" - RETVAL=2 -esac - -exit "$RETVAL" diff --git a/init/upstart/Makefile.am b/init/upstart/Makefile.am deleted file mode 100644 index e689fdf..0000000 --- a/init/upstart/Makefile.am +++ /dev/null @@ -1,42 +0,0 @@ -# -# Copyright 2013 IBM, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# - -include $(top_srcdir)/build-aux/Makefile.subs - -nodist_noinst_DATA = \ - supervdsmd.upstart \ - vdsm-tmpfiles.upstart \ - vdsmd.upstart \ - $(NULL) - -CLEANFILES = \ - config.log \ - $(nodist_noinst_DATA) \ - $(NULL) - -EXTRA_DIST = \ - supervdsmd.upstart.in \ - vdsm-tmpfiles.upstart.in \ - vdsmd.upstart.in \ - $(NULL) - -all-local: \ - $(nodist_noinst_DATA) \ - $(NULL) diff --git a/init/upstart/supervdsmd.upstart.in b/init/upstart/supervdsmd.upstart.in deleted file mode 100644 index bc55702..0000000 --- a/init/upstart/supervdsmd.upstart.in +++ /dev/null @@ -1,20 +0,0 @@ -# supervdsmd - Auxiliary vdsm service for running helper functions as root -# - -description "Auxiliary vdsm service for running helper functions as root" - -start on runlevel [2345] and started libvirt-bin -stop on runlevel [!2345] -chdir "@VDSMDIR@" -console log -respawn - -# All commands called inside this script section except the daemon itself -# should not fork, otherwise Upstart traces the wrong pid. -# ".", "[", "&&" are built-in command or key-word, no fork. -# bash exec does not fork, just execve the target binary. -# So no "expect" stanza is needed. -script - [ -f "/etc/default/supervdsmd" ] && . "/etc/default/supervdsmd" - exec "@VDSMDIR@/daemonAdapter" "@VDSMDIR@/supervdsmServer" --sockfile "@VDSMRUNDIR@/svdsm.sock" -end script diff --git a/init/upstart/vdsm-tmpfiles.upstart.in b/init/upstart/vdsm-tmpfiles.upstart.in deleted file mode 100644 index a0b6b73..0000000 --- a/init/upstart/vdsm-tmpfiles.upstart.in +++ /dev/null @@ -1,24 +0,0 @@ -# vdsm-tmpfiles - Automatically create tempfiles under /var/run for vdsm -# - -description "Automatically create tempfiles under /var/run for vdsm" - -start on startup -console log - -task - -script -while read fileType filePath fileMode fileUser fileGroup ; do - if [ ! -e "$filePath" ]; then - if [ "$fileType" = "d" ]; then - @MKDIR_P@ "$filePath" - else - echo "Type $fileType handling is not implemented" - exit 1 - fi - fi - "@CHOWN_PATH@" $fileUser:$fileGroup "$filePath" - "@CHMOD_PATH@" $fileMode "$filePath" -done < "@CONFDIR@/vdsm-tmpfiles.conf" -end script diff --git a/init/upstart/vdsmd.upstart.in b/init/upstart/vdsmd.upstart.in deleted file mode 100644 index 1eab48b..0000000 --- a/init/upstart/vdsmd.upstart.in +++ /dev/null @@ -1,39 +0,0 @@ -# vdsmd - Virtual Desktop Server Manager -# - -description "Virtual Desktop Server Manager" - -start on runlevel [2345] and started networking and started portmap and started libvirt-bin and started supervdsmd -stop on runlevel [!2345] -kill timeout @SERVICE_STOP_TIMEOUT@ -chdir "@VDSMDIR@" -console log -nice -20 -respawn - -pre-start script - "@BINDIR@/vdsm-tool" load-needed-modules - service wdmd restart - for srv in networking ntp open-iscsi multipath-tools wdmd sanlock portmap libvirt-bin supervdsmd; do - if status "${srv}" >/dev/null 2>&1; then - # When srv is Upstart service, status srv always returns 0 - start "${srv}" || true - status "${srv}" | grep -q start/running - else - service "${srv}" status >/dev/null 2>&1 || service "${srv}" start - fi - done - "@LIBEXECDIR@/vdsmd_init_common.sh" --pre-start -end script - -# All commands called inside this script section except the daemon itself -# should not fork, otherwise Upstart traces the wrong pid. -# ".", "[", "&&" are built-in command or key-word, no fork. -# bash exec does not fork, just execve the target binary. -# So no "expect" stanza is needed. -script - [ -f "/etc/default/vdsmd" ] && . "/etc/default/vdsmd" - exec start-stop-daemon --chuid @VDSMUSER@:@VDSMGROUP@ --start --exec "@VDSMDIR@/daemonAdapter" -- -0 /dev/null -1 /dev/null -2 /dev/null "@VDSMDIR@/vdsm" -end script - -post-stop exec "@LIBEXECDIR@/vdsmd_init_common.sh" --post-stop -- To view, visit https://gerrit.ovirt.org/40726 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib9af14b3d78badc5250042508d25f294dc514a2d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>

6 38

Change in vdsm[master]: supervdsm: Add zombiereaper to supervdsm
by dkuznets＠redhat.com 05 Jul '15

05 Jul '15

Hello Dan Kenigsberg, I'd like you to do a code review. Please visit https://gerrit.ovirt.org/39780 to review the following change. Change subject: supervdsm: Add zombiereaper to supervdsm ...................................................................... supervdsm: Add zombiereaper to supervdsm Supervdsm uses multiprocessing.Process to impersonate other users and check access. To avoid waiting on the subprocesses, we add all subprocesses that were not waited upon to zombiereaper. Change-Id: I938a1f2bc70fceab2c69bc8b3d8c0724a9da7720 Bug-url: https://bugzilla.redhat.com/show_bug.cgi?id=841486 Signed-off-by: Dima Kuznetsov <dkuznets(a)redhat.com> Reviewed-on: http://gerrit.ovirt.org/28915 Reviewed-by: Dan Kenigsberg <danken(a)redhat.com> Signed-off-by: Dima Kuznetsov <dkuznets(a)redhat.com> --- M vdsm/supervdsmServer 1 file changed, 27 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/80/39780/1 diff --git a/vdsm/supervdsmServer b/vdsm/supervdsmServer index 3cdbf71..b8b6ff7 100755 --- a/vdsm/supervdsmServer +++ b/vdsm/supervdsmServer @@ -32,6 +32,7 @@ import logging import logging.config from vdsm.infra import sigutils +from vdsm.infra import zombiereaper import numaUtils @@ -236,23 +237,34 @@ proc = Process(target=child, args=(hisPipe,)) proc.start() - if not pipe.poll(RUN_AS_TIMEOUT): - try: - os.kill(proc.pid, signal.SIGKILL) - except OSError as e: - # If it didn't fail because process is already dead - if e.errno != errno.ESRCH: - raise + needReaping = True + try: + if not pipe.poll(RUN_AS_TIMEOUT): + try: - raise Timeout() + os.kill(proc.pid, signal.SIGKILL) + except OSError as e: + # Don't add to zombiereaper of PID no longer exists + if e.errno == errno.ESRCH: + needReaping = False + else: + raise - res, err = pipe.recv() - pipe.send("Bye") - proc.terminate() - if err is not None: - raise err + raise Timeout() - return res + res, err = pipe.recv() + pipe.send("Bye") + proc.terminate() + + if err is not None: + raise err + + return res + + finally: + # Add to zombiereaper if process has not been waited upon + if proc.exitcode is None and needReaping: + zombiereaper.autoReapPID(proc.pid) @logDecorator def validateAccess(self, user, groups, *args, **kwargs): @@ -465,6 +477,7 @@ if not config.getboolean('vars', 'core_dump_enable'): resource.setrlimit(resource.RLIMIT_CORE, (0, 0)) sigutils.register() + zombiereaper.registerSignalHandler() def bind(func): def wrapper(_SuperVdsm, *args, **kwargs): -- To view, visit https://gerrit.ovirt.org/39780 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I938a1f2bc70fceab2c69bc8b3d8c0724a9da7720 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov <dkuznets(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>

5 22

Change in vdsm[master]: tool: Remove upstart handling in libvirt configurator
by dkuznets＠redhat.com 05 Jul '15

05 Jul '15

Dima Kuznetsov has uploaded a new change for review. Change subject: tool: Remove upstart handling in libvirt configurator ...................................................................... tool: Remove upstart handling in libvirt configurator libvirt configurator used to check if upstart is available and configure libvirtd using initctl. Since systemd is now the system manager on Debian Jessie, RHEL7 and Ubuntu Vivid, we no longer have to support sysvinit/upstart. Change-Id: Ic71430103cb04a5636b4b41371852cbf68495db7 Signed-off-by: Dima Kuznetsov <dkuznets(a)redhat.com> --- M lib/vdsm/tool/configurators/libvirt.py 1 file changed, 0 insertions(+), 61 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/20/40420/1 diff --git a/lib/vdsm/tool/configurators/libvirt.py b/lib/vdsm/tool/configurators/libvirt.py index e182231..5b14cea 100644 --- a/lib/vdsm/tool/configurators/libvirt.py +++ b/lib/vdsm/tool/configurators/libvirt.py @@ -17,11 +17,8 @@ # Refer to the README and COPYING files for full details of the license # import errno -import filecmp import os import uuid -import rpm -import shutil import sys from vdsm.config import config @@ -39,7 +36,6 @@ ConfigFile, ParserWrapper, ) -from .. import service from .. validate_ovirt_certs import validate_ovirt_certs from ... import utils from ... import constants @@ -58,8 +54,6 @@ def configure(): - _sysvToUpstart() - if utils.isOvirtNode(): if not os.path.exists(constants.P_VDSM_CERT): raise InvalidRun( @@ -117,61 +111,6 @@ cfile['path'] for cfile in FILES.values() if cfile['persisted'] ] - - -def _sysvToUpstart(): - """ - On RHEL 6, libvirtd can be started by either SysV init or Upstart. - We prefer upstart because it respawns libvirtd if libvirtd - crashed. - """ - def iterateLibvirtFiles(): - ts = rpm.TransactionSet() - for name in ['libvirt', 'libvirt-daemon']: - for matches in ts.dbMatch('name', name): - for filename in matches[rpm.RPMTAG_FILENAMES]: - yield filename - - def reloadConfiguration(): - rc, out, err = utils.execCmd((INITCTL, - "reload-configuration")) - if rc != 0: - sys.stdout.write(out) - sys.stderr.write(err) - raise InvalidRun( - "Failed to reload upstart configuration.") - - INITCTL = '/sbin/initctl' - LIBVIRTD_UPSTART = 'libvirtd.upstart' - TARGET = os.path.join(constants.SYSCONF_PATH, "init/libvirtd.conf") - - if os.path.isfile(INITCTL) and os.access(INITCTL, os.X_OK): - # libvirtd package does not provide libvirtd.upstart, - # this could happen in Ubuntu or other distro, - # so continue to use system default init mechanism - packaged = '' - for fname in iterateLibvirtFiles(): - if os.path.basename(fname) == LIBVIRTD_UPSTART: - packaged = fname - break - - if os.path.isfile(packaged): - if not os.path.isfile(TARGET): - service.service_stop('libvirtd') - if (not os.path.isfile(TARGET) or - not filecmp.cmp(packaged, TARGET)): - oldmod = None - if os.path.isfile(TARGET): - oldmod = os.stat(TARGET).st_mode - - utils.unpersist(TARGET) - shutil.copyfile(packaged, TARGET) - utils.persist(TARGET) - - if (oldmod is not None and - oldmod != os.stat(TARGET).st_mode): - os.chmod(TARGET, oldmod) - reloadConfiguration() def _isSslConflict(): -- To view, visit https://gerrit.ovirt.org/40420 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic71430103cb04a5636b4b41371852cbf68495db7 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov <dkuznets(a)redhat.com>

6 20

Change in vdsm[master]: spec: Drop el6 support
by dkuznets＠redhat.com 05 Jul '15

05 Jul '15

Dima Kuznetsov has uploaded a new change for review. Change subject: spec: Drop el6 support ...................................................................... spec: Drop el6 support Since we no longer need to package for el6, we can significantly reduce the size of our spec file. This patch removes all the conditionals dealing with el6, and drops all of the code dealing with sysvinit as systemd is now available in both el7 and the supported fedoras. Change-Id: I52bf73f539d9036fbc3468b4faf8a8d6556c9560 Signed-off-by: Dima Kuznetsov <dkuznets(a)redhat.com> --- D init/sysvinit/Makefile.am D init/sysvinit/respawn D init/sysvinit/supervdsmd.init.in D init/sysvinit/vdsmd.init.in D init/upstart/Makefile.am D init/upstart/supervdsmd.upstart.in D init/upstart/vdsm-tmpfiles.upstart.in D init/upstart/vdsmd.upstart.in M vdsm.spec.in 9 files changed, 4 insertions(+), 862 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/19/40419/1 diff --git a/init/sysvinit/Makefile.am b/init/sysvinit/Makefile.am deleted file mode 100644 index 7beba50..0000000 --- a/init/sysvinit/Makefile.am +++ /dev/null @@ -1,44 +0,0 @@ -# -# Copyright 2008-2012 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# - -include $(top_srcdir)/build-aux/Makefile.subs - -nodist_noinst_DATA = \ - supervdsmd.init \ - vdsmd.init \ - $(NULL) - -dist_vdsm_SCRIPTS = \ - respawn \ - $(NULL) - -CLEANFILES = \ - config.log \ - $(nodist_noinst_DATA) \ - $(NULL) - -EXTRA_DIST = \ - supervdsmd.init.in \ - vdsmd.init.in \ - $(NULL) - -all-local: \ - $(nodist_noinst_DATA) \ - $(NULL) diff --git a/init/sysvinit/respawn b/init/sysvinit/respawn deleted file mode 100755 index d13effc..0000000 --- a/init/sysvinit/respawn +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash -e - -# Copyright 2010 Red Hat, Inc. and/or its affiliates. -# Released under GPL v2 -# -# Author: Dan Kenigsberg <danken(a)redhat.com> -# -# Please contact me if something similar, but more standard, is available. - -MINLIFETIME=2 -MAX_THRASH_INTERVAL=30 -POST_FAIL_INTERVAL=900 - -usage() { - echo usage: - echo "$0 [options] <slave> [args]" - echo " --masterpid pidfile" - echo " --slavepid pidfile" - echo " --daemon" - echo " --minlifetime seconds" - echo " --thrash seconds" - echo - echo "make <slave> run, and respawn it on exit" - exit 1 -} - -while [ "$1" != "${1##-}" ]; -do - case "$1" in - --minlifetime) - MINLIFETIME="$2" - shift 2 - ;; - --thrash) - MAX_THRASH_INTERVAL="$2" - shift 2 - ;; - --masterpid) - masterpidfile="$2" - shift 2 - ;; - --slavepid) - slavepidfile="$2" - shift 2 - ;; - --daemon) - daemonize=1 - shift - ;; - --) - shift - break - ;; - *) usage - ;; - esac -done - -if [ -z "$*" ]; -then - usage -fi - -loop() { - local d0 d1 - local thrash_start - - # must use BASHPID since $$ is not updated by & - [ ! -z "$masterpidfile" ] && echo $BASHPID > "$masterpidfile" - d0=`date +%s` - while true - do - "$@" & - [ ! -z "$slavepidfile" ] && echo $! > "$slavepidfile" - wait $! || : - d1=`date +%s` - if [ $[d1-d0] -lt "$MINLIFETIME" ]; - then - if [[ -n "$thrash_start" ]] && \ - [[ $[d1-thrash_start] -gt "$MAX_THRASH_INTERVAL" ]]; then - logger -t respawn -- "slave '$*' died too quickly for more than $MAX_THRASH_INTERVAL seconds, master sleeping for $POST_FAIL_INTERVAL seconds" - thrash_start= - sleep "$POST_FAIL_INTERVAL" - else - logger -t respawn -- "slave '$*' died too quickly, respawning slave" - [[ -z "$thrash_start" ]] && thrash_start=$d1 - fi - else - logger -t respawn -- "slave '$*' died, respawning slave" - thrash_start= - fi - d0=$d1 - done -} - -if [ -z "$daemonize" ]; -then - loop "$@" -else - loop "$@" >/dev/null 2>/dev/null & -fi diff --git a/init/sysvinit/supervdsmd.init.in b/init/sysvinit/supervdsmd.init.in deleted file mode 100755 index f3369c2..0000000 --- a/init/sysvinit/supervdsmd.init.in +++ /dev/null @@ -1,116 +0,0 @@ -#! /bin/sh -# -# Copyright 2006-2013 Red Hat, Inc. and/or its affiliates. -# -# Licensed to you under the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. See the files README and -# LICENSE_GPL_v2 which accompany this distribution. -# - -# chkconfig: 2345 99 00 -# -### BEGIN INIT INFO -# Provides: supervdsmd -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Description: init script for the Super VDS management server -# Short-Description: init script for the Super VDS management server -### END INIT INFO - -SUPERVDSM_BIN=@VDSMDIR@/supervdsmServer -PIDFILE=@VDSMRUNDIR@/supervdsmd.pid -RESPAWNPIDFILE=@VDSMRUNDIR@/supervdsm_respawn.pid -SOCKFILE=@VDSMRUNDIR@/svdsm.sock -prog=supervdsm - -[ -f /etc/sysconfig/supervdsmd ] && . /etc/sysconfig/supervdsmd -. /etc/init.d/functions - -log_failure_msg() { echo -n "$@"; failure "$@"; echo; } -log_success_msg() { echo -n "$@"; success "$@"; echo; } - -RETVAL=0 - -start(){ - test_already_running && return 0 - - DAEMON_COREFILE_LIMIT=unlimited daemon \ - "@VDSMDIR@/daemonAdapter" -0 /dev/null -1 /dev/null -2 /dev/null \ - "@VDSMDIR@/respawn" --minlifetime 10 --daemon \ - --masterpid "${RESPAWNPIDFILE}" "${SUPERVDSM_BIN}" \ - --sockfile "${SOCKFILE}" --pidfile "${PIDFILE}" - RETVAL=$? - [ "$RETVAL" -eq 0 ] && log_success_msg "$prog start" || log_failure_msg "$prog start" -} - -test_already_running() -{ - if pidofproc -p $RESPAWNPIDFILE >/dev/null || \ - pidofproc -p $PIDFILE $SUPERVDSM_BIN >/dev/null; then - log_success_msg "$prog: already running" - return 0 - fi - return 1 -} - -stop(){ - echo "Shutting down supervdsm daemon: " - if killproc -p "$RESPAWNPIDFILE"; then - log_success_msg "$prog watchdog stop" - fi - if ! pidofproc -p "$PIDFILE" >/dev/null; then - log_failure_msg "$prog: not running" - RETVAL=0 - else - killproc -p "$PIDFILE" -d 2 - RETVAL=$? - [ "$RETVAL" -eq 0 ] && log_success_msg "$prog stop" || log_failure_msg "$prog stop" - fi - return "$RETVAL" -} - -case "$1" in - start) - start - RETVAL=$? - ;; - stop) - stop - RETVAL=$? - ;; - status) - pidofproc -p "$PIDFILE" "$SUPERVDSM_BIN" >/dev/null - RETVAL=$? - if [ "$RETVAL" -eq 0 ]; then - echo "Super VDSM daemon server is running" - else - echo -n "Super VDSM daemon is not running" - if pidofproc -p "$RESPAWNPIDFILE" >/dev/null; then - echo ", but its watchdog is" - else - echo - fi - fi - ;; - condrestart) - pidofproc -p "$PIDFILE" "$SUPERVDSM_BIN" >/dev/null - RETVAL=$? - if [ "$RETVAL" -eq 0 ]; then - $0 stop && $0 start; - RETVAL=$?; - fi; - ;; - try-restart|restart|force-reload) - $0 stop && $0 start - RETVAL=$? - ;; - *) - echo "Usage: $0 {start|stop|status|restart|condrestart|force-reload|try-restart}" - RETVAL=2 -esac - -exit "$RETVAL" - - - diff --git a/init/sysvinit/vdsmd.init.in b/init/sysvinit/vdsmd.init.in deleted file mode 100755 index 6edd89f..0000000 --- a/init/sysvinit/vdsmd.init.in +++ /dev/null @@ -1,270 +0,0 @@ -#! /bin/sh -# -# Copyright 2006-2010 Red Hat, Inc. and/or its affiliates. -# -# Licensed to you under the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. See the files README and -# LICENSE_GPL_v2 which accompany this distribution. -# - -# chkconfig: 2345 99 00 -# -### BEGIN INIT INFO -# Provides: vdsmd -# Required-Start: $syslog $network -# Should-Start: $time -# Required-Stop: $syslog -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Description: init script for the VDS management server -# Short-Description: init script for the VDS management server -### END INIT INFO - -VDSM_BIN="@VDSMDIR@/vdsm" -prog=vdsm -PIDFILE=@VDSMRUNDIR@/vdsmd.pid -RESPAWNPIDFILE=@VDSMRUNDIR@/respawn.pid -NEEDED_SERVICES="multipathd rpcbind ntpd wdmd sanlock libvirtd supervdsmd" -CONFLICTING_SERVICES="libvirt-guests ksmtuned" -LOCK_FILE="/var/lock/subsys/vdsmd" -VDSM_TOOL="@BINDIR@/vdsm-tool" -NICE_LOWEST=-20 -VDSMD_INIT_COMMON="@LIBEXECDIR@/vdsmd_init_common.sh" -RETVAL=0 - -SYSTEMCTL_SKIP_REDIRECT=true - -[ -f /etc/sysconfig/vdsm ] && . /etc/sysconfig/vdsm -. /etc/init.d/functions - -log_failure_msg() { printf "$@"; failure "$@"; echo; } -log_success_msg() { printf "$@"; success "$@"; echo; } - -shutdown_conflicting_srv() { - local srv - local ret_val - local conflicting_services="$1" - - for srv in ${conflicting_services}; do - if initctl status "${srv}" >/dev/null 2>&1; then - # When srv is Upstart service, status srv always returns 0 - initctl stop "${srv}" || : # stop fails when already down - initctl status "${srv}" | grep -q stop/waiting - elif [ -x "/etc/init.d/${srv}" ]; then - if service "${srv}" status >/dev/null 2>&1; then - service "${srv}" stop - fi - else - true - fi - ret_val=$? - if [ "${ret_val}" -ne 0 ]; then - log_failure_msg "${prog}: Stop conflicting ${srv}" - return "${ret_val}" - fi - done - return 0 -} - -start_needed_srv() { - local srv - local ret_val - local needed_services="$1" - - for srv in ${needed_services}; do - if initctl status "${srv}" >/dev/null 2>&1; then - # When srv is Upstart service, status srv always returns 0 - initctl start "${srv}" || : # start fails when already running - initctl status "${srv}" | grep -q start/running - else - service "${srv}" status >/dev/null 2>&1 || service "${srv}" start - fi - ret_val=$? - if [ "${ret_val}" -ne 0 ]; then - log_failure_msg "${prog}: Start dependent ${srv}" - return "${ret_val}" - fi - done -} - -start_network() { - # Check if there are unactivated VDSM devices - local interfaces dev static_devs activated_devs - - pushd /etc/sysconfig/network-scripts/ > /dev/null - - # copied from /etc/init.d/network - interfaces=$(ls ifcfg-* | \ - LC_ALL=C sed -e "$__sed_discard_ignored_files" \ - -e '/$ifcfg-lo$\|:\|ifcfg-.*-range$/d' \ - -e '{ s/^ifcfg-//g;s/[0-9]/ &/}' | \ - LC_ALL=C sort -k 1,1 -k 2n | \ - LC_ALL=C sed 's/ //') - - for dev in $interfaces; do - ifcfg="ifcfg-$dev" - grep -q '# Generated by VDSM version' "$ifcfg" || continue - grep -q 'ONBOOT=yes' "$ifcfg" || continue - static_devs="$static_devs $dev" - done - popd > /dev/null - - activated_devs="`service network status | tail -1`" - - for static_dev in $static_devs; do - if [[ $activated_devs != *"$static_dev"* ]]; then - service network start - ret_val=$? - if [ "${ret_val}" -ne 0 ]; then - log_failure_msg "${prog}: Start dependent network" - return "${ret_val}" - fi - break - fi - done -} - -test_already_running() -{ - if pidofproc -p "$RESPAWNPIDFILE" >/dev/null || \ - pidofproc -p "$PIDFILE" "$VDSM_BIN" >/dev/null; then - log_success_msg "$prog: already running" - return 0 - fi - return 1 -} - -reconfigure() { - if [ "${1}" = "force" ] || ! "$VDSM_TOOL" is-configured; then - "$VDSM_TOOL" configure "--force" - fi -} - -restore_nets(){ - "$VDSM_TOOL" restore-nets - return 0 -} - -unified_network_persistence_upgrade(){ - echo 'Upgrading to unified persistence if needed' - "$VDSM_TOOL" ${UPGRADE_LOGGING_PARAMS} upgrade-unified-persistence -} - -upgrade_300_nets(){ - echo 'Upgrading to v3.x networking if needed' - "$VDSM_TOOL" ${UPGRADE_LOGGING_PARAMS} upgrade-3.0.0-networks -} - -start() { - test_already_running && return 0 - - start_network || return 1 - shutdown_conflicting_srv "${CONFLICTING_SERVICES}" || return 1 - start_needed_srv "${NEEDED_SERVICES}" || return 1 - - # "service iscsid start" may not start becasue we configure node.startup to - # manual. See /etc/init.d/iscsid. - service iscsid status >/dev/null 2>&1 || service iscsid force-start \ - || return 1 - - "${VDSMD_INIT_COMMON}" --pre-start || return 1 - - unified_network_persistence_upgrade || return 1 - restore_nets || return 1 - upgrade_300_nets || return 1 - - - echo $"Starting up vdsm daemon: " - DAEMON_COREFILE_LIMIT=unlimited NICELEVEL="${NICE_LOWEST}" daemon \ - --user=vdsm "@VDSMDIR@/daemonAdapter" -0 /dev/null -1 /dev/null \ - -2 /dev/null --syslog "@VDSMDIR@/respawn" --minlifetime 10 \ - --daemon --masterpid "${RESPAWNPIDFILE}" "${VDSM_BIN}" \ - --pidfile "${PIDFILE}" || return 1 - touch "${LOCK_FILE}" - return 0 -} - -stop() { - echo $"Shutting down vdsm daemon: " - if killproc -p "$RESPAWNPIDFILE"; then - log_success_msg $"$prog watchdog stop" - fi - if ! pidofproc -p "$PIDFILE" >/dev/null; then - log_failure_msg "$prog: not running" - RETVAL=0 - else - killproc -p "$PIDFILE" -d @SERVICE_STOP_TIMEOUT@ - RETVAL=$? - [ "$RETVAL" = 0 ] && "@RM_PATH@" -f "$LOCK_FILE" > /dev/null 2>&1 - fi - "${VDSMD_INIT_COMMON}" --post-stop - return "$RETVAL" -} - -lock_op() { - { - if ! flock -n 9; then - log_failure_msg $"cannot ${1} ${prog}, operation is locked" - false - elif ( "${1}" 9<&- ); then - log_success_msg $"${prog} ${1}" - else - log_failure_msg $"${prog} ${1}" - false - fi - } 9<$0 -} - -case "$1" in - start) - lock_op start - RETVAL=$? - ;; - stop) - lock_op stop - RETVAL=$? - ;; - status) - pidofproc -p "$PIDFILE" "$VDSM_BIN" >/dev/null - RETVAL=$? - if [ "$RETVAL" -eq 0 ]; then - echo "VDS daemon server is running" - else - printf "VDS daemon is not running" - if pidofproc -p "$RESPAWNPIDFILE" >/dev/null; then - echo ", and its watchdog is running" - else - echo - fi - fi - ;; - condrestart) - pidofproc -p "$PIDFILE" "$VDSM_BIN" >/dev/null - RETVAL=$? - if [ "$RETVAL" -eq 0 ]; then - "$0" stop && "$0" start; - RETVAL=$?; - fi; - ;; - try-restart) - "$0" stop && "$0" start - RETVAL=$? - ;; - restart|force-reload) - "$0" stop - "$0" start - RETVAL=$? - ;; - reconfigure) - # Jump over 'reconfigure' - shift 1 - reconfigure "$@" - RETVAL=$? - ;; - *) - echo "Usage: $0 {start|stop|status|restart|force-reload|try-restart|condrestart}" - RETVAL=2 -esac - -exit "$RETVAL" diff --git a/init/upstart/Makefile.am b/init/upstart/Makefile.am deleted file mode 100644 index e689fdf..0000000 --- a/init/upstart/Makefile.am +++ /dev/null @@ -1,42 +0,0 @@ -# -# Copyright 2013 IBM, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# - -include $(top_srcdir)/build-aux/Makefile.subs - -nodist_noinst_DATA = \ - supervdsmd.upstart \ - vdsm-tmpfiles.upstart \ - vdsmd.upstart \ - $(NULL) - -CLEANFILES = \ - config.log \ - $(nodist_noinst_DATA) \ - $(NULL) - -EXTRA_DIST = \ - supervdsmd.upstart.in \ - vdsm-tmpfiles.upstart.in \ - vdsmd.upstart.in \ - $(NULL) - -all-local: \ - $(nodist_noinst_DATA) \ - $(NULL) diff --git a/init/upstart/supervdsmd.upstart.in b/init/upstart/supervdsmd.upstart.in deleted file mode 100644 index bc55702..0000000 --- a/init/upstart/supervdsmd.upstart.in +++ /dev/null @@ -1,20 +0,0 @@ -# supervdsmd - Auxiliary vdsm service for running helper functions as root -# - -description "Auxiliary vdsm service for running helper functions as root" - -start on runlevel [2345] and started libvirt-bin -stop on runlevel [!2345] -chdir "@VDSMDIR@" -console log -respawn - -# All commands called inside this script section except the daemon itself -# should not fork, otherwise Upstart traces the wrong pid. -# ".", "[", "&&" are built-in command or key-word, no fork. -# bash exec does not fork, just execve the target binary. -# So no "expect" stanza is needed. -script - [ -f "/etc/default/supervdsmd" ] && . "/etc/default/supervdsmd" - exec "@VDSMDIR@/daemonAdapter" "@VDSMDIR@/supervdsmServer" --sockfile "@VDSMRUNDIR@/svdsm.sock" -end script diff --git a/init/upstart/vdsm-tmpfiles.upstart.in b/init/upstart/vdsm-tmpfiles.upstart.in deleted file mode 100644 index a0b6b73..0000000 --- a/init/upstart/vdsm-tmpfiles.upstart.in +++ /dev/null @@ -1,24 +0,0 @@ -# vdsm-tmpfiles - Automatically create tempfiles under /var/run for vdsm -# - -description "Automatically create tempfiles under /var/run for vdsm" - -start on startup -console log - -task - -script -while read fileType filePath fileMode fileUser fileGroup ; do - if [ ! -e "$filePath" ]; then - if [ "$fileType" = "d" ]; then - @MKDIR_P@ "$filePath" - else - echo "Type $fileType handling is not implemented" - exit 1 - fi - fi - "@CHOWN_PATH@" $fileUser:$fileGroup "$filePath" - "@CHMOD_PATH@" $fileMode "$filePath" -done < "@CONFDIR@/vdsm-tmpfiles.conf" -end script diff --git a/init/upstart/vdsmd.upstart.in b/init/upstart/vdsmd.upstart.in deleted file mode 100644 index 1eab48b..0000000 --- a/init/upstart/vdsmd.upstart.in +++ /dev/null @@ -1,39 +0,0 @@ -# vdsmd - Virtual Desktop Server Manager -# - -description "Virtual Desktop Server Manager" - -start on runlevel [2345] and started networking and started portmap and started libvirt-bin and started supervdsmd -stop on runlevel [!2345] -kill timeout @SERVICE_STOP_TIMEOUT@ -chdir "@VDSMDIR@" -console log -nice -20 -respawn - -pre-start script - "@BINDIR@/vdsm-tool" load-needed-modules - service wdmd restart - for srv in networking ntp open-iscsi multipath-tools wdmd sanlock portmap libvirt-bin supervdsmd; do - if status "${srv}" >/dev/null 2>&1; then - # When srv is Upstart service, status srv always returns 0 - start "${srv}" || true - status "${srv}" | grep -q start/running - else - service "${srv}" status >/dev/null 2>&1 || service "${srv}" start - fi - done - "@LIBEXECDIR@/vdsmd_init_common.sh" --pre-start -end script - -# All commands called inside this script section except the daemon itself -# should not fork, otherwise Upstart traces the wrong pid. -# ".", "[", "&&" are built-in command or key-word, no fork. -# bash exec does not fork, just execve the target binary. -# So no "expect" stanza is needed. -script - [ -f "/etc/default/vdsmd" ] && . "/etc/default/vdsmd" - exec start-stop-daemon --chuid @VDSMUSER@:@VDSMGROUP@ --start --exec "@VDSMDIR@/daemonAdapter" -- -0 /dev/null -1 /dev/null -2 /dev/null "@VDSMDIR@/vdsm" -end script - -post-stop exec "@LIBEXECDIR@/vdsmd_init_common.sh" --post-stop diff --git a/vdsm.spec.in b/vdsm.spec.in index 76ed135..38eb2b4 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -54,21 +54,10 @@ %global with_vhostmd 1 %endif -%if 0%{?fedora} || 0%{?rhel} >= 7 -%global with_systemd 1 -%endif - -%if 0%{?fedora} || 0%{?rhel} >= 7 %global with_chown_hack 1 -%endif -%if 0%{?rhel} == 6 -%global _udevrulesdir /lib/udev/rules.d/ -%global _udevexecdir /lib/udev/ -%else %global _udevrulesdir /usr/lib/udev/rules.d/ %global _udevexecdir /usr/lib/udev/ -%endif Name: %{vdsm_name} Version: @PACKAGE_VERSION@ @@ -83,11 +72,6 @@ %if !%{fedora_koji_build} ExclusiveArch: x86_64 ppc64 ppc64le -%endif - -%if 0%{?rhel} <= 6 -# qemu-img is x86_64 only on RHEL6 -ExclusiveArch: x86_64 %endif BuildRequires: cyrus-sasl-lib @@ -115,15 +99,7 @@ BuildRequires: python-pthreading BuildRequires: qemu-img BuildRequires: rpm-python -%if 0%{?rhel} == 6 -BuildRequires: python-simplejson >= 2.0.9 -BuildRequires: policycoreutils-python > 2.0.83-19.47 -BuildRequires: python-argparse -BuildRequires: python-ordereddict -%endif -%if 0%{?rhel} > 6 || 0%{?fedora} BuildRequires: python-blivet -%endif # Autotools BuildRequires %if 0%{?enable_autotools} @@ -138,9 +114,7 @@ BuildRequires: python-pep8 %endif -%if 0%{?with_systemd} BuildRequires: systemd-units -%endif Requires: ethtool Requires: which @@ -185,15 +159,12 @@ %else # fedora Requires: libguestfs-tools-c >= 1:1.26.7-2 %endif - -%if 0%{?rhel} >= 7 || 0%{?fedora} Requires: libvirt-daemon-config-nwfilter Requires: libvirt-daemon-driver-network Requires: libvirt-daemon-driver-nwfilter Requires: libvirt-daemon-driver-qemu -%endif -%if 0%{?rhel} >= 7 +%if 0%{?rhel} %if 0%{?rhev_build} Requires: libvirt-daemon >= 1.2.8-16.el7_1.2 Requires: libvirt-python >= 1.2.8-7.el7_1.1 @@ -202,11 +173,6 @@ Requires: libvirt-python %endif # rhev_build %endif # rhel 7 - -%if 0%{?rhel} == 6 -Requires: libvirt >= 0.10.2-29.el6_5.4 -Requires: libvirt-python -%endif %if 0%{?fedora} >= 22 Requires: libvirt-daemon >= 1.2.14 @@ -222,11 +188,7 @@ # iscsi-intiator versions %if 0%{?rhel} -%if 0%{?rhel} >= 7 Requires: iscsi-initiator-utils -%else -Requires: iscsi-initiator-utils >= 6.2.0.872-15 -%endif # rhel 7 %else # fedora Requires: iscsi-initiator-utils >= 6.2.0.873-21 %endif @@ -234,7 +196,6 @@ Requires: sanlock >= 2.8, sanlock-python %if 0%{?rhel} -%if 0%{?rhel} >= 7 Requires: device-mapper-multipath >= 0.4.9-68 Requires: e2fsprogs Requires: fence-agents-all @@ -242,19 +203,6 @@ Requires: python Requires: policycoreutils-python Requires: selinux-policy-targeted >= 3.13.1-16.el7 -%else -Requires: python -Requires: device-mapper-multipath >= 0.4.9-75 -Requires: e2fsprogs >= 1.41.12-11 -Requires: fence-agents -Requires: kernel >= 2.6.32-465 -Requires: initscripts >= 9.03.31-2.el6_3.1 -Requires: policycoreutils >= 2.0.83-19.30 -Requires: policycoreutils-python >= 2.0.83-19.47.el6_6.1 -Requires: selinux-policy-targeted >= 3.7.19-260.el6_6.2 -Requires: lvm2 >= 2.02.100-5 -Requires: logrotate < 3.8.0 -%endif %else Requires: fence-agents-all Requires: kernel >= 3.11.3-201 @@ -279,13 +227,8 @@ %endif %if 0%{?rhel} -%if 0%{?rhel} >= 7 Requires: qemu-kvm%{?rhev_suffix} >= 10:1.5.3-60.el7 Requires: qemu-img%{?rhev_suffix} >= 10:1.5.3-60.el7 -%else -Requires: qemu-kvm%{?rhev_suffix} >= 2:0.12.1.2-2.422 -Requires: qemu-img%{?rhev_suffix} >= 2:0.12.1.2-2.422 -%endif # rhel > = 7 %else Requires: qemu-kvm >= 2:2.0.0-1 Requires: qemu-img >= 2:2.0.0-1 @@ -361,10 +304,6 @@ Requires: %{name}-python = %{version}-%{release} Requires: %{name}-yajsonrpc = %{version}-%{release} Obsoletes: vdsm-api < 4.16 -%if 0%{?rhel} == 6 -Requires: python-ordereddict -Requires: python-simplejson >= 2.0.9 -%endif %description jsonrpc A Json-based RPC interface that serves as the protocol for libvdsm. @@ -391,11 +330,7 @@ %package bootstrap Summary: VDSM bootstrapping package BuildArch: noarch -%if 0%{?rhel} < 7 -Requires: python-ethtool >= 0.6-3 -%else Requires: python-ethtool >= 0.8-1 -%endif %description bootstrap VDSM bootstrapping package. Used for delivering the bootstrap code onto the @@ -730,9 +665,6 @@ %prep %setup -q -%if 0%{?rhel} == 6 -sed -i '/ su /d' vdsm/vdsm-logrotate.conf.in -%endif %build %if 0%{?enable_autotools} @@ -769,10 +701,6 @@ install -dDm 0755 %{buildroot}@VDSMLOGDIR@ touch %{buildroot}@VDSMLOGDIR@/{connectivity.log,mom.log,supervdsm.log,vdsm.log} -# Install the respawn utility -install -Dm 0755 init/sysvinit/respawn \ - %{buildroot}%{_datadir}/%{vdsm_name}/respawn - # Install the lvm rules install -Dm 0644 vdsm/storage/vdsm-lvm.rules \ %{buildroot}%{_udevrulesdir}/12-vdsm-lvm.rules @@ -780,7 +708,6 @@ install -Dm 0644 vdsm/limits.conf \ %{buildroot}/etc/security/limits.d/99-vdsm.conf -%if 0%{?with_systemd} install -Dm 0755 init/systemd/systemd-vdsmd %{buildroot}/usr/lib/systemd/systemd-vdsmd install -Dm 0644 init/systemd/vdsmd.service %{buildroot}%{_unitdir}/vdsmd.service install -Dm 0644 init/systemd/vdsm-network.service %{buildroot}%{_unitdir}/vdsm-network.service @@ -792,18 +719,8 @@ %{buildroot}%{_unitdir}/vdsm-reg.service install -Dm 0644 vdsm/vdsm-modules-load.d.conf \ %{buildroot}%{_sysconfdir}/modules-load.d/vdsm.conf -%else -# Install the SysV init scripts -install -Dm 0755 init/sysvinit/vdsmd.init %{buildroot}%{_initrddir}/vdsmd -install -Dm 0755 init/sysvinit/supervdsmd.init %{buildroot}%{_initrddir}/supervdsmd - -install -Dm 0755 vdsm_reg/vdsm-reg.init %{buildroot}%{_initrddir}/vdsm-reg -%endif - -%if 0%{?with_systemd} install -Dm 0644 init/systemd/vdsm-tmpfiles.d.conf \ %{buildroot}%{_tmpfilesdir}/%{vdsm_name}.conf -%endif %if 0%{?rhel} # This is not commonplace, but we want /var/log/core to be a world-writable @@ -812,19 +729,12 @@ %endif # Install the polkit for libvirt -%if 0%{?fedora} || 0%{?rhel} >= 7 install -Dm 0644 vdsm/vdsm-libvirt-access.rules \ %{buildroot}%{_polkitdir}/10-vdsm-libvirt-access.rules -%else -install -Dm 0644 vdsm/vdsm-libvirt-access.pkla \ - %{buildroot}%{_polkitdir}/10-vdsm-libvirt-access.pkla -%endif # Install the libvirt hook for cleaning up the XML -%if 0%{?fedora} || 0%{?rhel} >= 7 install -Dm 0755 vdsm/virt/libvirt-hook.sh \ %{buildroot}%{_sysconfdir}/libvirt/hooks/qemu -%endif %check %if 0%{?with_check} @@ -879,13 +789,6 @@ fi /sbin/restorecon -R /var/log/core >/dev/null 2>&1 # hack until we replace core dump with abrt - -%if ! 0%{?with_systemd} -if [ "$1" -eq 1 ] ; then - /sbin/chkconfig --add vdsmd - /sbin/chkconfig --add supervdsmd -fi -%else /bin/systemctl restart systemd-modules-load.service >/dev/null 2>&1 || : if [ "$1" -eq 1 ] ; then /bin/systemctl enable vdsmd.service >/dev/null 2>&1 || : @@ -894,50 +797,15 @@ fi /bin/systemctl daemon-reload >/dev/null 2>&1 || : exit 0 -%endif %preun if [ "$1" -eq 0 ]; then %{_bindir}/vdsm-tool remove-config fi -%if ! 0%{?with_systemd} -if [ "$1" -eq 0 ] -then - /sbin/service vdsmd stop > /dev/null 2>&1 || : - /sbin/chkconfig --del vdsmd - /sbin/service supervdsmd stop > /dev/null 2>&1 || : - /sbin/chkconfig --del supervdsmd - - /bin/sed -i '/# VDSM section begin/,/# VDSM section end/d' \ - /etc/sysctl.conf - - %{_bindir}/vdsm-tool remove-saslpasswd - - if /sbin/initctl status libvirtd >/dev/null 2>/dev/null ; then - /sbin/initctl stop libvirtd >/dev/null 2>/dev/null - rm -f /etc/init/libvirtd.conf - - /sbin/chkconfig libvirtd on - /sbin/service libvirtd start >/dev/null - fi -fi -%else -%if 0%{?with_systemd} %systemd_preun vdsmd.service %systemd_preun vdsm-network.service %systemd_preun supervdsmd.service -%else -if [ "$1" -eq 0 ]; then - /bin/systemctl --no-reload disable vdsmd.service > /dev/null 2>&1 || : - /bin/systemctl --no-reload disable supervdsmd.service > /dev/null 2>&1 || : - /bin/systemctl stop vdsmd.service > /dev/null 2>&1 || : - /bin/systemctl stop vdsm-network.service > /dev/null 2>&1 || : - /bin/systemctl stop supervdsmd.service > /dev/null 2>&1 || : -fi -exit 0 -%endif -%endif %postun if [ "$1" -ge 1 ]; then @@ -968,11 +836,9 @@ # fallback to vdsmd reconfigure api - This change may be removed # when vdsm won't support any downgrade\upgrade to versions that # don't include vdsm-tool configure api (vdsm <= 3.3) - for f in '/usr/lib/systemd/systemd-vdsmd' '/etc/init.d/vdsmd'; do - if [ -f "${f}" ]; then - "${f}" reconfigure >/dev/null 2>&1 || : - fi - done + if [ -f "/usr/lib/systemd/systemd-vdsmd" ]; then + "/usr/lib/systemd/systemd-vdsmd" reconfigure >/dev/null 2>&1 || : + fi fi fi @@ -985,69 +851,19 @@ fi exit 0 -%if 0%{?rhel} == 6 -# In el6, We configure libvirt to use upstart without the libvirt.rpm's -# awareness. Thus, we must stop/restart libvirt ourselves when the -# libvirt.rpm is removed/upgraded. -%triggerun -- libvirt -if [ "$2" -eq "0" ]; then - /sbin/initctl stop libvirtd > /dev/null 2>&1 || : -fi - -%triggerpostun -- libvirt -if [ "$2" -ge "1" ]; then - /sbin/initctl restart libvirtd > /dev/null 2>&1 || : -fi -%endif - %post reg -%if ! 0%{?with_systemd} -if [ "$1" -eq 1 ] ; then - /sbin/chkconfig --add vdsm-reg -fi -%else -%if 0%{?with_systemd} %systemd_post vdsm-reg.service -%else -if [ "$1" -eq 1 ] ; then - /bin/systemctl enable vdsm-reg.service >/dev/null 2>&1 || : - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi -exit 0 -%endif -%endif %preun reg -%if ! 0%{?with_systemd} -if [ "$1" -eq 0 ] -then - /sbin/service vdsm-reg stop > /dev/null 2>&1 || : - /sbin/chkconfig --del vdsm-reg -fi -%else -%if 0%{?with_systemd} %systemd_preun vdsm-reg.service -%else -if [ "$1" -eq 0 ]; then - /bin/systemctl --no-reload disable vdsm-reg.service > /dev/null 2>&1 || : - /bin/systemctl stop vdsm-reg.service > /dev/null 2>&1 || : -fi -exit 0 -%endif -%endif %files %defattr(-, root, root, -) %doc COPYING README lib/vdsm/vdsm.conf.sample -%if 0%{?with_systemd} /usr/lib/systemd/systemd-vdsmd %{_unitdir}/vdsmd.service %{_unitdir}/vdsm-network.service %{_unitdir}/supervdsmd.service -%else -%{_initrddir}/vdsmd -%{_initrddir}/supervdsmd -%endif %dir %attr(-, %{vdsm_user}, %{vdsm_group}) @vdsmrepo@ %ghost %config %attr(0644, %{vdsm_user}, %{vdsm_group}) @VDSMLOGDIR@/connectivity.log @@ -1119,18 +935,12 @@ %config(noreplace) %{_sysconfdir}/%{vdsm_name}/logrotate/vdsm %config(noreplace) %{_sysconfdir}/rwtab.d/vdsm %config(noreplace) %{_sysconfdir}/sysctl.d/vdsm.conf -%if 0%{?with_systemd} %config(noreplace) %{_sysconfdir}/modules-load.d/vdsm.conf -%endif -%if 0%{?with_systemd} %config(noreplace) %{_tmpfilesdir}/%{vdsm_name}.conf -%endif %{_sysconfdir}/dhcp/dhclient.d/sourceRoute.sh %{_sysconfdir}/sudoers.d/50_vdsm %{_sysconfdir}/cron.hourly/vdsm-logrotate -%if 0%{?fedora} || 0%{?rhel} >= 7 %{_sysconfdir}/libvirt/hooks/qemu -%endif %{_datadir}/%{vdsm_name}/logUtils.py* %{_datadir}/%{vdsm_name}/dsaversion.py* %{_libexecdir}/%{vdsm_name}/curl-img-wrap @@ -1289,11 +1099,7 @@ %if 0%{?rhel} %dir %{_localstatedir}/log/core %endif -%if 0%{?fedora} || 0%{?rhel} >= 7 %{_polkitdir}/10-vdsm-libvirt-access.rules -%else -%{_polkitdir}/10-vdsm-libvirt-access.pkla -%endif %defattr(-, %{vdsm_user}, %{qemu_group}, -) %dir %{_localstatedir}/lib/libvirt/qemu/channels @@ -1362,11 +1168,7 @@ %{_datadir}/%{vdsm_name}/config.py* %{_datadir}/%{vdsm_name}/netinfo.py* %endif -%if 0%{?with_systemd} %exclude %{python_sitelib}/%{vdsm_name}/tool/load_needed_modules.py* -%else -%{python_sitelib}/%{vdsm_name}/tool/load_needed_modules.py* -%endif %{python_sitelib}/%{vdsm_name}/tool/configfile.py* %{python_sitelib}/%{vdsm_name}/tool/dummybr.py* %{python_sitelib}/%{vdsm_name}/tool/dump_bonding_defaults.py* @@ -1675,12 +1477,8 @@ %config(noreplace) %{_sysconfdir}/%{vdsm_reg}/logger.conf %ghost %dir /data %ghost %dir %attr(0775, root, root) /data/updates -%if 0%{?with_systemd} /usr/lib/systemd/systemd-vdsm-reg %{_unitdir}/vdsm-reg.service -%else -%{_initrddir}/vdsm-reg -%endif %{_datadir}/%{vdsm_reg}/vdsm-reg-setup %{_datadir}/%{vdsm_reg}/vdsm-complete %{_datadir}/%{vdsm_reg}/vdsm-gen-cert -- To view, visit https://gerrit.ovirt.org/40419 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I52bf73f539d9036fbc3468b4faf8a8d6556c9560 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov <dkuznets(a)redhat.com>

7 36

Change in vdsm[master]: xmlrpc: Improve logging during shutdown
by Nir Soffer 04 Jul '15

04 Jul '15

Nir Soffer has uploaded a new change for review. Change subject: xmlrpc: Improve logging during shutdown ...................................................................... xmlrpc: Improve logging during shutdown We did not have proper logging when stopping the server, making it hard to debug. Starting and stopping subsystems should have info level log messages in the caller thread and in the server thread. Change-Id: I7cc269213fe89d5033eae173c033970042fc2bce Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M vdsm/rpc/bindingxmlrpc.py 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/94/43194/1 diff --git a/vdsm/rpc/bindingxmlrpc.py b/vdsm/rpc/bindingxmlrpc.py index e81315a..05110c4 100644 --- a/vdsm/rpc/bindingxmlrpc.py +++ b/vdsm/rpc/bindingxmlrpc.py @@ -59,6 +59,7 @@ """ @utils.traceback(on=self.log.name) def threaded_start(): + self.log.info("XMLRPC server running") self._registerFunctions() self.server.timeout = 1 self._enabled = True @@ -70,6 +71,8 @@ if e[0] != EINTR: self.log.error("xml-rpc handler exception", exc_info=True) + self.log.info("XMLRPC server stopped") + self._thread = threading.Thread(target=threaded_start, name='BindingXMLRPC') self._thread.daemon = True @@ -79,6 +82,7 @@ self.server.add(connected_socket, socket_address) def stop(self): + self.log.info("Stopping XMLRPC server") self._enabled = False self.server.server_close() self._thread.join() -- To view, visit https://gerrit.ovirt.org/43194 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7cc269213fe89d5033eae173c033970042fc2bce Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

4 6

Change in vdsm[master]: fc-scan: Replace timing code with utils.stopwatch
by Nir Soffer 04 Jul '15

04 Jul '15

Nir Soffer has uploaded a new change for review. Change subject: fc-scan: Replace timing code with utils.stopwatch ...................................................................... fc-scan: Replace timing code with utils.stopwatch Replace explicit timing code and monotonic_time re-implementation with new stopwatch contextmanager. Change-Id: I47d99a21282f605492e4edfef5573efd7ce3779f Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M vdsm/storage/fc-scan 1 file changed, 8 insertions(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/67/42567/1 diff --git a/vdsm/storage/fc-scan b/vdsm/storage/fc-scan index 344345d..fe107e8 100755 --- a/vdsm/storage/fc-scan +++ b/vdsm/storage/fc-scan @@ -40,6 +40,8 @@ import sys import threading +from vdsm import utils + log = logging.getLogger("fc-scan") @@ -62,15 +64,13 @@ try: path = "/sys/class/scsi_host/%s/scan" % self.host log.debug("Scanning %s", path) - start = monotonic_time() - fd = os.open(path, os.O_WRONLY) - try: - os.write(fd, "- - -") - finally: - os.close(fd) + with utils.stopwatch("Scanned %s" % path, log=log): + fd = os.open(path, os.O_WRONLY) + try: + os.write(fd, "- - -") + finally: + os.close(fd) self.succeeded = True - elapsed = monotonic_time() - start - log.debug("Scanned %s in %.2f seconds", path, elapsed) except OSError as e: log.error("Scanning %s failed: %s", path, e) except Exception: @@ -105,10 +105,6 @@ if not all(s.succeeded for s in scans): return 1 - - -def monotonic_time(): - return os.times()[4] if __name__ == '__main__': -- To view, visit https://gerrit.ovirt.org/42567 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I47d99a21282f605492e4edfef5573efd7ce3779f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

4 8

Change in vdsm[master]: utils: Add stopwatch for timing operations
by Nir Soffer 04 Jul '15

04 Jul '15

Nir Soffer has uploaded a new change for review. Change subject: utils: Add stopwatch for timing operations ...................................................................... utils: Add stopwatch for timing operations stopwatch is a context manager that make it easy to time block of code: with stopwatch("foo.bar"): foo.bar("baz") Will log debug message: foo.bar: 0.123 seconds The log can be disabled by disabling the vds.stopwatch logger. Change-Id: Ie0a60538936dbb4596243abe9d731779fd9efb47 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M lib/vdsm/utils.py 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/85/29685/1 diff --git a/lib/vdsm/utils.py b/lib/vdsm/utils.py index 2ba5762..1ae5cc7 100644 --- a/lib/vdsm/utils.py +++ b/lib/vdsm/utils.py @@ -26,6 +26,7 @@ Contains a reverse dictionary pointing from error string to its error code. """ +from contextlib import contextmanager from collections import namedtuple, deque from fnmatch import fnmatch from StringIO import StringIO @@ -669,6 +670,16 @@ return decorator +@contextmanager +def stopwatch(message, log=logging.getLogger('vds.stopwatch')): + start = time.time() + try: + yield + finally: + elapsed = time.time() - start + log.debug("%s: %.3f seconds", message, elapsed) + + def tobool(s): try: if s is None: -- To view, visit http://gerrit.ovirt.org/29685 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie0a60538936dbb4596243abe9d731779fd9efb47 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

9 25

Change in vdsm[master]: snapshot: Add VM.freeze() and VM.thaw() verbs
by automation＠ovirt.org 03 Jul '15

03 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: snapshot: Add VM.freeze() and VM.thaw() verbs ...................................................................... Patch Set 7: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43058 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I44c4237841e44548f48f626f4241d3f2e484930e Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Martin Polednik <mpolednik(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: snapshot: Add VM.freeze() and VM.thaw() verbs
by Martin Polednik 03 Jul '15

03 Jul '15

Martin Polednik has posted comments on this change. Change subject: snapshot: Add VM.freeze() and VM.thaw() verbs ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/43058 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I44c4237841e44548f48f626f4241d3f2e484930e Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Martin Polednik <mpolednik(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: tests: Allow setting custom libvirt error message
by Nir Soffer 02 Jul '15

02 Jul '15

Nir Soffer has uploaded a new change for review. Change subject: tests: Allow setting custom libvirt error message ...................................................................... tests: Allow setting custom libvirt error message Fake Domain object was repeating the code in Error factory, and was using a default empty error message. Now we use Error and allow faking also the error message. Change-Id: I61e26d50ef7babd8bf9a9aadc38451297631a65b Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M tests/vmfakelib.py 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/20/43020/1 diff --git a/tests/vmfakelib.py b/tests/vmfakelib.py index 2c841ca..bdaf275 100644 --- a/tests/vmfakelib.py +++ b/tests/vmfakelib.py @@ -163,6 +163,7 @@ class Domain(object): def __init__(self, xml='', virtError=libvirt.VIR_ERR_OK, + errorMessage="", domState=libvirt.VIR_DOMAIN_RUNNING, domReason=0, vmId=''): @@ -170,6 +171,7 @@ self._xml = xml self.devXml = '' self._virtError = virtError + self._errorMessage = errorMessage self._metadata = "" self._io_tune = {} self._domState = domState @@ -180,9 +182,7 @@ def _failIfRequested(self): if self._virtError != libvirt.VIR_ERR_OK: - err = libvirt.libvirtError(defmsg='') - err.err = [self._virtError] - raise err + raise Error(self._virtError, self._errorMessage) def UUIDString(self): return self._vmId -- To view, visit https://gerrit.ovirt.org/43020 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I61e26d50ef7babd8bf9a9aadc38451297631a65b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

5 10

Change in vdsm[master]: tests: Add @recorded method decorator
by Nir Soffer 02 Jul '15

02 Jul '15

Nir Soffer has uploaded a new change for review. Change subject: tests: Add @recorded method decorator ...................................................................... tests: Add @recorded method decorator Manually recording function arguments and keywords again and again is not fun and error prone. This patch introduces a new decorator to make this task easier. To make a class recordable, add a __recording__ list, and mark the method you want to record: class Foo: def __init__(self): self.__recording__ = [] @recorded def foo(self, a, b, c=3): pass def bar(self): return 42 Methods decorated with @recorded will record all calls to the __recording__ list: f = Foo() f.foo(1, 2, 4) f.bar() f.foo(2, 3) print(f.__recording__) [("foo", (1, 2), {"c": 4}), ("foo", (2, 3), {"c": 3})] The new decorator is used now by vmfakelib.Domain. It may be useful for other fake objcts as well. Change-Id: I43c7750ae1deb5fa9bbee40d9f6f624ce1105c4e Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M tests/testlib.py M tests/vmTests.py M tests/vmfakelib.py 3 files changed, 15 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/15/43015/1 diff --git a/tests/testlib.py b/tests/testlib.py index 7f23c1a..78b7f18 100644 --- a/tests/testlib.py +++ b/tests/testlib.py @@ -380,3 +380,14 @@ for (section, key, value) in tunables: cfg.set(section, key, value) return cfg + + +def recorded(meth): + """ + Method decorator recording calls to instance's __recording__ list. + """ + @wraps(meth) + def wrapper(self, *args, **kw): + self.__recording__.append((meth.func_name, args, kw)) + return meth(self, *args, **kw) + return wrapper diff --git a/tests/vmTests.py b/tests/vmTests.py index e1e7f1a..9e05f50 100644 --- a/tests/vmTests.py +++ b/tests/vmTests.py @@ -1488,7 +1488,8 @@ target = 256 res = testvm.setBalloonTarget(target) # just to fit in 80 cols self.assertEqual(res['status']['code'], 0) - self.assertEqual(testvm._dom.calls, [('setMemory', (target,), {})]) + self.assertEqual(testvm._dom.__recording__, + [('setMemory', (target,), {})]) def testVmWithoutDom(self): with fake.VM() as testvm: diff --git a/tests/vmfakelib.py b/tests/vmfakelib.py index 2e44fb1..f5d2b11 100644 --- a/tests/vmfakelib.py +++ b/tests/vmfakelib.py @@ -165,6 +165,7 @@ domState=libvirt.VIR_DOMAIN_RUNNING, domReason=0, vmId=''): + self.__recording__ = [] self._xml = xml self.devXml = '' self._virtError = virtError @@ -173,7 +174,6 @@ self._domState = domState self._domReason = domReason self._vmId = vmId - self.calls = [] self._diskErrors = {} self._downtimes = [] @@ -224,9 +224,9 @@ self._io_tune[name] = io_tune return 1 + @recorded def setMemory(self, target): self._failIfRequested() - self.calls.append(('setMemory', (target,), {})) def setDiskErrors(self, diskErrors): self._diskErrors = diskErrors -- To view, visit https://gerrit.ovirt.org/43015 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I43c7750ae1deb5fa9bbee40d9f6f624ce1105c4e Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

5 24

Change in vdsm[master]: tests: Record fake domain calls in a list
by Nir Soffer 02 Jul '15

02 Jul '15

Nir Soffer has uploaded a new change for review. Change subject: tests: Record fake domain calls in a list ...................................................................... tests: Record fake domain calls in a list Keeping calls in a list allows testing of multiple calls. We can check how many time a methods was called, what args and kwargs were used on each call, and we can verify the correct order of the calls. Change-Id: I279a1fd7a2e07b7adef4f446c9487a51d9df21f4 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M tests/vmTests.py M tests/vmfakelib.py 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/98/42998/1 diff --git a/tests/vmTests.py b/tests/vmTests.py index a6b23ac..e1e7f1a 100644 --- a/tests/vmTests.py +++ b/tests/vmTests.py @@ -1488,7 +1488,7 @@ target = 256 res = testvm.setBalloonTarget(target) # just to fit in 80 cols self.assertEqual(res['status']['code'], 0) - self.assertEqual(testvm._dom.calls['setMemory'][0], target) + self.assertEqual(testvm._dom.calls, [('setMemory', (target,), {})]) def testVmWithoutDom(self): with fake.VM() as testvm: diff --git a/tests/vmfakelib.py b/tests/vmfakelib.py index ece0a42..2e44fb1 100644 --- a/tests/vmfakelib.py +++ b/tests/vmfakelib.py @@ -173,7 +173,7 @@ self._domState = domState self._domReason = domReason self._vmId = vmId - self.calls = {} + self.calls = [] self._diskErrors = {} self._downtimes = [] @@ -226,7 +226,7 @@ def setMemory(self, target): self._failIfRequested() - self.calls['setMemory'] = (target,) + self.calls.append(('setMemory', (target,), {})) def setDiskErrors(self, diskErrors): self._diskErrors = diskErrors -- To view, visit https://gerrit.ovirt.org/42998 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I279a1fd7a2e07b7adef4f446c9487a51d9df21f4 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

5 11

Change in vdsm[master]: build: Change dependency on glusterfs-cli and glusterfs-fuse
by ahino＠redhat.com 02 Jul '15

02 Jul '15

Ala Hino has uploaded a new change for review. Change subject: build: Change dependency on glusterfs-cli and glusterfs-fuse ...................................................................... build: Change dependency on glusterfs-cli and glusterfs-fuse Originally, glusterfs-cli and glusterfs-fuse were required only when not building vdsm on RHEV. We changed the spec file to always require gluster-cli and glusterfs-fuse in order to use gluster get volume info api to implement mounting gluster backup servers (https://gerrit.ovirt.org/40665). However, requiring these dependencies fails vdsm build on ppc64le. This patch revert requiring glusterfs-cli and glusterfs-fuse dependencies as were originally defined. Change-Id: I4cf424e7055ad071561d037b65972dde3b1b0b8b Signed-off-by: Ala Hino <ahino(a)redhat.com> --- M vdsm.spec.in 1 file changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/97/43097/1 diff --git a/vdsm.spec.in b/vdsm.spec.in index a4dc9f1..defee9e 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -235,10 +235,6 @@ Requires: qemu-img >= 2:2.0.0-1 %endif # rhel -# GlusterFS client-side RPMs needed for Gluster SD -Requires: glusterfs-cli >= %{gluster_version} -Requires: glusterfs-fuse >= %{gluster_version} - Requires: psmisc >= 22.6-15 Requires: bridge-utils Requires: sos @@ -590,6 +586,7 @@ VDSM hook used for applying IPv6 configuration through custom network properties +# GlusterFS client-side RPMs needed for Gluster SD %if 0%{?with_gluster} %package gluster Summary: Gluster Plugin for VDSM @@ -597,6 +594,8 @@ Requires: glusterfs-server >= %{gluster_version} Requires: glusterfs-api >= %{gluster_version} Requires: glusterfs-geo-replication >= %{gluster_version} +Requires: glusterfs-cli >= %{gluster_version} +Requires: glusterfs-fuse >= %{gluster_version} Requires: python-magic Requires: python-blivet Requires: xfsprogs -- To view, visit https://gerrit.ovirt.org/43097 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4cf424e7055ad071561d037b65972dde3b1b0b8b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ala Hino <ahino(a)redhat.com>

5 10

Change in vdsm[master]: migration: use the response module
by fromani＠redhat.com 02 Jul '15

02 Jul '15

Francesco Romani has uploaded a new change for review. Change subject: migration: use the response module ...................................................................... migration: use the response module Switch to response module for the sake of code clarity. Change-Id: I6d56b93d02467b4e95a29a9a98d4a09b22e64573 Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M vdsm/virt/migration.py 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/92/40492/1 diff --git a/vdsm/virt/migration.py b/vdsm/virt/migration.py index b6b6c15..26f9bad 100644 --- a/vdsm/virt/migration.py +++ b/vdsm/virt/migration.py @@ -25,11 +25,12 @@ import hooks import kaxmlrpclib +from vdsm import response from vdsm import utils from vdsm import vdscli from vdsm.compat import pickle from vdsm.config import config -from vdsm.define import NORMAL, errCode, Mbytes +from vdsm.define import NORMAL, Mbytes from . import vmexitreason from . import vmstatus @@ -128,10 +129,10 @@ status = self._destServer.getVmStats(self._vm.id) if not status['status']['code']: self.log.error("Machine already exists on the destination") - self.status = errCode['exist'] + self.status = response.error('exist') except Exception: self.log.exception("Error initiating connection") - self.status = errCode['noConPeer'] + self.status = response.error('noConPeer') def _setupRemoteMachineParams(self): self._machineParams.update(self._vm.status()) @@ -179,7 +180,7 @@ def _recover(self, message): if not self.status['status']['code']: - self.status = errCode['migrateErr'] + self.status = response.error('migrateErr') self.log.error(message) if not self.hibernating: try: @@ -269,9 +270,8 @@ self._finishSuccessfully() except libvirt.libvirtError as e: if e.get_error_code() == libvirt.VIR_ERR_OPERATION_ABORTED: - self.status['status']['code'] = \ - errCode['migCancelErr']['status']['code'] - self.status['status']['message'] = 'Migration canceled' + self.status = response.error('migCancelErr', + message='Migration canceled') raise finally: if '_migrationParams' in self._vm.conf: -- To view, visit https://gerrit.ovirt.org/40492 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6d56b93d02467b4e95a29a9a98d4a09b22e64573 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

3 14

Change in vdsm[master]: snapshot: Add VM.freeze() and VM.thaw() verbs
by automation＠ovirt.org 02 Jul '15

02 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: snapshot: Add VM.freeze() and VM.thaw() verbs ...................................................................... Patch Set 6: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43058 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I44c4237841e44548f48f626f4241d3f2e484930e Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Martin Polednik <mpolednik(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: snapshot: Add VM.freeze() and VM.thaw() verbs
by fromani＠redhat.com 02 Jul '15

02 Jul '15

Francesco Romani has posted comments on this change. Change subject: snapshot: Add VM.freeze() and VM.thaw() verbs ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/43058 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I44c4237841e44548f48f626f4241d3f2e484930e Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Martin Polednik <mpolednik(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: snapshot: Add VM.freeze() and VM.thaw() verbs
by michal.skrivanek＠redhat.com 02 Jul '15

02 Jul '15

Michal Skrivanek has posted comments on this change. Change subject: snapshot: Add VM.freeze() and VM.thaw() verbs ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/43058 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I44c4237841e44548f48f626f4241d3f2e484930e Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Martin Polednik <mpolednik(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: snapshot: Add VM.freeze() and VM.thaw() verbs
by Nir Soffer 02 Jul '15

02 Jul '15

Nir Soffer has posted comments on this change. Change subject: snapshot: Add VM.freeze() and VM.thaw() verbs ...................................................................... Patch Set 5: Manually rebase over parent patch. -- To view, visit https://gerrit.ovirt.org/43058 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I44c4237841e44548f48f626f4241d3f2e484930e Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Martin Polednik <mpolednik(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: snapshot: Add VM.freeze() and VM.thaw() verbs
by Nir Soffer 02 Jul '15

02 Jul '15

Nir Soffer has posted comments on this change. Change subject: snapshot: Add VM.freeze() and VM.thaw() verbs ...................................................................... Patch Set 5: Verified+1 -- To view, visit https://gerrit.ovirt.org/43058 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I44c4237841e44548f48f626f4241d3f2e484930e Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Martin Polednik <mpolednik(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: snapshot: Add VM.freeze() and VM.thaw() verbs
by automation＠ovirt.org 02 Jul '15

02 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: snapshot: Add VM.freeze() and VM.thaw() verbs ...................................................................... Patch Set 5: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43058 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I44c4237841e44548f48f626f4241d3f2e484930e Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Martin Polednik <mpolednik(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: migration: replace boolean with proper Events
by automation＠ovirt.org 02 Jul '15

02 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: migration: replace boolean with proper Events ...................................................................... Patch Set 3: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/42887 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I02639749ab884c3542c4d29715756044d777f738 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: virt: Safe device type check for console device
by smelamud＠redhat.com 02 Jul '15

02 Jul '15

Hello Shmuel Melamud, I'd like you to do a code review. Please visit https://gerrit.ovirt.org/42881 to review the following change. Change subject: virt: Safe device type check for console device ...................................................................... virt: Safe device type check for console device In Vm._getUnderlyingConsoleDeviceInfo() console device is searched through the self.conf['devices'] list by checking 'device' field of each element. Usage of dev['device'] expression for this is unsafe, because for some devices (RNG device, for example) this key may be absent and KeyError will be raised. Replaced this by dev.get('device') which is safe. Change-Id: I6a0c1adc6c3b2ab8d50b6e3ac712ce2dcf04cc6c Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1233825 Signed-off-by: Shmuel Melamud <smelamud(a)redhat.com> --- M vdsm/virt/vm.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/81/42881/1 diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py index 4977d28..91cb1a0 100644 --- a/vdsm/virt/vm.py +++ b/vdsm/virt/vm.py @@ -3908,7 +3908,7 @@ dev.alias = alias for dev in self.conf['devices']: - if dev['device'] == hwclass.CONSOLE and \ + if dev.get('device') == hwclass.CONSOLE and \ not dev.get('alias'): dev['alias'] = alias -- To view, visit https://gerrit.ovirt.org/42881 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6a0c1adc6c3b2ab8d50b6e3ac712ce2dcf04cc6c Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Shmuel Leib Melamud <smelamud(a)redhat.com> Gerrit-Reviewer: Shmuel Melamud <smelamud(a)redhat.com>

4 9

Change in vdsm[master]: tests: network: when using bonding, attach at least 2 slaves
by phoracek＠redhat.com 02 Jul '15

02 Jul '15

Petr Horáček has uploaded a new change for review. Change subject: tests: network: when using bonding, attach at least 2 slaves ...................................................................... tests: network: when using bonding, attach at least 2 slaves In some tests we attach just one slave to a bonding, it works with native linux bonding, but does not allow us to use existing for OVS bonding. Change-Id: I1763bc3409aa7da91dcd2e3b21dd8540870138ef Signed-off-by: Petr Horacek <phoracek(a)redhat.com> --- M tests/functional/networkTests.py 1 file changed, 34 insertions(+), 26 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/40/41840/1 diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py index 5702580..352c7c6 100644 --- a/tests/functional/networkTests.py +++ b/tests/functional/networkTests.py @@ -585,7 +585,7 @@ @cleanupNet @permutations([[True], [False]]) def testFailWithInvalidBondingName(self, bridged): - with dummyIf(1) as nics: + with dummyIf(2) as nics: invalid_bond_names = ('bond', 'bonda', 'bond0a', 'jamesbond007') for bond_name in invalid_bond_names: status, msg = self.vdsm_net.addNetwork(NETWORK_NAME, @@ -690,7 +690,7 @@ VLAN_COUNT = 5 NET_VLANS = [(NETWORK_NAME + str(index), str(index)) for index in range(VLAN_COUNT)] - with dummyIf(1) as nics: + with dummyIf(2) as nics: firstVlan, firstVlanId = NET_VLANS[0] status, msg = self.vdsm_net.addNetwork(firstVlan, vlan=firstVlanId, bond=BONDING_NAME, @@ -719,7 +719,7 @@ @cleanupNet @permutations([[True], [False]]) def testAddNetworkVlanBond(self, bridged): - with dummyIf(1) as nics: + with dummyIf(2) as nics: vlan_id = '42' status, msg = self.vdsm_net.addNetwork(NETWORK_NAME, vlan=vlan_id, @@ -759,7 +759,7 @@ @permutations([[True], [False]]) def testDelNetworkWithMTU(self, bridged): MTU = '1234' - with dummyIf(1) as nics: + with dummyIf(2) as nics: status, msg = self.vdsm_net.addNetwork(NETWORK_NAME, vlan=VLAN_ID, bond=BONDING_NAME, nics=nics, @@ -1334,7 +1334,7 @@ @cleanupNet def testDelNetworkBondAccumulation(self): - with dummyIf(1) as nics: + with dummyIf(2) as nics: for bigBond in ('bond555', 'bond666', 'bond777'): status, msg = self.vdsm_net.addNetwork(NETWORK_NAME, VLAN_ID, bigBond, nics) @@ -1352,15 +1352,15 @@ @cleanupNet @permutations([[True], [False]]) def testSetupNetworksResizeBond(self, bridged): - with dummyIf(3) as nics: + with dummyIf(4) as nics: with self.vdsm_net.pinger(): - bondings = {BONDING_NAME: dict(nics=nics[:1], + bondings = {BONDING_NAME: dict(nics=nics[:2], bridged=bridged)} status, msg = self.vdsm_net.setupNetworks({}, bondings, {}) self.assertEquals(status, SUCCESS, msg) - self.assertBondExists(BONDING_NAME, nics=nics[:1]) + self.assertBondExists(BONDING_NAME, nics=nics[:2]) # Increase bond size bondings[BONDING_NAME]['nics'] = nics @@ -1372,14 +1372,14 @@ # Reduce bond size REQMODE_BROADCAST = '3' - bondings[BONDING_NAME]['nics'] = nics[:2] + bondings[BONDING_NAME]['nics'] = nics[:3] bondings[BONDING_NAME]['options'] = ('mode=%s' % REQMODE_BROADCAST) status, msg = self.vdsm_net.setupNetworks({}, bondings, {}) self.assertEquals(status, SUCCESS, msg) - self.assertBondExists(BONDING_NAME, nics[:2], + self.assertBondExists(BONDING_NAME, nics[:3], bondings[BONDING_NAME]['options']) bondings = {BONDING_NAME: dict(remove=True)} @@ -2079,7 +2079,7 @@ @permutations([[True], [False]]) @cleanupNet def testSetupNetworksEmergencyDevicesCleanupVlanOverwrite(self, bridged): - with dummyIf(1) as nics: + with dummyIf(2) as nics: nic, = nics network = {NETWORK_NAME: {'vlan': VLAN_ID, 'bridged': bridged, 'nic': nic}} @@ -2104,7 +2104,7 @@ @permutations([[True], [False]]) @cleanupNet def testSetupNetworksEmergencyDevicesCleanupBondOverwrite(self, bridged): - with dummyIf(1) as nics: + with dummyIf(2) as nics: nic, = nics network = {NETWORK_NAME: {'bridged': bridged, 'bonding': BONDING_NAME}} @@ -2232,7 +2232,7 @@ @cleanupNet def testSetupNetworksRemoveSlavelessBond(self): - with dummyIf(1) as nics: + with dummyIf(2) as nics: status, msg = self.vdsm_net.setupNetworks( {NETWORK_NAME: {'bonding': BONDING_NAME, 'bridged': False}}, @@ -2241,9 +2241,9 @@ self.assertNetworkExists(NETWORK_NAME) self.assertBondExists(BONDING_NAME, nics) - nic, = nics with open(BONDING_SLAVES % BONDING_NAME, 'w') as f: - f.write('-%s\n' % nic) + for nic in nics: + f.write('-%s\n' % nic) status, msg = self.vdsm_net.setupNetworks( {NETWORK_NAME: {'remove': True}}, @@ -2281,19 +2281,20 @@ raise SkipTest( "with ifcfg persistence, vdsm-restore-net-config " "doesn't restore in-kernel state") - with dummyIf(1) as (nic, ): + with dummyIf(2) as nics: with open(BONDING_MASTERS, 'w') as bonds: bonds.write('+%s\n' % BONDING_NAME) try: with open(BONDING_SLAVES % BONDING_NAME, 'w') as f: - f.write('+%s\n' % nic) + for nic in nics: + f.write('+%s\n' % nic) status, msg = self.vdsm_net.setupNetworks( {NETWORK_NAME: {'bonding': BONDING_NAME, 'bridged': False}}, - {BONDING_NAME: {'nics': [nic]}}, NOCHK) + {BONDING_NAME: {'nics': nics}}, NOCHK) self.assertEqual(status, SUCCESS, msg) self.assertNetworkExists(NETWORK_NAME) - self.assertBondExists(BONDING_NAME, [nic]) + self.assertBondExists(BONDING_NAME, nics) finally: with open(BONDING_MASTERS, 'w') as bonds: bonds.write('-%s\n' % BONDING_NAME) @@ -2302,27 +2303,34 @@ self.vdsm_net.restoreNetConfig() self.assertNetworkExists(NETWORK_NAME) - self.assertBondExists(BONDING_NAME, [nic]) + self.assertBondExists(BONDING_NAME, nics) status, msg = self.vdsm_net.setupNetworks( {NETWORK_NAME: {'remove': True}}, {BONDING_NAME: {'remove': True}}, NOCHK) self.assertEqual(status, SUCCESS, msg) self.assertNetworkDoesntExist(NETWORK_NAME) - self.assertBondDoesntExist(BONDING_NAME, [nic]) + self.assertBondDoesntExist(BONDING_NAME, nics) self.vdsm_net.save_config() @cleanupNet @ValidateRunningAsRoot def test_setupNetworks_on_external_vlaned_bond(self): - with dummyIf(1) as (nic, ): - with open(NET_CONF_PREF + nic, 'w') as f: + with dummyIf(2) as nics: + with open(NET_CONF_PREF + nics[0], 'w') as f: f.write("""DEVICE=%s MASTER=%s SLAVE=yes ONBOOT=yes MTU=1500 -NM_CONTROLLED=no""" % (nic, BONDING_NAME)) +NM_CONTROLLED=no""" % (nics[0], BONDING_NAME)) + with open(NET_CONF_PREF + nics[1], 'w') as f: + f.write("""DEVICE=%s +MASTER=%s +SLAVE=yes +ONBOOT=yes +MTU=1500 +NM_CONTROLLED=no""" % (nics[1], BONDING_NAME)) with open(NET_CONF_PREF + BONDING_NAME, 'w') as f: f.write("""DEVICE=%s BONDING_OPTS='mode=802.3ad miimon=150' @@ -2354,7 +2362,7 @@ self.vdsm_net.restoreNetConfig() self.assertNetworkExists(NETWORK_NAME) - self.assertBondExists(BONDING_NAME, [nic]) + self.assertBondExists(BONDING_NAME, nics) self.assertVlanExists(BONDING_NAME + '.' + VLAN_ID) status, msg = self.vdsm_net.setupNetworks( @@ -2362,5 +2370,5 @@ {BONDING_NAME: {'remove': True}}, NOCHK) self.assertEqual(status, SUCCESS, msg) self.assertNetworkDoesntExist(NETWORK_NAME) - self.assertBondDoesntExist(BONDING_NAME, [nic]) + self.assertBondDoesntExist(BONDING_NAME, nics) self.vdsm_net.save_config() -- To view, visit https://gerrit.ovirt.org/41840 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1763bc3409aa7da91dcd2e3b21dd8540870138ef Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr Horáček <phoracek(a)redhat.com>

3 13

Change in vdsm[master]: adding StorageDomain.removeVmData()
by automation＠ovirt.org 02 Jul '15

02 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: adding StorageDomain.removeVmData() ...................................................................... Patch Set 1: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43154 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic53b19a43850341ee488b50fbb339fdf68c1a048 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Liron Aravot <laravot(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: adding StorageDomain.activateHsm()
by automation＠ovirt.org 02 Jul '15

02 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: adding StorageDomain.activateHsm() ...................................................................... Patch Set 1: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43153 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I68eccd300b8ba0cc45b2485f978eb3ae367c16e2 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Liron Aravot <laravot(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: adding StorageDomain.updateVmData()
by automation＠ovirt.org 02 Jul '15

02 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: adding StorageDomain.updateVmData() ...................................................................... Patch Set 4: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/42930 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id79e7d6375e60216d1eb9a58e5a5c087db98625f Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Liron Aravot <laravot(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: adding the StorageDomain.upgradeVersion verb
by automation＠ovirt.org 02 Jul '15

02 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: adding the StorageDomain.upgradeVersion verb ...................................................................... Patch Set 6: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/42478 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id8fb87c6e04e48072ec90d07a0f4c7a61411a808 Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Liron Aravot <laravot(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: network: allow custom bondOption
by phoracek＠redhat.com 02 Jul '15

02 Jul '15

Petr Horáček has uploaded a new change for review. Change subject: network: allow custom bondOption ...................................................................... network: allow custom bondOption Allow 'custom' in bond options. This value will be accepted by Bond.validateOptions method but it will not be passed to configurator. Thanks to this patch, users will be allowed to pass custom properties to setupNetworks hooks. This path was reverted in past because of malfunction, now it should work, there is a new test for sure. Change-Id: I9ace532d959bc3195a8a92b4536bdc0062bc7d1d Signed-off-by: Petr Horáček <phoracek(a)redhat.com> --- M lib/vdsm/netinfo.py M tests/functional/networkTests.py M vdsm/network/models.py 3 files changed, 44 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/82/40882/1 diff --git a/lib/vdsm/netinfo.py b/lib/vdsm/netinfo.py index e7563d6..3a2aa8e 100644 --- a/lib/vdsm/netinfo.py +++ b/lib/vdsm/netinfo.py @@ -70,8 +70,9 @@ _BONDING_FAILOVER_MODES = frozenset(('1', '3')) _BONDING_LOADBALANCE_MODES = frozenset(('0', '2', '4', '5', '6')) _EXCLUDED_BONDING_ENTRIES = frozenset(( - 'slaves', 'active_slave', 'mii_status', 'queue_id', 'ad_aggregator', - 'ad_num_ports', 'ad_actor_key', 'ad_partner_key', 'ad_partner_mac' + 'slaves', 'active_slave', 'mii_status', 'queue_id', 'ad_aggregator', + 'ad_num_ports', 'ad_actor_key', 'ad_partner_key', 'ad_partner_mac', + 'custom' )) _IFCFG_ZERO_SUFFIXED = frozenset( ('IPADDR0', 'GATEWAY0', 'PREFIX0', 'NETMASK0')) diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py index 0bfda68..1328783 100644 --- a/tests/functional/networkTests.py +++ b/tests/functional/networkTests.py @@ -1848,7 +1848,7 @@ else: network_params.update( {'ipaddr': IP_ADDRESS_IN_NETWORK, 'netmask': IP_MASK, - 'gateway': IP_GATEWAY}) + 'gateway': IP_GATEWAY}) status, msg = self.vdsm_net.setupNetworks( {NETWORK_NAME: network_params}, {}, NOCHK) @@ -2387,3 +2387,25 @@ self.assertNetworkDoesntExist(NETWORK_NAME) self.assertBondDoesntExist(BONDING_NAME, [nic]) self.vdsm_net.save_config() + + @cleanupNet + @ValidateRunningAsRoot + def test_setupNetworks_bond_with_custom_option(self): + with dummyIf(1) as nics: + status, msg = self.vdsm_net.setupNetworks( + {}, + {BONDING_NAME: {'nics': nics, + 'options': 'custom=foo mode=balance-rr'}}, + NOCHK) + self.assertEqual(status, SUCCESS, msg) + self.assertBondExists(BONDING_NAME, nics) + with open(NET_CONF_PREF + BONDING_NAME) as f: + for l in f: + if 'BONDING_OPTS' in l: + self.assertNotIn('custom=foo', l) + self.assertIn('mode=balance-rr', l) + + status, msg = self.vdsm_net.setupNetworks( + {}, {BONDING_NAME: {'remove': True}}, NOCHK) + self.assertEqual(status, SUCCESS, msg) + self.assertBondDoesntExist(BONDING_NAME, nics) diff --git a/vdsm/network/models.py b/vdsm/network/models.py index 708bad8..9526b99 100644 --- a/vdsm/network/models.py +++ b/vdsm/network/models.py @@ -276,9 +276,25 @@ _netinfo=_netinfo)) return slaves + @staticmethod + def remove_custom_option(options): + """ 'custom' property should not be exposed to configurator, it is + only for purpose of hooks """ + d_opts = dict(opt.split('=', 1) for opt in options.split()) + try: + d_opts.pop('custom') + d_opts = ['%s=%s' % (key, value) for key, value in d_opts.items()] + return ' '.join(d_opts) + except KeyError: + return options + @classmethod def objectivize(cls, name, configurator, options, nics, mtu, _netinfo, destroyOnMasterRemoval=None): + + if options: + options = cls.remove_custom_option(options) + if nics: # New bonding or edit bonding. slaves = cls._objectivizeSlaves(name, configurator, _nicSort(nics), mtu, _netinfo) @@ -318,8 +334,8 @@ try: for option in bondingOptions.split(): key, _ = option.split('=') - if not os.path.exists('/sys/class/net/%s/bonding/%s' % - (bond, key)): + if key != 'custom' and not os.path.exists( + '/sys/class/net/%s/bonding/%s' % (bond, key)): raise ConfigNetworkError(ne.ERR_BAD_BONDING, '%r is ' 'not a valid bonding option' % key) -- To view, visit https://gerrit.ovirt.org/40882 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9ace532d959bc3195a8a92b4536bdc0062bc7d1d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr Horáček <phoracek(a)redhat.com>

3 20

Change in vdsm[master]: virt: don't log password in update graphic device
by fromani＠redhat.com 02 Jul '15

02 Jul '15

Francesco Romani has uploaded a new change for review. Change subject: virt: don't log password in update graphic device ...................................................................... virt: don't log password in update graphic device updateDevice invoked against a graphics device allows Engine (or any other caller) to change the SPICE ticket. This patch make sure the ticket is not logged. Change-Id: I4c3d318a16eb4d1b10a12f650ba957057e090532 Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M vdsm/rpc/BindingXMLRPC.py 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/73/41073/1 diff --git a/vdsm/rpc/BindingXMLRPC.py b/vdsm/rpc/BindingXMLRPC.py index fbce42d..80136c1 100644 --- a/vdsm/rpc/BindingXMLRPC.py +++ b/vdsm/rpc/BindingXMLRPC.py @@ -1159,6 +1159,12 @@ elif f.__name__ == 'convertExternalVm': if len(args) > 3: displayArgs = args[:2] + ('****',) + args[3:] + elif f.__name__ == 'vmUpdateDevice': + if len(args) == 2 and args[1].get( + 'deviceType', '') == 'graphics': + devParams = args[1].copy() + devParams['password'] = '****' + displayArgs = args[0] + [devParams] # Logging current call logStr = 'client [%s]::call %s with %s %s' % \ -- To view, visit https://gerrit.ovirt.org/41073 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4c3d318a16eb4d1b10a12f650ba957057e090532 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

3 10

Change in vdsm[master]: net: run dhclient in its own process group.
by ibarkan＠redhat.com 02 Jul '15

02 Jul '15

Ido Barkan has uploaded a new change for review. Change subject: net: run dhclient in its own process group. ...................................................................... net: run dhclient in its own process group. This is done to prevent systemd from killing supervdsm dhclient child processes during supervdsm stop (or restart). Forking dhclient in its own process group prevents systemd from doing this. Since dhclient is deliberately killed either directly by supervdsm or indirectly by executing ifdown on a device and since executing a process in a different process group is harmless, the separate cgroup is now the default behaviour. This patch also fixes https://bugzilla.redhat.com/show_bug .cgi?id=1187244 in a less clumsy way than KillMode=process. Change-Id: I82848a36b52cd8e9dec188d865ef86edc4bb7488 Signed-off-by: Ido Barkan <ibarkan(a)redhat.com> Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1228322 --- M init/systemd/vdsm-network.service.in M vdsm/network/configurators/dhclient.py M vdsm/network/configurators/ifcfg.py 3 files changed, 20 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/05/43005/1 diff --git a/init/systemd/vdsm-network.service.in b/init/systemd/vdsm-network.service.in index 722a2b4..3c992f3 100644 --- a/init/systemd/vdsm-network.service.in +++ b/init/systemd/vdsm-network.service.in @@ -9,7 +9,6 @@ EnvironmentFile=-/etc/sysconfig/vdsm ExecStartPre=@BINDIR@/vdsm-tool --vvverbose --append --logfile=@VDSMLOGDIR@/upgrade.log upgrade-unified-persistence ExecStart=@BINDIR@/vdsm-tool restore-nets -KillMode=process RemainAfterExit=yes [Install] diff --git a/vdsm/network/configurators/dhclient.py b/vdsm/network/configurators/dhclient.py index 67f7eba..d71b5ff 100644 --- a/vdsm/network/configurators/dhclient.py +++ b/vdsm/network/configurators/dhclient.py @@ -25,12 +25,15 @@ import signal import threading +from vdsm import cmdutils from vdsm import ipwrapper from vdsm import netinfo from vdsm.utils import CommandPath from vdsm.utils import execCmd from vdsm.utils import pgrep from vdsm.utils import rmFile + +DHCLIENT_CGROUP = 'vdsm-dhclient' class DhcpClient(object): @@ -39,7 +42,7 @@ LEASE_FILE = os.path.join(LEASE_DIR, 'dhclient{0}--{1}.lease') DHCLIENT = CommandPath('dhclient', '/sbin/dhclient') - def __init__(self, iface, family=4): + def __init__(self, iface, family=4, cgroup=DHCLIENT_CGROUP): self.iface = iface self.family = family self.pidFile = self.PID_FILE % (family, self.iface) @@ -47,14 +50,16 @@ os.mkdir(self.LEASE_DIR) self.leaseFile = self.LEASE_FILE.format( '' if family == 4 else '6', self.iface) + self._cgroup = cgroup def _dhclient(self): # Ask dhclient to stop any dhclient running for the device if os.path.exists(os.path.join(netinfo.NET_PATH, self.iface)): kill_dhclient(self.iface, self.family) - rc, out, err = execCmd([self.DHCLIENT.cmd, '-%s' % self.family, - '-1', '-pf', self.pidFile, - '-lf', self.leaseFile, self.iface]) + cmd = [self.DHCLIENT.cmd, '-%s' % self.family, '-1', '-pf', + self.pidFile, '-lf', self.leaseFile, self.iface] + cmd = cmdutils.systemd_run(cmd, scope=True, slice=self._cgroup) + rc, out, err = execCmd(cmd) return rc, out, err def start(self, blocking): diff --git a/vdsm/network/configurators/ifcfg.py b/vdsm/network/configurators/ifcfg.py index e76be51..450a6d1 100644 --- a/vdsm/network/configurators/ifcfg.py +++ b/vdsm/network/configurators/ifcfg.py @@ -33,6 +33,7 @@ from libvirt import libvirtError, VIR_ERR_NO_NETWORK from vdsm.config import config +from vdsm import cmdutils from vdsm import constants from vdsm import ipwrapper from vdsm import netinfo @@ -740,9 +741,14 @@ return rc -def _exec_ifup(iface_name): +def _exec_ifup(iface_name, cgroup=dhclient.DHCLIENT_CGROUP): """Bring up an interface""" - rc, out, err = utils.execCmd([constants.EXT_IFUP, iface_name], raw=False) + cmd = [constants.EXT_IFUP, iface_name] + + if cgroup is not None: + cmd = cmdutils.systemd_run(cmd, scope=True, slice=cgroup) + + rc, out, err = utils.execCmd(cmd, raw=False) if rc != 0: # In /etc/sysconfig/network-scripts/ifup* the last line usually @@ -750,16 +756,16 @@ raise ConfigNetworkError(ERR_FAILED_IFUP, out[-1] if out else '') -def _ifup(iface): +def _ifup(iface, cgroup=dhclient.DHCLIENT_CGROUP): if not iface.blockingdhcp and (iface.ipv4.bootproto == 'dhcp' or iface.ipv6.dhcpv6): # wait for dhcp in another thread, so vdsm won't get stuck (BZ#498940) t = threading.Thread(target=_exec_ifup, name='ifup-waiting-on-dhcp', - args=(iface.name,)) + args=(iface.name, cgroup)) t.daemon = True t.start() else: - _exec_ifup(iface.name) + _exec_ifup(iface.name, cgroup) def _restore_default_bond_options(bond_name, desired_options): -- To view, visit https://gerrit.ovirt.org/43005 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I82848a36b52cd8e9dec188d865ef86edc4bb7488 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ido Barkan <ibarkan(a)redhat.com>

3 9

Change in vdsm[master]: snapshot: Add VM.freeze() and VM.thaw() apis.
by michal.skrivanek＠redhat.com 02 Jul '15

02 Jul '15

Michal Skrivanek has posted comments on this change. Change subject: snapshot: Add VM.freeze() and VM.thaw() apis. ...................................................................... Patch Set 4: Code-Review-1 (1 comment) https://gerrit.ovirt.org/#/c/43058/4/vdsm/virt/vm.py File vdsm/virt/vm.py: Line 2872: conf.update(driveParams) Line 2873: self.saveState() Line 2874: Line 2875: def freeze(self): Line 2876: guest = snapshot.GuestAgent(self._dom, self.log) as noted in the other patch - you can easily do it right here (we don't really need yet another wrapper just to pass arguments further. We already have API.py) or delegate to the current guest agent class (which is a different agent, but it does handle connection/socket to qemu-ga, so why not...) Or alternatively implement that functionality in "our" guest agent which would delegate to qemu-ga internally. Advantage is that unlike libvirt we are a bit better in handling non responding cases Line 2877: return guest.freeze_filesystems() Line 2878: Line 2879: def thaw(self): Line 2880: guest = snapshot.GuestAgent(self._dom, self.log) -- To view, visit https://gerrit.ovirt.org/43058 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I44c4237841e44548f48f626f4241d3f2e484930e Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Martin Polednik <mpolednik(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: load_needed_modules verb is not required
by ybronhei＠redhat.com 02 Jul '15

02 Jul '15

Yaniv Bronhaim has uploaded a new change for review. Change subject: load_needed_modules verb is not required ...................................................................... load_needed_modules verb is not required Since ovirt-3.6 systemd takes care for loading required kernel modules during installation by using vdsm-modules-load.d.conf Change-Id: I44e4624c354401116040b3fd5bbb54b6f31ee727 Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com> --- M .gitignore M debian/vdsm-python.install M init/vdsmd_init_common.sh.in M lib/vdsm/tool/Makefile.am D lib/vdsm/tool/load_needed_modules.py.in M vdsm-tool/vdsm-tool.1.in M vdsm.spec.in 7 files changed, 0 insertions(+), 87 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/40/43040/1 diff --git a/.gitignore b/.gitignore index 3fef689..0f5305f 100644 --- a/.gitignore +++ b/.gitignore @@ -36,7 +36,6 @@ init/vdsmd_init_common.sh lib/vdsm/config.py lib/vdsm/constants.py -lib/vdsm/tool/load_needed_modules.py lib/vdsm/tool/validate_ovirt_certs.py lib/vdsm/vdscli.py lib/vdsm/vdsm.conf.sample diff --git a/debian/vdsm-python.install b/debian/vdsm-python.install index 57d5033..d9402c3 100644 --- a/debian/vdsm-python.install +++ b/debian/vdsm-python.install @@ -35,7 +35,6 @@ ./usr/lib/python2.7/dist-packages/vdsm/tool/dump_bonding_defaults.py ./usr/lib/python2.7/dist-packages/vdsm/tool/dump_volume_chains.py ./usr/lib/python2.7/dist-packages/vdsm/tool/configurator.py -./usr/lib/python2.7/dist-packages/vdsm/tool/load_needed_modules.py ./usr/lib/python2.7/dist-packages/vdsm/tool/nwfilter.py ./usr/lib/python2.7/dist-packages/vdsm/tool/passwd.py ./usr/lib/python2.7/dist-packages/vdsm/tool/register.py diff --git a/init/vdsmd_init_common.sh.in b/init/vdsmd_init_common.sh.in index 43d0db5..47372fd 100644 --- a/init/vdsmd_init_common.sh.in +++ b/init/vdsmd_init_common.sh.in @@ -153,13 +153,6 @@ } -task_load_needed_modules(){ - if ! _has_systemd; then - "${VDSM_TOOL}" load-needed-modules - fi -} - - task_dump_bonding_defaults(){ "${VDSM_TOOL}" dump-bonding-defaults } @@ -301,9 +294,6 @@ case "$1" in --pre-start) - # If dump_bonding_defaults is desired (for the uneliminable possibility - # of added bonding options or tweaked kernel defaults) it has to be run - # after load_needed_modules (modprobe bonding). # NetworkManager must not crash on nmcli conn delete. run_tasks " \ mkdirs \ @@ -318,7 +308,6 @@ syslog_available \ nwfilter \ dummybr \ - load_needed_modules \ tune_system \ test_space \ test_lo \ diff --git a/lib/vdsm/tool/Makefile.am b/lib/vdsm/tool/Makefile.am index d93156e..c8979ca 100644 --- a/lib/vdsm/tool/Makefile.am +++ b/lib/vdsm/tool/Makefile.am @@ -22,12 +22,10 @@ include $(top_srcdir)/build-aux/Makefile.subs EXTRA_DIST = \ - load_needed_modules.py.in \ validate_ovirt_certs.py.in \ $(NULL) nodist_vdsmtool_PYTHON = \ - load_needed_modules.py \ validate_ovirt_certs.py \ $(NULL) diff --git a/lib/vdsm/tool/load_needed_modules.py.in b/lib/vdsm/tool/load_needed_modules.py.in deleted file mode 100644 index dc7d533..0000000 --- a/lib/vdsm/tool/load_needed_modules.py.in +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright IBM, Corp. 2012 -# Copyright 2013-2014 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# - - -from __future__ import absolute_import -import os.path - -from . import expose, ExtraArgsError -from ..utils import execCmd - - -EX_MODPROBE = '@MODPROBE_PATH@' - - -def _exec_command(argv): - """ - This function executes a given shell command. - """ - rc, out, err = execCmd(argv, raw=True) - if rc != 0: - raise RuntimeError( - "Execute command %s failed: %s" % (argv, err) - ) - - -def _enable_softdog(): - if not os.path.exists('/dev/watchdog'): - _exec_command([EX_MODPROBE, 'softdog']) - - -@expose('load-needed-modules') -def load_needed_modules(*args): - """ - load-needed-modules - Load needed modules - """ - - if len(args) > 1: - raise ExtraArgsError() - - for mod in ['bridge', 'tun', 'bonding', '8021q']: - _exec_command([EX_MODPROBE, mod]) - _enable_softdog() diff --git a/vdsm-tool/vdsm-tool.1.in b/vdsm-tool/vdsm-tool.1.in index d29dc1e..571abc8 100644 --- a/vdsm-tool/vdsm-tool.1.in +++ b/vdsm-tool/vdsm-tool.1.in @@ -72,13 +72,6 @@ Defines a dummy bridge on a libvirt network. .RE .TP -Options for the \fIload_needed_modules\fP module: -.RS -.TP -.B load-needed-modules -Loads the required modules. -.RE -.TP Options for the \fInwfilter\fP module: .RS .TP diff --git a/vdsm.spec.in b/vdsm.spec.in index 2f5ffc8..e6bf872 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -1189,11 +1189,6 @@ %{_datadir}/%{vdsm_name}/config.py* %{_datadir}/%{vdsm_name}/netinfo.py* %endif -%if 0%{?with_systemd} -%exclude %{python_sitelib}/%{vdsm_name}/tool/load_needed_modules.py* -%else -%{python_sitelib}/%{vdsm_name}/tool/load_needed_modules.py* -%endif %{python_sitelib}/%{vdsm_name}/tool/configfile.py* %{python_sitelib}/%{vdsm_name}/tool/dummybr.py* %{python_sitelib}/%{vdsm_name}/tool/dump_bonding_defaults.py* -- To view, visit https://gerrit.ovirt.org/43040 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I44e4624c354401116040b3fd5bbb54b6f31ee727 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>

4 9

Change in vdsm[master]: jsonrpc: vdscli: migration: fix migrationCreate
by fromani＠redhat.com 02 Jul '15

02 Jul '15

Francesco Romani has uploaded a new change for review. Change subject: jsonrpc: vdscli: migration: fix migrationCreate ...................................................................... jsonrpc: vdscli: migration: fix migrationCreate In virt migration code, we do logic on the return value of VM.migrationCreate API, and we expect it to be a proper response, so with ['status']['code'] field, plus all the extra fields that APIs can add (see schema for examples). Current jsonrpc code strips all but the extra fields, so jsonrpcvdscli has to force fit a success code. This patch simplify the code by just passing around a copy of the raw data, leveraging the response module. This way the code is both simpler and more conformant to the old XML-RPC vdscli API. Change-Id: Ie9288d367c519830f6510a2d1b2a5fc1e410949c Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M lib/vdsm/jsonrpcvdscli.py 1 file changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/70/42970/1 diff --git a/lib/vdsm/jsonrpcvdscli.py b/lib/vdsm/jsonrpcvdscli.py index 595c584..8ef1cbf 100644 --- a/lib/vdsm/jsonrpcvdscli.py +++ b/lib/vdsm/jsonrpcvdscli.py @@ -26,6 +26,8 @@ JsonRpcRequest, \ JsonRpcNoResponseError +from vdsm import response + _COMMAND_CONVERTER = { 'ping': 'Host.ping', @@ -58,13 +60,12 @@ if resp.error is not None: return resp.error - return resp.result + return response.success(**resp.result) def migrationCreate(self, params): - self._callMethod('migrationCreate', - params['vmId'], - params) - return {'status': {'code': 0}} + return self._callMethod('migrationCreate', + params['vmId'], + params) def __getattr__(self, methodName): return partial(self._callMethod, methodName) -- To view, visit https://gerrit.ovirt.org/42970 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie9288d367c519830f6510a2d1b2a5fc1e410949c Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

5 14

Change in vdsm[master]: snapshot: Add VM.freeze() and VM.thaw() apis.
by fromani＠redhat.com 02 Jul '15

02 Jul '15

Francesco Romani has posted comments on this change. Change subject: snapshot: Add VM.freeze() and VM.thaw() apis. ...................................................................... Patch Set 4: Code-Review+1 once 43018 is ready, this is straightforward. Conditional ACK :) -- To view, visit https://gerrit.ovirt.org/43058 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I44c4237841e44548f48f626f4241d3f2e484930e Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Martin Polednik <mpolednik(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: snapshot: Add VM.freeze() and VM.thaw() apis.
by Nir Soffer 01 Jul '15

01 Jul '15

Nir Soffer has posted comments on this change. Change subject: snapshot: Add VM.freeze() and VM.thaw() apis. ...................................................................... Patch Set 4: This version updates the apis to remove the mountpoints parameter. -- To view, visit https://gerrit.ovirt.org/43058 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I44c4237841e44548f48f626f4241d3f2e484930e Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Martin Polednik <mpolednik(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: snapshot: Add VM.freeze() and VM.thaw() apis.
by Nir Soffer 01 Jul '15

01 Jul '15

Nir Soffer has posted comments on this change. Change subject: snapshot: Add VM.freeze() and VM.thaw() apis. ...................................................................... Patch Set 4: Verified+1 -- To view, visit https://gerrit.ovirt.org/43058 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I44c4237841e44548f48f626f4241d3f2e484930e Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Martin Polednik <mpolednik(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: snapshot: Add VM.freeze() and VM.thaw() apis.
by automation＠ovirt.org 01 Jul '15

01 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: snapshot: Add VM.freeze() and VM.thaw() apis. ...................................................................... Patch Set 4: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43058 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I44c4237841e44548f48f626f4241d3f2e484930e Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Martin Polednik <mpolednik(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: virt: tolerate missing ovirt-vmconsole group
by fromani＠redhat.com 01 Jul '15

01 Jul '15

Francesco Romani has uploaded a new change for review. Change subject: virt: tolerate missing ovirt-vmconsole group ...................................................................... virt: tolerate missing ovirt-vmconsole group To support the virtio serial console feature, VDSM must bind the virtio channel to an unix domain socket, and fix its permissions and group in order to let ovirt-vmconsole-host connect to that socket. ovirt-vmconsole-host it is a soft dependency. VDSM should happily run without that package, but incorrectly assumed the ovirt-vmconsole group existed in the system This patch lift this requirement: VDSM still try to fix the group of the socket, but if the group doesn't exist, it happily goes ahead. Change-Id: I55b708953e5871053f0063bb82434c5c0dcb6103 Related-To: https://bugzilla.redhat.com/show_bug.cgi?id=1223671 Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M vdsm/virt/vmdevices/core.py 1 file changed, 8 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/51/42451/1 diff --git a/vdsm/virt/vmdevices/core.py b/vdsm/virt/vmdevices/core.py index a847ce0..4d56005 100644 --- a/vdsm/virt/vmdevices/core.py +++ b/vdsm/virt/vmdevices/core.py @@ -99,9 +99,14 @@ def prepare(self): if self._path: - supervdsm.getProxy().prepareVmChannel( - self._path, - constants.OVIRT_VMCONSOLE_GROUP) + try: + supervdsm.getProxy().prepareVmChannel( + self._path, + constants.OVIRT_VMCONSOLE_GROUP) + except KeyError: + self.log.warn('unknown group %s, permissions not updated', + constants.OVIRT_VMCONSOLE_GROUP) + def cleanup(self): if self._path: -- To view, visit https://gerrit.ovirt.org/42451 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I55b708953e5871053f0063bb82434c5c0dcb6103 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

5 27

Change in vdsm[master]: migration: replace boolean with proper Events
by automation＠ovirt.org 01 Jul '15

01 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: migration: replace boolean with proper Events ...................................................................... Patch Set 2: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/42887 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I02639749ab884c3542c4d29715756044d777f738 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: snapshot: Add VM.freeze() and VM.thaw() apis.
by Maor Lipchuk 01 Jul '15

01 Jul '15

Maor Lipchuk has posted comments on this change. Change subject: snapshot: Add VM.freeze() and VM.thaw() apis. ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/43058 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I44c4237841e44548f48f626f4241d3f2e484930e Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Martin Polednik <mpolednik(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: adding StorageDomain.removeVmData()
by automation＠ovirt.org 01 Jul '15

01 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: adding StorageDomain.removeVmData() ...................................................................... Patch Set 2: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43103 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic964ac5c9cb57df881b895356a203529ab2a171a Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Liron Aravot <laravot(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: register: Replace log location
by Douglas Schilling Landgraf 01 Jul '15

01 Jul '15

Douglas Schilling Landgraf has uploaded a new change for review. Change subject: register: Replace log location ...................................................................... register: Replace log location The register tool is integrated to vdsm-tool but can be used without vdsm. This patch replaces the log location. Change-Id: I884c7c09dc16829752dc3801d1977e0097733939 Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com> --- M lib/vdsm/tool/register.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/31/42831/1 diff --git a/lib/vdsm/tool/register.py b/lib/vdsm/tool/register.py index 3ac3fc6..9b59e5f 100644 --- a/lib/vdsm/tool/register.py +++ b/lib/vdsm/tool/register.py @@ -179,13 +179,13 @@ def _set_logger(self): """ The logging settings - Saving log in: /var/log/vdsm/register.log + Saving log in: /var/log/ovirt-register.log """ logger = logging.getLogger(__name__) logger.setLevel(logging.DEBUG) logger.propagate = False - fh = logging.FileHandler("/var/log/vdsm/register.log") + fh = logging.FileHandler("/var/log/ovirt-register.log") fh.setLevel(logging.DEBUG) debug_fmt = logging.Formatter("%(asctime)s %(message)s", "%m/%d/%Y %I:%M:%S %p") -- To view, visit https://gerrit.ovirt.org/42831 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I884c7c09dc16829752dc3801d1977e0097733939 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com>

2 5

Change in vdsm[ovirt-3.5]: Balloon should not work when guest agent is not present
by Martin Sivak 01 Jul '15

01 Jul '15

Hello Adam Litke, I'd like you to do a code review. Please visit https://gerrit.ovirt.org/42968 to review the following change. Change subject: Balloon should not work when guest agent is not present ...................................................................... Balloon should not work when guest agent is not present StatAvg returns 0 when there is no data available. We need to use Stat here so we get None and properly fail the condition. Change-Id: Ic164043259a2936243e572c14705afa064f92171 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1232669 Signed-off-by: Martin Sivak <msivak(a)redhat.com> Reviewed-on: https://gerrit.ovirt.org/42207 Continuous-Integration: Jenkins CI Reviewed-by: Adam Litke <alitke(a)redhat.com> --- M vdsm/mom.d/02-balloon.policy 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/68/42968/1 diff --git a/vdsm/mom.d/02-balloon.policy b/vdsm/mom.d/02-balloon.policy index 570c751..b1af0d5 100644 --- a/vdsm/mom.d/02-balloon.policy +++ b/vdsm/mom.d/02-balloon.policy @@ -116,7 +116,7 @@ }) (with Guests guest - (if (valid guest.balloon_cur (guest.StatAvg "mem_unused")) + (if (valid guest.balloon_cur (guest.Stat "mem_unused")) (balloon_logic guest) (debug "Memory information is missing, ballooning for" guest "disabled"))) -- To view, visit https://gerrit.ovirt.org/42968 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic164043259a2936243e572c14705afa064f92171 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Martin Sivák <msivak(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com>

5 8

Change in vdsm[master]: snapshot: Add VM.freeze() and VM.thaw() apis.
by automation＠ovirt.org 01 Jul '15

01 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: snapshot: Add VM.freeze() and VM.thaw() apis. ...................................................................... Patch Set 3: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43058 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I44c4237841e44548f48f626f4241d3f2e484930e Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Martin Polednik <mpolednik(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: adding StorageDomain.removeVmData()
by automation＠ovirt.org 01 Jul '15

01 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: adding StorageDomain.removeVmData() ...................................................................... Patch Set 1: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43103 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic964ac5c9cb57df881b895356a203529ab2a171a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Liron Aravot <laravot(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: adding StorageDomain.activateHsm()
by automation＠ovirt.org 01 Jul '15

01 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: adding StorageDomain.activateHsm() ...................................................................... Patch Set 1: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43102 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic661b44b060ddfeeb2a2caedb2662c6102b950e0 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Liron Aravot <laravot(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: adding StorageDomain.updateVmData()
by automation＠ovirt.org 01 Jul '15

01 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: adding StorageDomain.updateVmData() ...................................................................... Patch Set 3: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/42930 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id79e7d6375e60216d1eb9a58e5a5c087db98625f Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Liron Aravot <laravot(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: snapshot: Add VM.freeze() and VM.thaw() apis.
by automation＠ovirt.org 01 Jul '15

01 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: snapshot: Add VM.freeze() and VM.thaw() apis. ...................................................................... Patch Set 2: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43058 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I44c4237841e44548f48f626f4241d3f2e484930e Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Martin Polednik <mpolednik(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: gluster:refactor: User specified backup servers option
by ahino＠redhat.com 01 Jul '15

01 Jul '15

Ala Hino has uploaded a new change for review. Change subject: gluster:refactor: User specified backup servers option ...................................................................... gluster:refactor: User specified backup servers option Move handling user specified backup servers option from _get_backup_servers_option method to options property. Change-Id: I4238328cfe230852182a1d997bd51b00f686f4a8 Signed-off-by: Ala Hino <ahino(a)redhat.com> --- M vdsm/storage/storageServer.py 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/03/43003/1 diff --git a/vdsm/storage/storageServer.py b/vdsm/storage/storageServer.py index 3d62694..e71b88c 100644 --- a/vdsm/storage/storageServer.py +++ b/vdsm/storage/storageServer.py @@ -297,7 +297,11 @@ @property def options(self): - backup_servers_option = self._get_backup_servers_option() + if "backup-volfile-servers" in self._options: + self.log.warn("Using user specified backup-volfile-servers option") + backup_servers_option = "" + else: + backup_servers_option = self._get_backup_servers_option() return ",".join( p for p in (self._options, backup_servers_option) if p) @@ -313,10 +317,6 @@ raise se.UnsupportedGlusterVolumeReplicaCountError(replicaCount) def _get_backup_servers_option(self): - if "backup-volfile-servers" in self._options: - self.log.warn("Using user specified backup-volfile-servers option") - return "" - servers = [brick.split(":")[0] for brick in self.volinfo['bricks']] servers.remove(self._volfileserver) if not servers: -- To view, visit https://gerrit.ovirt.org/43003 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4238328cfe230852182a1d997bd51b00f686f4a8 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ala Hino <ahino(a)redhat.com>

4 9

Change in vdsm[master]: tests: add HostStatsThread._getCpuCoreStats test
by fromani＠redhat.com 01 Jul '15

01 Jul '15

Francesco Romani has uploaded a new change for review. Change subject: tests: add HostStatsThread._getCpuCoreStats test ...................................................................... tests: add HostStatsThread._getCpuCoreStats test Next patch wants to refactor HostStatsThread._getCpuCoreStats into a free function, so this patch adds very basic test coverage. This test needs to be refactored as well, and will be done alongside the method refactoring. Change-Id: I6c6a82c77054e76d7d08322ad83d086302c2bbad Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M tests/samplingTests.py M tests/vmfakelib.py 2 files changed, 49 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/72/41372/1 diff --git a/tests/samplingTests.py b/tests/samplingTests.py index 9e3c3c3..74218e7 100644 --- a/tests/samplingTests.py +++ b/tests/samplingTests.py @@ -30,11 +30,14 @@ from vdsm.password import ProtectedPassword import virt.sampling as sampling +import caps + from testValidation import brokentest, ValidateRunningAsRoot from testlib import permutations, expandPermutations from testlib import VdsmTestCase as TestCaseBase from monkeypatch import MonkeyPatchScope from functional import dummy +import vmfakelib as fake class SamplingTests(TestCaseBase): @@ -269,6 +272,36 @@ } self.assertEquals(self._hs.get(), expected) + def testCpuCoreStats(self): + node_id, cpu_id = 0, 0 + self._hs = sampling.HostStatsThread(self.log) + cpu_sample = {'user': 1.0, 'sys': 2.0} + + for fake_ts in xrange(5): # FIXME + self._hs._samples.append( + fake.HostSample(fake_ts, {cpu_id: cpu_sample})) + + def fakeNumaTopology(): + return { + node_id: { + 'cpus': [cpu_id] + } + } + + expected = { + '0': { + 'cpuIdle': '100.00', + 'cpuSys': '0.00', + 'cpuUser': '0.00', + 'nodeIndex': 0 + } + } + + with MonkeyPatchScope([(caps, 'getNumaTopology', + fakeNumaTopology)]): + self.assertEqual(self._hs._getCpuCoresStats(), + expected) + class StatsCacheTests(TestCaseBase): diff --git a/tests/vmfakelib.py b/tests/vmfakelib.py index 995508c..61ac448 100644 --- a/tests/vmfakelib.py +++ b/tests/vmfakelib.py @@ -240,3 +240,19 @@ def last(self): return self._samples + + +class CpuCoreSample(object): + + def __init__(self, samples): + self._samples = samples + + def getCoreSample(self, key): + return self._samples[key] + + +class HostSample(object): + + def __init__(self, timestamp, samples): + self.timestamp = timestamp + self.cpuCores = CpuCoreSample(samples) -- To view, visit https://gerrit.ovirt.org/41372 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6c6a82c77054e76d7d08322ad83d086302c2bbad Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

3 18

Change in vdsm[master]: sampling: rename variables for clarity
by fromani＠redhat.com 01 Jul '15

01 Jul '15

Francesco Romani has uploaded a new change for review. Change subject: sampling: rename variables for clarity ...................................................................... sampling: rename variables for clarity Rename: hs0 -> first_sample hs1 -> last_sample for clarity, and to conform to naming used elsewhere in the module/package. No changes in logic. Change-Id: I24d07414c96dcd047966bb28cd2f756640692f1c Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M vdsm/virt/sampling.py 1 file changed, 17 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/19/41219/1 diff --git a/vdsm/virt/sampling.py b/vdsm/virt/sampling.py index 9ad6143..1ee485e 100644 --- a/vdsm/virt/sampling.py +++ b/vdsm/virt/sampling.py @@ -613,37 +613,41 @@ 'elapsedTime': int(time.time() - self.startTime) } - hs0, hs1, _ = self._samples.stats() + first_sample, last_sample, _ = self._samples.stats() # we need a different interval, see below - if hs0 is None or hs1 is None: + if first_sample is None or last_sample is None: return stats stats.update(self._getInterfacesStats()) - interval = hs1.timestamp - hs0.timestamp + interval = last_sample.timestamp - first_sample.timestamp - jiffies = (hs1.pidcpu.user - hs0.pidcpu.user) % (2 ** 32) + jiffies = ( + last_sample.pidcpu.user - first_sample.pidcpu.user) % (2 ** 32) stats['cpuUserVdsmd'] = jiffies / interval - jiffies = (hs1.pidcpu.sys - hs0.pidcpu.sys) % (2 ** 32) + jiffies = ( + last_sample.pidcpu.sys - first_sample.pidcpu.sys) % (2 ** 32) stats['cpuSysVdsmd'] = jiffies / interval - jiffies = (hs1.totcpu.user - hs0.totcpu.user) % (2 ** 32) + jiffies = ( + last_sample.totcpu.user - first_sample.totcpu.user) % (2 ** 32) stats['cpuUser'] = jiffies / interval / self._ncpus - jiffies = (hs1.totcpu.sys - hs0.totcpu.sys) % (2 ** 32) + jiffies = ( + last_sample.totcpu.sys - first_sample.totcpu.sys) % (2 ** 32) stats['cpuSys'] = jiffies / interval / self._ncpus stats['cpuIdle'] = max(0.0, 100.0 - stats['cpuUser'] - stats['cpuSys']) - stats['memUsed'] = hs1.memUsed - stats['anonHugePages'] = hs1.anonHugePages - stats['cpuLoad'] = hs1.cpuLoad + stats['memUsed'] = last_sample.memUsed + stats['anonHugePages'] = last_sample.anonHugePages + stats['cpuLoad'] = last_sample.cpuLoad - stats['diskStats'] = hs1.diskStats - stats['thpState'] = hs1.thpState + stats['diskStats'] = last_sample.diskStats + stats['thpState'] = last_sample.thpState if self._boot_time(): stats['bootTime'] = self._boot_time() - stats['numaNodeMemFree'] = hs1.numaNodeMem.nodesMemSample + stats['numaNodeMemFree'] = last_sample.numaNodeMem.nodesMemSample stats['cpuStatistics'] = self._getCpuCoresStats() stats['v2vJobs'] = v2v.get_jobs_status() -- To view, visit https://gerrit.ovirt.org/41219 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I24d07414c96dcd047966bb28cd2f756640692f1c Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

3 17

Change in vdsm[master]: gluster: create pv with custom dataalignment value
by tjeyasin＠redhat.com 01 Jul '15

01 Jul '15

Timothy Asir has uploaded a new change for review. Change subject: gluster: create pv with custom dataalignment value ...................................................................... gluster: create pv with custom dataalignment value Blivet creates pv with 1mb dataalignment forcefully for whatever given value. So that we have used vdsm.storage.lvm module to create pv. But due to some lvm configuration VDSM also creates pv with 1mb dataalignment value. Seperate bug oppend for vdsm to fix this issue in https://bugzilla.redhat.com/show_bug.cgi?id=1235086 This patch uses lvm pvcreate command as a workaround till this bug fixed in either vdsm or blivet. Change-Id: I5eb58f81679729af4d3dc34bc9f7edba757acc67 Signed-off-by: Timothy Asir Jeyasingh <tjeyasin(a)redhat.com> Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1178705 --- M vdsm/gluster/storagedev.py 1 file changed, 9 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/82/42782/1 diff --git a/vdsm/gluster/storagedev.py b/vdsm/gluster/storagedev.py index eb8b103..ec18d19 100644 --- a/vdsm/gluster/storagedev.py +++ b/vdsm/gluster/storagedev.py @@ -32,7 +32,6 @@ from blivet.devices import LVMThinLogicalVolumeDevice from blivet import udev -import storage.lvm as lvm from vdsm import utils import fstab @@ -41,6 +40,9 @@ log = logging.getLogger("Gluster") +_pvCreateCommandPath = utils.CommandPath("lvcreate", + "/sbin/pvcreate", + "/usr/sbin/pvcreate",) _vgCreateCommandPath = utils.CommandPath("vgcreate", "/sbin/vgcreate", "/usr/sbin/vgcreate",) @@ -156,9 +158,12 @@ def _createPV(deviceList, alignment=0): def _createAlignedPV(deviceList, alignment): for dev in deviceList: - rc, out, err = lvm._createpv( - [dev.path], metadataSize=0, - options=('--dataalignment', '%sK' % alignment)) + # bz#1178705: Blivet always creates pv with 1MB dataalignment + # Workaround: Till blivet fixes the issue, we use lvm pvcreate + rc, out, err = utils.execCmd([_pvCreateCommandPath.cmd, + '--dataalignment', + '%sk' % alignment, + dev.path]) if rc: raise ge.GlusterHostStorageDevicePVCreateFailedException( dev.path, alignment, rc, out, err) -- To view, visit https://gerrit.ovirt.org/42782 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5eb58f81679729af4d3dc34bc9f7edba757acc67 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Timothy Asir <tjeyasin(a)redhat.com>

6 17

Change in vdsm[master]: tests: skip jsonrpc tests
by Piotr Kliczewski 01 Jul '15

01 Jul '15

Piotr Kliczewski has uploaded a new change for review. Change subject: tests: skip jsonrpc tests ...................................................................... tests: skip jsonrpc tests Change-Id: Ia0dcf7b83178ac539a12b3cc6857f7dd18dd6c15 Signed-off-by: pkliczewski <piotr.kliczewski(a)gmail.com> --- M tests/jsonRpcTests.py 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/74/42774/1 diff --git a/tests/jsonRpcTests.py b/tests/jsonRpcTests.py index 3606bba..3a99696 100644 --- a/tests/jsonRpcTests.py +++ b/tests/jsonRpcTests.py @@ -22,6 +22,7 @@ from clientIF import clientIF from contextlib import contextmanager from monkeypatch import MonkeyPatch +from testValidation import brokentest from testlib import VdsmTestCase as TestCaseBase, \ expandPermutations, \ @@ -101,6 +102,7 @@ finally: client.close() + @brokentest @MonkeyPatch(clientIF, 'getInstance', getInstance) @permutations(PERMUTATIONS) def testMethodCallArgList(self, ssl, type): @@ -117,6 +119,7 @@ self.assertEquals(self._callTimeout(client, "echo", (data,), CALL_ID), data) + @brokentest @MonkeyPatch(clientIF, 'getInstance', getInstance) @permutations(PERMUTATIONS) def testMethodCallArgDict(self, ssl, type): @@ -132,6 +135,7 @@ self.assertEquals(self._callTimeout(client, "echo", {'text': data}, CALL_ID), data) + @brokentest @MonkeyPatch(clientIF, 'getInstance', getInstance) @permutations(PERMUTATIONS) def testMethodMissingMethod(self, ssl, type): @@ -150,6 +154,7 @@ self.assertEquals(cm.exception.code, JsonRpcMethodNotFoundError().code) + @brokentest @MonkeyPatch(clientIF, 'getInstance', getInstance) @permutations(PERMUTATIONS) def testMethodBadParameters(self, ssl, type): @@ -170,6 +175,7 @@ self.assertEquals(cm.exception.code, JsonRpcInternalError().code) + @brokentest @MonkeyPatch(clientIF, 'getInstance', getInstance) @permutations(PERMUTATIONS) def testMethodReturnsNullAndServerReturnsTrue(self, ssl, type): @@ -186,6 +192,7 @@ CALL_ID) self.assertEquals(res, True) + @brokentest @MonkeyPatch(clientIF, 'getInstance', getInstance) @permutations(PERMUTATIONS) def testDoubleResponse(self, ssl, type): @@ -205,6 +212,7 @@ CALL_ID) self.assertEquals(res, 'sent') + @brokentest @MonkeyPatch(clientIF, 'getInstance', getInstance) @permutations(PERMUTATIONS) def testSlowMethod(self, ssl, type): -- To view, visit https://gerrit.ovirt.org/42774 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia0dcf7b83178ac539a12b3cc6857f7dd18dd6c15 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>

3 7

Change in vdsm[master]: hostdev: fix address type for generic devices
by Martin Polednik 01 Jul '15

01 Jul '15

Martin Polednik has uploaded a new change for review. Change subject: hostdev: fix address type for generic devices ...................................................................... hostdev: fix address type for generic devices Change 155e823f refactored some common elements of generic and interface passthrough, but added type to address element only in case of interface. Using default empty type led to invalid address being generated. Change-Id: Icf9e3f801e219c6a3cb4d54a77a288bd770a3697 Signed-off-by: Martin Polednik <mpolednik(a)redhat.com> --- M vdsm/virt/vmdevices/hostdevice.py 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/41/43041/1 diff --git a/vdsm/virt/vmdevices/hostdevice.py b/vdsm/virt/vmdevices/hostdevice.py index 2817250..38b9cc4 100644 --- a/vdsm/virt/vmdevices/hostdevice.py +++ b/vdsm/virt/vmdevices/hostdevice.py @@ -85,7 +85,10 @@ type=CAPABILITY_TO_XML_ATTR[self._deviceParams['capability']]) source = hostdev.appendChildWithArgs('source') - self._add_source_address(source) + self._add_source_address( + source, + type=CAPABILITY_TO_XML_ATTR[self._deviceParams['capability']] + ) return hostdev -- To view, visit https://gerrit.ovirt.org/43041 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icf9e3f801e219c6a3cb4d54a77a288bd770a3697 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Polednik <mpolednik(a)redhat.com>

3 5

Change in vdsm[master]: snapshot: Add VM.freeze() and VM.thaw() apis.
by michal.skrivanek＠redhat.com 01 Jul '15

01 Jul '15

Michal Skrivanek has posted comments on this change. Change subject: snapshot: Add VM.freeze() and VM.thaw() apis. ...................................................................... Patch Set 1: why do we want to expose freeze/thaw in API? -- To view, visit https://gerrit.ovirt.org/43058 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I44c4237841e44548f48f626f4241d3f2e484930e Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Martin Polednik <mpolednik(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: Revised the format of output from the vdsm-tool vdsm-id comm...
by Alon Bar-Lev 01 Jul '15

01 Jul '15

Alon Bar-Lev has posted comments on this change. Change subject: Revised the format of output from the vdsm-tool vdsm-id command. ...................................................................... Patch Set 1: guys, this is just adding new line. -- To view, visit https://gerrit.ovirt.org/34583 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7379e969881931aaa4745dedf85ddfb61487f4a4 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Andrew Dahms <andrewjdahms(a)gmail.com> Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-Reviewer: mooli tayer <mtayer(a)redhat.com> Gerrit-HasComments: No

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches July 2015