Change in vdsm[master]: tc: silently ignore ingress qdisc re-creation
Dan Kenigsberg has uploaded a new change for review. Change subject: tc: silently ignore ingress qdisc re-creation .. tc: silently ignore ingress qdisc re-creation We should allow starting up two VMs monitorring a single bridge. Change-Id: Ib58c14cc8bfd5fe6e6a3efe86a1b1da4658a2b0f Signed-off-by: Dan Kenigsberg dan...@redhat.com --- M tests/tcTests.py M vdsm/tc.py 2 files changed, 12 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/34/7434/1 diff --git a/tests/tcTests.py b/tests/tcTests.py index c28fae1..23f8e64 100644 --- a/tests/tcTests.py +++ b/tests/tcTests.py @@ -162,7 +162,7 @@ return popen.stdout.read() def _addIngress(self): -tc.qdisc_add_ingress(self._bridge.devName) +tc.qdisc_replace_ingress(self._bridge.devName) self.assertTrue(qdisc ingress in self._showQdisc(), Could not add an ingress qdisc to the device.) diff --git a/vdsm/tc.py b/vdsm/tc.py index 1bb38d1..6b970ad 100644 --- a/vdsm/tc.py +++ b/vdsm/tc.py @@ -34,7 +34,7 @@ Exception.__init__(self, self.errCode, self.message, self.command) def setPortMirroring(network, target): -qdisc_add_ingress(network) +qdisc_replace_ingress(network) add_filter(network, target, ':') qdisc_replace_parent(network) devid = qdisc_get_devid(network) @@ -52,9 +52,17 @@ raise TrafficControlException(retcode, err, command) return out -def qdisc_add_ingress(dev): + +def qdisc_replace_ingress(dev): command = [EXT_TC, 'qdisc', 'add', 'dev', dev, 'ingress'] -_process_request(command) +try: +_process_request(command) +except TrafficControlException as e: +if e.message == 'RTNETLINK answers: File exists\n': +pass +else: +raise + def add_filter(dev, target, parentId=':'): command = [EXT_TC, 'filter', 'add', 'dev', dev, 'parent', -- To view, visit http://gerrit.ovirt.org/7434 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib58c14cc8bfd5fe6e6a3efe86a1b1da4658a2b0f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg dan...@redhat.com ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tc: silently ignore ingress qdisc re-creation
oVirt Jenkins CI Server has posted comments on this change. Change subject: tc: silently ignore ingress qdisc re-creation .. Patch Set 1: Build Successful http://jenkins.ovirt.info/job/patch_vdsm_unit_tests/626/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/7434 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib58c14cc8bfd5fe6e6a3efe86a1b1da4658a2b0f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tc: silently ignore ingress qdisc re-creation
Antoni Segura Puimedon has posted comments on this change. Change subject: tc: silently ignore ingress qdisc re-creation .. Patch Set 1: (1 inline comment) Just a small typo in the commit message. After that it is approved. Commit Message Line 5: CommitDate: 2012-08-23 16:18:42 +0300 Line 6: Line 7: tc: silently ignore ingress qdisc re-creation Line 8: Line 9: We should allow starting up two VMs monitorring a single bridge. s/monitorring/monitoring/ Line 10: Line 11: Change-Id: Ib58c14cc8bfd5fe6e6a3efe86a1b1da4658a2b0f -- To view, visit http://gerrit.ovirt.org/7434 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib58c14cc8bfd5fe6e6a3efe86a1b1da4658a2b0f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tc: silently ignore ingress qdisc re-creation
Dan Kenigsberg has posted comments on this change. Change subject: tc: silently ignore ingress qdisc re-creation .. Patch Set 2: Verified; Looks good to me, approved After that it is approved. -- To view, visit http://gerrit.ovirt.org/7434 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib58c14cc8bfd5fe6e6a3efe86a1b1da4658a2b0f Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tc: silently ignore ingress qdisc re-creation
Dan Kenigsberg has submitted this change and it was merged. Change subject: tc: silently ignore ingress qdisc re-creation .. tc: silently ignore ingress qdisc re-creation We should allow starting up two VMs monitoring a single bridge. Change-Id: Ib58c14cc8bfd5fe6e6a3efe86a1b1da4658a2b0f Signed-off-by: Dan Kenigsberg dan...@redhat.com --- M tests/tcTests.py M vdsm/tc.py 2 files changed, 12 insertions(+), 4 deletions(-) Approvals: Dan Kenigsberg: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/7434 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib58c14cc8bfd5fe6e6a3efe86a1b1da4658a2b0f Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
