Adam Litke has uploaded a new change for review.
Change subject: Pass the Scheduler instance to HSM
......................................................................
Pass the Scheduler instance to HSM
In preparation for auto-cleared Jobs, pass the Scheduler instance created at
vdsm startup into the HSM.
Change-Id: I0db5a0dd3f519737a554550efb785d8099d02a6f
Signed-off-by: Adam Litke <alitke(a)redhat.com>
---
M vdsm/storage/hsm.py
M vdsm/vdsm
2 files changed, 12 insertions(+), 6 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/53/61253/1
diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py
index 47d7e76..a4d4bf3 100644
--- a/vdsm/storage/hsm.py
+++ b/vdsm/storage/hsm.py
@@ -338,6 +338,7 @@
:type defExcFun: function
"""
self._ready = False
+ self._scheduler = None
rm.ResourceManager.getInstance().registerNamespace(
STORAGE, rm.SimpleResourceFactory())
self.storage_repository = config.get('irs', 'repository')
@@ -394,6 +395,9 @@
def ready(self):
return self._ready
+ def set_scheduler(self, scheduler):
+ self._scheduler = scheduler
+
@public
def registerDomainStateChangeCallback(self, callbackFunc):
"""
diff --git a/vdsm/vdsm b/vdsm/vdsm
index 497ecb6..3afc777 100755
--- a/vdsm/vdsm
+++ b/vdsm/vdsm
@@ -90,16 +90,18 @@
libvirtconnection.start_event_loop()
try:
- if config.getboolean('irs', 'irs_enable'):
- try:
- irs = Dispatcher(HSM())
- except:
- panic("Error initializing IRS")
-
scheduler = schedule.Scheduler(name="vdsm.Scheduler",
clock=utils.monotonic_time)
scheduler.start()
+ if config.getboolean('irs', 'irs_enable'):
+ try:
+ hsm = HSM()
+ hsm.set_scheduler(scheduler)
+ irs = Dispatcher(hsm)
+ except:
+ panic("Error initializing IRS")
+
from clientIF import clientIF # must import after config is read
cif = clientIF.getInstance(irs, log, scheduler)
--
To view, visit
https://gerrit.ovirt.org/61253
To unsubscribe, visit
https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0db5a0dd3f519737a554550efb785d8099d02a6f
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke <alitke(a)redhat.com>