Nir Soffer has uploaded a new change for review. Change subject: domainMonitor: Refine names ......................................................................
domainMonitor: Refine names The domain monitor use to have monitoredDomains and poolMonitoredDomains properties. The word "monitored" in these names is unneeded, as the class is called DomainMonitor, and it does not keep other lists of domains. I replaced the _domains variable to the more specific _monitors, since this dict keep domain monitors, not domain objects. This is required now to prevent confusion, since the new domains property does not return the dict but its keys. Finally, when we get a monitor object from the dict, we call it "monitor" in all method. Change-Id: I141d4a0baf6b72ddfa5075052f7f4b24ce336a1a Signed-off-by: Nir Soffer <[email protected]> --- M vdsm/storage/domainMonitor.py M vdsm/storage/sp.py 2 files changed, 19 insertions(+), 19 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/32/29532/1 diff --git a/vdsm/storage/domainMonitor.py b/vdsm/storage/domainMonitor.py index c8207d9..1ce9c55 100644 --- a/vdsm/storage/domainMonitor.py +++ b/vdsm/storage/domainMonitor.py @@ -76,33 +76,33 @@ log = logging.getLogger('Storage.DomainMonitor') def __init__(self, interval): - self._domains = {} + self._monitors = {} self._interval = interval self.onDomainStateChange = misc.Event( "Storage.DomainMonitor.onDomainStateChange") @property - def monitoredDomains(self): - return self._domains.keys() + def domains(self): + return self._monitors.keys() @property - def poolMonitoredDomains(self): - return [k for k, v in self._domains.iteritems() if v.poolDomain] + def poolDomains(self): + return [k for k, v in self._monitors.iteritems() if v.poolDomain] def startMonitoring(self, sdUUID, hostId, poolDomain=True): - domainThread = self._domains.get(sdUUID) + monitor = self._monitors.get(sdUUID) - if domainThread is not None: - domainThread.poolDomain |= poolDomain + if monitor is not None: + monitor.poolDomain |= poolDomain return self.log.info("Start monitoring %s", sdUUID) - domainThread = DomainMonitorThread(weakref.proxy(self), + monitor = DomainMonitorThread(weakref.proxy(self), sdUUID, hostId, self._interval) - domainThread.poolDomain = poolDomain - domainThread.start() + monitor.poolDomain = poolDomain + monitor.start() # The domain should be added only after it succesfully started - self._domains[sdUUID] = domainThread + self._monitors[sdUUID] = monitor def stopMonitoring(self, sdUUID): # The domain monitor issues events that might become raceful if @@ -112,19 +112,19 @@ # might respawn a new acquire host id. self.log.info("Stop monitoring %s", sdUUID) try: - self._domains[sdUUID].stop() + self._monitors[sdUUID].stop() except KeyError: return - del self._domains[sdUUID] + del self._monitors[sdUUID] - def getMonitoredDomainsStatus(self): - for sdUUID, monitor in self._domains.items(): + def getDomainsStatus(self): + for sdUUID, monitor in self._monitors.items(): yield sdUUID, monitor.getStatus() def close(self): self.log.info("Stopping domain monitors") - for sdUUID in self._domains.keys(): + for sdUUID in self._monitors.keys(): self.stopMonitoring(sdUUID) diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py index 2b4f2ce..0c63820 100644 --- a/vdsm/storage/sp.py +++ b/vdsm/storage/sp.py @@ -642,7 +642,7 @@ @unsecured def stopMonitoringDomains(self): - for sdUUID in self.domainMonitor.poolMonitoredDomains: + for sdUUID in self.domainMonitor.poolDomains: self.domainMonitor.stopMonitoring(sdUUID) return True @@ -1395,7 +1395,7 @@ # domain list it's list of sdUUID:status # sdUUID1:status1,sdUUID2:status2,... activeDomains = self.getDomains(activeOnly=True) - monitoredDomains = self.domainMonitor.poolMonitoredDomains + monitoredDomains = self.domainMonitor.poolDomains for sdUUID in monitoredDomains: if sdUUID not in activeDomains: -- To view, visit http://gerrit.ovirt.org/29532 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I141d4a0baf6b72ddfa5075052f7f4b24ce336a1a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
