Change in vdsm[master]: Adding monitorDomains.

Eduardo has uploaded a new change for review.

Change subject: Adding monitorDomains.
......................................................................

Adding monitorDomains.

Making repoStats pool independent.

Change-Id: I9f148764ac030730c93bfd9c8da25a7ea434dc33
Signed-off-by: Eduardo 
---
M vdsm/storage/hsm.py
1 file changed, 19 insertions(+), 1 deletion(-)

git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/74/14674/1

diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py
index d3e1beb..3fb0c30 100644
--- a/vdsm/storage/hsm.py
+++ b/vdsm/storage/hsm.py
@@ -40,6 +40,7 @@

from vdsm.config import config
 import sp
+import domainMonitor
 import sd
 import blockSD
 import nfsSD
@@ -93,6 +94,7 @@

QEMU_READABLE_TIMEOUT = 30

+HSM_DOM_MON_LOCK = "HsmDomainMonitorLock"

def public(f=None, **kwargs):
     if f is None:
@@ -395,6 +397,9 @@
                                                 name="storageRefresh")
         storageRefreshThread.daemon = True
         storageRefreshThread.start()
+
+        monitorInterval = config.getint('irs', 'sd_health_check_delay')
+        self.domainMonitor = domainMonitor.DomainMonitor(monitorInterval)

def _hsmSchedule(self, name, func, *args):
         self.taskMng.scheduleJob("hsm", self.tasksDir, vars.task,
@@ -934,7 +939,10 @@
                 "spUUID=%s, msdUUID=%s, masterVersion=%s, hostID=%s, "
                 "scsiKey=%s" % (spUUID, msdUUID, masterVersion,
                                 hostID, scsiKey)))
