Change in vdsm[master]: monitor: Simplify Status class
gerrit-hooks has posted comments on this change. Change subject: monitor: Simplify Status class .. Patch Set 13: * 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.6']) -- To view, visit https://gerrit.ovirt.org/57428 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0ce56d9a17547f8dfa49ee6f009589227c8761f9 Gerrit-PatchSet: 13 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir SofferGerrit-Reviewer: Adam Litke Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: monitor: Simplify Status class
gerrit-hooks has posted comments on this change. Change subject: monitor: Simplify Status class .. Patch Set 12: * 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.6']) -- To view, visit https://gerrit.ovirt.org/57428 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0ce56d9a17547f8dfa49ee6f009589227c8761f9 Gerrit-PatchSet: 12 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir SofferGerrit-Reviewer: Adam Litke Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: monitor: Simplify Status class
gerrit-hooks has posted comments on this change. Change subject: monitor: Simplify Status class .. Patch Set 11: * 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.6']) -- To view, visit https://gerrit.ovirt.org/57428 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0ce56d9a17547f8dfa49ee6f009589227c8761f9 Gerrit-PatchSet: 11 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir SofferGerrit-Reviewer: Adam Litke Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: monitor: Simplify Status class
gerrit-hooks has posted comments on this change. Change subject: monitor: Simplify Status class .. Patch Set 10: * 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.6']) -- To view, visit https://gerrit.ovirt.org/57428 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0ce56d9a17547f8dfa49ee6f009589227c8761f9 Gerrit-PatchSet: 10 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir SofferGerrit-Reviewer: Adam Litke Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: monitor: Simplify Status class
gerrit-hooks has posted comments on this change. Change subject: monitor: Simplify Status class .. Patch Set 9: * 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.6']) -- To view, visit https://gerrit.ovirt.org/57428 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0ce56d9a17547f8dfa49ee6f009589227c8761f9 Gerrit-PatchSet: 9 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir SofferGerrit-Reviewer: Adam Litke Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: monitor: Simplify Status class
gerrit-hooks has posted comments on this change. Change subject: monitor: Simplify Status class .. Patch Set 8: * 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.6']) -- To view, visit https://gerrit.ovirt.org/57428 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0ce56d9a17547f8dfa49ee6f009589227c8761f9 Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir SofferGerrit-Reviewer: Adam Litke Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: monitor: Simplify Status class
gerrit-hooks has posted comments on this change. Change subject: monitor: Simplify Status class .. 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.6']) -- To view, visit https://gerrit.ovirt.org/57428 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0ce56d9a17547f8dfa49ee6f009589227c8761f9 Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir SofferGerrit-Reviewer: Adam Litke Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: monitor: Simplify Status class
Nir Soffer has posted comments on this change. Change subject: monitor: Simplify Status class .. Patch Set 6: Continuous-Integration+1 Jenkins timed out cloning, ignoring it. -- To view, visit https://gerrit.ovirt.org/57428 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0ce56d9a17547f8dfa49ee6f009589227c8761f9 Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir SofferGerrit-Reviewer: Adam Litke Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: monitor: Simplify Status class
gerrit-hooks has posted comments on this change. Change subject: monitor: Simplify Status class .. 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.6']) -- To view, visit https://gerrit.ovirt.org/57428 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0ce56d9a17547f8dfa49ee6f009589227c8761f9 Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir SofferGerrit-Reviewer: Adam Litke Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: monitor: Simplify Status class
gerrit-hooks has posted comments on this change. Change subject: monitor: Simplify Status class .. 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.6']) -- To view, visit https://gerrit.ovirt.org/57428 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0ce56d9a17547f8dfa49ee6f009589227c8761f9 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir SofferGerrit-Reviewer: Adam Litke Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: monitor: Simplify Status class
gerrit-hooks has posted comments on this change. Change subject: monitor: Simplify Status class .. 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.6']) -- To view, visit https://gerrit.ovirt.org/57428 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0ce56d9a17547f8dfa49ee6f009589227c8761f9 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir SofferGerrit-Reviewer: Adam Litke Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: monitor: Simplify Status class
Nir Soffer has posted comments on this change. Change subject: monitor: Simplify Status class .. Patch Set 3: I can merge, it but I thought it will be much harder to review, so this is separated. -- To view, visit https://gerrit.ovirt.org/57428 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0ce56d9a17547f8dfa49ee6f009589227c8761f9 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir SofferGerrit-Reviewer: Adam Litke Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: monitor: Simplify Status class
Adam Litke has posted comments on this change. Change subject: monitor: Simplify Status class .. Patch Set 3: So this patch leaves the code in a state where Status is writable. Probably not a very concerning regression but should we consider merging this change with the patch that actually makes Status objects read-only? -- To view, visit https://gerrit.ovirt.org/57428 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0ce56d9a17547f8dfa49ee6f009589227c8761f9 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir SofferGerrit-Reviewer: Adam Litke Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: monitor: Simplify Status class
Adam Litke has posted comments on this change. Change subject: monitor: Simplify Status class .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/57428 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0ce56d9a17547f8dfa49ee6f009589227c8761f9 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir SofferGerrit-Reviewer: Adam Litke Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: monitor: Simplify Status class
Nir Soffer has posted comments on this change. Change subject: monitor: Simplify Status class .. Patch Set 3: Continuous-Integration+1 CI failure not related. -- To view, visit https://gerrit.ovirt.org/57428 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0ce56d9a17547f8dfa49ee6f009589227c8761f9 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir SofferGerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: monitor: Simplify Status class
gerrit-hooks has posted comments on this change. Change subject: monitor: Simplify Status class .. 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.6']) -- To view, visit https://gerrit.ovirt.org/57428 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0ce56d9a17547f8dfa49ee6f009589227c8761f9 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir SofferGerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: monitor: Simplify Status class
gerrit-hooks has posted comments on this change. Change subject: monitor: Simplify Status class .. 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.6']) -- To view, visit https://gerrit.ovirt.org/57428 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0ce56d9a17547f8dfa49ee6f009589227c8761f9 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir SofferGerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: monitor: Simplify Status class
Nir Soffer has posted comments on this change. Change subject: monitor: Simplify Status class .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.ovirt.org/57428 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0ce56d9a17547f8dfa49ee6f009589227c8761f9 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir SofferGerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: monitor: Simplify Status class
gerrit-hooks has posted comments on this change. Change subject: monitor: Simplify Status class .. 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.6']) -- To view, visit https://gerrit.ovirt.org/57428 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0ce56d9a17547f8dfa49ee6f009589227c8761f9 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir SofferGerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: monitor: Simplify Status class
Nir Soffer has uploaded a new change for review. Change subject: monitor: Simplify Status class .. monitor: Simplify Status class Remove the unneeded __slots__ since we do not manage many status objects. Remove FrozenStatus as it is not needed. The new status implementation will make the status read only in another way. Change-Id: I0ce56d9a17547f8dfa49ee6f009589227c8761f9 Signed-off-by: Nir Soffer--- M tests/storage_monitor_test.py M vdsm/storage/monitor.py 2 files changed, 3 insertions(+), 46 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/28/57428/1 diff --git a/tests/storage_monitor_test.py b/tests/storage_monitor_test.py index 56c4a1b..c711b48 100644 --- a/tests/storage_monitor_test.py +++ b/tests/storage_monitor_test.py @@ -22,31 +22,7 @@ from testlib import VdsmTestCase -class FrozenStatusTests(VdsmTestCase): - -def setUp(self): -self.status = monitor.Status() -self.frozen = monitor.FrozenStatus(self.status) - -def test_copy_attributes(self): -for name in self.status.__slots__: -value = getattr(self.status, name) -expected = getattr(self.frozen, name) -self.assertEquals(value, expected) - -def test_setting_attribute_raises(self): -for name in self.status.__slots__: -self.assertRaises(AssertionError, setattr, self.frozen, name, 1) - -def test_deleting_attribute_raises(self): -for name in self.status.__slots__: -self.assertRaises(AssertionError, delattr, self.frozen, name) - -def test_valid(self): -self.assertEqual(self.frozen.valid, self.status.valid) - - -class StatusValidTests(VdsmTestCase): +class TestStatus(VdsmTestCase): def test_valid(self): s = monitor.Status() diff --git a/vdsm/storage/monitor.py b/vdsm/storage/monitor.py index 9483993..6c90faf 100644 --- a/vdsm/storage/monitor.py +++ b/vdsm/storage/monitor.py @@ -35,12 +35,6 @@ class Status(object): -__slots__ = ( -"error", "checkTime", "readDelay", "masterMounted", -"masterValid", "diskUtilization", "vgMdUtilization", -"vgMdHasEnoughFreeSpace", "vgMdFreeBelowThreashold", "hasHostId", -"isoPrefix", "version", "actual", -) def __init__(self, actual=True): self.actual = actual @@ -67,19 +61,6 @@ @property def valid(self): return self.error is None - - -class FrozenStatus(Status): - -def __init__(self, other): -for name in other.__slots__: -value = getattr(other, name) -super(FrozenStatus, self).__setattr__(name, value) - -def __setattr__(self, *args): -raise AssertionError('%s is readonly' % self) - -__delattr__ = __setattr__ class DomainMonitor(object): @@ -204,7 +185,7 @@ # For backward compatibility, we must present a fake status before # collecting the first sample. The fake status is marked as # actual=False so engine can handle it correctly. -self.status = FrozenStatus(Status(actual=False)) +self.status = Status(actual=False) self.isIsoDomain = None self.isoPrefix = None self.lastRefresh = time.time() @@ -340,7 +321,7 @@ def _updateStatus(self, status): if self._statusDidChange(status): self._notifyStatusChanges(status) -self.status = FrozenStatus(status) +self.status = status def _statusDidChange(self, status): return (not self.status.actual or -- To view, visit https://gerrit.ovirt.org/57428 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0ce56d9a17547f8dfa49ee6f009589227c8761f9 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches