Dan Kenigsberg has submitted this change and it was merged.
Change subject: Revert "supervdsm: Add zombiereaper to supervdsm"
......................................................................
Revert "supervdsm: Add zombiereaper to supervdsm"
Introduction of zombiereaper is causing communication failures between
vdsm and supervdsm. The change register signal handler which causes
multiprocessing to fail.
There was python bug opened to fix multiprocessing issue but it was not
backported to 2.6.
This reverts commit 262550421bd169a04bc5f795c5b95ba0e903b4e.
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1168217
Change-Id: I90a76ad689938cc36fd9adbf73bd16e9a408cbb5
Signed-off-by: pkliczewski <piotr.kliczewski(a)gmail.com>
Related-To: http://bugs.python.org/issue17097
Reviewed-on: http://gerrit.ovirt.org/35802
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com>
Tested-by: Dan Kenigsberg <danken(a)redhat.com>
---
M vdsm/supervdsmServer
1 file changed, 15 insertions(+), 23 deletions(-)
Approvals:
Dan Kenigsberg: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/35802
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I90a76ad689938cc36fd9adbf73bd16e9a408cbb5
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Dima Kuznetsov <dkuznets(a)redhat.com>
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
Hello Nir Soffer, Dan Kenigsberg,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/35809
to review the following change.
Change subject: irs: Directly register domain state change callbacks
......................................................................
irs: Directly register domain state change callbacks
Currently, domain state change callbacks aren't actually registered
until a storage pool is connected. In a hosted engine environment there
is not a traditional storage pool associated with the storage domain
that is hosting the engine VM so in this case the event doesn't get
registered. Since storage pools are becoming deprecated, there is no
reason to delay callback registration based on connectStoragePool.
Change-Id: I28d4f1af4f94da1a8e3511abbe160ea66e81daad
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1157421
Signed-off-by: Adam Litke <alitke(a)redhat.com>
Reviewed-on: http://gerrit.ovirt.org/35369
Reviewed-by: Nir Soffer <nsoffer(a)redhat.com>
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com>
---
M vdsm/storage/hsm.py
1 file changed, 2 insertions(+), 11 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/09/35809/1
diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py
index 0f6930b..45f1694 100644
--- a/vdsm/storage/hsm.py
+++ b/vdsm/storage/hsm.py
@@ -362,8 +362,6 @@
oop.setDefaultImpl(config.get('irs', 'oop_impl'))
- self.domainStateChangeCallbacks = set()
-
# cleanStorageRepoitory uses tasksDir value, this must be assigned
# before calling it
self.tasksDir = config.get('irs', 'hsm_tasks')
@@ -401,10 +399,9 @@
@public
def registerDomainStateChangeCallback(self, callbackFunc):
"""
- Currently this method assumes that all registrations
- are done *prior* to connecting to pool.
+ Register a state change callback function with the domain monitor.
"""
- self.domainStateChangeCallbacks.add(callbackFunc)
+ self.domainMonitor.onDomainStateChange.register(callbackFunc)
def _hsmSchedule(self, name, func, *args):
self.taskMng.scheduleJob("hsm", None, vars.task, name, func, *args)
@@ -1074,12 +1071,6 @@
else:
pool.setBackend(
StoragePoolMemoryBackend(pool, masterVersion, domainsMap))
-
- # Must register domain state change callbacks *before* connecting
- # the pool, which starts domain monitor threads. Otherwise we will
- # miss the first event from the monitor thread.
- for cb in self.domainStateChangeCallbacks:
- pool.domainMonitor.onDomainStateChange.register(cb)
res = pool.connect(hostID, msdUUID, masterVersion)
if res:
--
To view, visit http://gerrit.ovirt.org/35809
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I28d4f1af4f94da1a8e3511abbe160ea66e81daad
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Adam Litke <alitke(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Hello Nir Soffer, Dan Kenigsberg,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/35808
to review the following change.
Change subject: clientIF: Use a weakref.proxy when registering contEIOVMs
......................................................................
clientIF: Use a weakref.proxy when registering contEIOVMs
Our storage Event class is taking a weakref on the callback function
that is passed into Event.register. Unfortunately weakrefs on bound
methods are dead on arrival. See this [1] discussion for more
information. Use the same approach as StoragePool._upgradeCallback and
use a weakref.proxy to build the callback function.
[1] http://code.activestate.com/recipes/81253/
Change-Id: Ib06967b26fc9ace41e5f8305a8fadafbbb0fc4e4
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1157421
Signed-off-by: Adam Litke <alitke(a)redhat.com>
Reviewed-on: http://gerrit.ovirt.org/35436
Reviewed-by: Nir Soffer <nsoffer(a)redhat.com>
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com>
---
M vdsm/clientIF.py
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/08/35808/1
diff --git a/vdsm/clientIF.py b/vdsm/clientIF.py
index bb42ee4..3678f9d 100644
--- a/vdsm/clientIF.py
+++ b/vdsm/clientIF.py
@@ -23,6 +23,8 @@
import time
import threading
import uuid
+from functools import partial
+from weakref import proxy
import alignmentScan
from vdsm.config import config
@@ -77,7 +79,8 @@
self._shutdownSemaphore = threading.Semaphore()
self.irs = irs
if self.irs:
- self.irs.registerDomainStateChangeCallback(self.contEIOVms)
+ self._contEIOVmsCB = partial(clientIF.contEIOVms, proxy(self))
+ self.irs.registerDomainStateChangeCallback(self._contEIOVmsCB)
self.log = log
self._recovery = True
self.channelListener = Listener(self.log)
--
To view, visit http://gerrit.ovirt.org/35808
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib06967b26fc9ace41e5f8305a8fadafbbb0fc4e4
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Adam Litke <alitke(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Dan Kenigsberg has uploaded a new change for review.
Change subject: use SASL_USERNAME instead of its upstream value
......................................................................
use SASL_USERNAME instead of its upstream value
commit 98a2692fe reverted broken code, but it also added new code, that
the reviewer failed to notice. This patch fixes it.
Bug-Url : https://bugzilla.redhat.com/show_bug.cgi?id=1168689
Change-Id: Idf7800e26d95e5da9d64b615de420389bbc7e52f
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M vdsm.spec.in
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/99/35799/1
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 7f878c2..358f15c 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -789,7 +789,7 @@
%{_bindir}/vdsm-tool configure --module sanlock --force >/dev/null
# update the vdsm "secret" password for libvirt
if [ -f /etc/pki/vdsm/keys/libvirt_password ]; then
- @SASLPASSWD2_PATH@ -p -a libvirt vdsm@ovirt < \
+ @SASLPASSWD2_PATH@ -p -a libvirt @SASL_USERNAME@ < \
/etc/pki/vdsm/keys/libvirt_password
fi
--
To view, visit http://gerrit.ovirt.org/35799
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idf7800e26d95e5da9d64b615de420389bbc7e52f
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>