-        return self._connectStoragePool(spUUID, hostID, scsiKey, msdUUID,
+        with rmanager.acquireResource(STORAGE, HSM_DOM_MON_LOCK,
+                                      rm.LockType.exclusive):
+            self.domainMonitor.close()
+            return self._connectStoragePool(spUUID, hostID, scsiKey, msdUUID,
                                         masterVersion, options)

def _connectStoragePool(self, spUUID, hostID, scsiKey, msdUUID,
@@ -3578,3 +3586,13 @@
                 result[d] = repo_stats[d]['result']

return result
+
+    @public
+    def monitorDomains(self, sdUUIDs, hostID, options=None):
+        with rmanager.acquireResource(STORAGE, HSM_DOM_MON_LOCK,
+                                      rm.LockType.exclusive):
+            if self.pools:
+                raise se.StoragePoolConnected()
+            self.domainMonitor.close()
+            for sdUUID in sdUUIDs:
+                self.domainMonitor.startMonitoring(sdUUID, hostId)

--
To view, visit http://gerrit.ovirt.org/14674
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f148764ac030730c93bfd9c8da25a7ea434dc33
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: Adding monitorDomains.
......................................................................

Patch Set 1:

Build Started http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/2232/ (1/3)

--
To view, visit http://gerrit.ovirt.org/14674
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I9f148764ac030730c93bfd9c8da25a7ea434dc33
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo 
Gerrit-Reviewer: oVirt Jenkins CI Server

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: Adding monitorDomains.
......................................................................

Patch Set 1:

Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/2296/ (2/3)

--
To view, visit http://gerrit.ovirt.org/14674
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I9f148764ac030730c93bfd9c8da25a7ea434dc33
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo 
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: [WIP] Adding monitorDomains.

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: [WIP] Adding monitorDomains.
......................................................................

Patch Set 2:

Build Started http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/2234/ (1/3)

--
To view, visit http://gerrit.ovirt.org/14674
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I9f148764ac030730c93bfd9c8da25a7ea434dc33
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo 
Gerrit-Reviewer: Eduardo 
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: [WIP] Adding monitorDomains.

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: [WIP] Adding monitorDomains.
......................................................................

Patch Set 2:

Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/2298/ (2/3)

--
To view, visit http://gerrit.ovirt.org/14674
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I9f148764ac030730c93bfd9c8da25a7ea434dc33
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo 
Gerrit-Reviewer: Eduardo 
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: [WIP] Adding monitorDomains.

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: [WIP] Adding monitorDomains.
......................................................................

Patch Set 2:

Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/1395/ (3/3)

--
To view, visit http://gerrit.ovirt.org/14674
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I9f148764ac030730c93bfd9c8da25a7ea434dc33
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo 
Gerrit-Reviewer: Eduardo 
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: [WIP] Adding monitorDomains.

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: [WIP] Adding monitorDomains.
......................................................................

Patch Set 2:

Build Successful

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/2234/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/1395/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/2298/ : SUCCESS

--
To view, visit http://gerrit.ovirt.org/14674
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I9f148764ac030730c93bfd9c8da25a7ea434dc33
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo 
Gerrit-Reviewer: Eduardo 
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: [WIP] Adding monitorDomains.

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: [WIP] Adding monitorDomains.
......................................................................

Patch Set 3:

Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/1407/ (1/3)

--
To view, visit http://gerrit.ovirt.org/14674
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I9f148764ac030730c93bfd9c8da25a7ea434dc33
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo 
Gerrit-Reviewer: Ayal Baron 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Daniel Paikov 
Gerrit-Reviewer: Eduardo 
Gerrit-Reviewer: Yeela Kaplan 
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: [WIP] Adding monitorDomains.

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: [WIP] Adding monitorDomains.
......................................................................

Patch Set 3:

Build Started http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/2246/ (2/3)

--
To view, visit http://gerrit.ovirt.org/14674
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I9f148764ac030730c93bfd9c8da25a7ea434dc33
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo 
Gerrit-Reviewer: Ayal Baron 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Daniel Paikov 
Gerrit-Reviewer: Eduardo 
Gerrit-Reviewer: Yeela Kaplan 
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: [WIP] Adding monitorDomains.

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: [WIP] Adding monitorDomains.
......................................................................

Patch Set 3:

Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/2310/ (3/3)

--
To view, visit http://gerrit.ovirt.org/14674
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I9f148764ac030730c93bfd9c8da25a7ea434dc33
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo 
Gerrit-Reviewer: Ayal Baron 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Daniel Paikov 
Gerrit-Reviewer: Eduardo 
Gerrit-Reviewer: Yeela Kaplan 
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: [WIP] Adding monitorDomains.

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: [WIP] Adding monitorDomains.
......................................................................

Patch Set 3:

Build Successful

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/2246/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/1407/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/2310/ : SUCCESS

--
To view, visit http://gerrit.ovirt.org/14674
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I9f148764ac030730c93bfd9c8da25a7ea434dc33
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo 
Gerrit-Reviewer: Ayal Baron 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Daniel Paikov 
Gerrit-Reviewer: Eduardo 
Gerrit-Reviewer: Yeela Kaplan 
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: [WIP] Adding monitorDomains.

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: [WIP] Adding monitorDomains.
......................................................................

Patch Set 4:

Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/2349/ (1/3)

--
To view, visit http://gerrit.ovirt.org/14674
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I9f148764ac030730c93bfd9c8da25a7ea434dc33
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo 
Gerrit-Reviewer: Ayal Baron 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Daniel Paikov 
Gerrit-Reviewer: Eduardo 
Gerrit-Reviewer: Yeela Kaplan 
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: [WIP] Adding monitorDomains.

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: [WIP] Adding monitorDomains.
......................................................................

Patch Set 4:

Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/1446/ (2/3)

--
To view, visit http://gerrit.ovirt.org/14674
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I9f148764ac030730c93bfd9c8da25a7ea434dc33
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo 
Gerrit-Reviewer: Ayal Baron 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Daniel Paikov 
Gerrit-Reviewer: Eduardo 
Gerrit-Reviewer: Yeela Kaplan 
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: [WIP] Adding monitorDomains.

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: [WIP] Adding monitorDomains.
......................................................................

Patch Set 4:

Build Started http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/2285/ (3/3)

--
To view, visit http://gerrit.ovirt.org/14674
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I9f148764ac030730c93bfd9c8da25a7ea434dc33
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo 
Gerrit-Reviewer: Ayal Baron 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Daniel Paikov 
Gerrit-Reviewer: Eduardo 
Gerrit-Reviewer: Yeela Kaplan 
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: [WIP] Adding monitorDomains.

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: [WIP] Adding monitorDomains.
......................................................................

Patch Set 4:

Build Successful

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/2285/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/1446/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/2349/ : SUCCESS

--
To view, visit http://gerrit.ovirt.org/14674
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I9f148764ac030730c93bfd9c8da25a7ea434dc33
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo 
Gerrit-Reviewer: Ayal Baron 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Daniel Paikov 
Gerrit-Reviewer: Eduardo 
Gerrit-Reviewer: Yeela Kaplan 
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: [WIP] Adding monitorDomains.

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: [WIP] Adding monitorDomains.
......................................................................

Patch Set 5:

Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/1473/ (2/3)

--
To view, visit http://gerrit.ovirt.org/14674
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I9f148764ac030730c93bfd9c8da25a7ea434dc33
Gerrit-PatchSet: 5
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo 
Gerrit-Reviewer: Ayal Baron 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Daniel Paikov 
Gerrit-Reviewer: Eduardo 
Gerrit-Reviewer: Yeela Kaplan 
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: [WIP] Adding monitorDomains.

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: [WIP] Adding monitorDomains.
......................................................................

Patch Set 5:

Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/2377/ (1/3)

--
To view, visit http://gerrit.ovirt.org/14674
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I9f148764ac030730c93bfd9c8da25a7ea434dc33
Gerrit-PatchSet: 5
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo 
Gerrit-Reviewer: Ayal Baron 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Daniel Paikov 
Gerrit-Reviewer: Eduardo 
Gerrit-Reviewer: Yeela Kaplan 
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: [WIP] Adding monitorDomains.

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: [WIP] Adding monitorDomains.
......................................................................

Patch Set 5:

Build Started http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/2312/ (3/3)

--
To view, visit http://gerrit.ovirt.org/14674
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I9f148764ac030730c93bfd9c8da25a7ea434dc33
Gerrit-PatchSet: 5
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo 
Gerrit-Reviewer: Ayal Baron 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Daniel Paikov 
Gerrit-Reviewer: Eduardo 
Gerrit-Reviewer: Yeela Kaplan 
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: [WIP] Adding monitorDomains.

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: [WIP] Adding monitorDomains.
......................................................................

Patch Set 5: Fails

Build Failed

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/2312/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/1473/ : FAILURE

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/2377/ : SUCCESS

--
To view, visit http://gerrit.ovirt.org/14674
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I9f148764ac030730c93bfd9c8da25a7ea434dc33
Gerrit-PatchSet: 5
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo 
Gerrit-Reviewer: Ayal Baron 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Daniel Paikov 
Gerrit-Reviewer: Eduardo 
Gerrit-Reviewer: Yeela Kaplan 
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: [WIP] Adding monitorDomains.

Ayal Baron has posted comments on this change.

Change subject: [WIP] Adding monitorDomains.
......................................................................

Patch Set 5:

looks ok, polish it so we can take it out of WIP

Change in vdsm[master]: [WIP] Adding monitorDomains.

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: [WIP] Adding monitorDomains.
......................................................................

Patch Set 6:

Build Successful

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/4276/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/3379/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/4195/ : SUCCESS

Change in vdsm[master]: [WIP] Adding monitorDomains.

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: [WIP] Adding monitorDomains.
......................................................................

Patch Set 7:

Build Successful

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/4387/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/3490/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/4306/ : SUCCESS

Change in vdsm[master]: [WIP] Adding monitorDomains.

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: [WIP] Adding monitorDomains.
......................................................................

Patch Set 8:

Build Successful

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/4551/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/3654/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/4473/ : SUCCESS

Change in vdsm[master]: [WIP] Adding monitorDomains.

Itamar Heim has posted comments on this change.

Change subject: [WIP] Adding monitorDomains.
......................................................................

Patch Set 8:

ping?

Change in vdsm[master]: [WIP] Adding monitorDomains.

Itamar Heim has abandoned this change.

Change subject: [WIP] Adding monitorDomains.
......................................................................

Abandoned

abandoning per no reply. please restore if still relevant.