[NEW PATCH] BZ#731698 - Fix syntax error (via gerrit-bot)
by Yotam Oron
New patch submitted by Yotam Oron (yoron(a)redhat.com)
You can review this change at: http://gerrit.usersys.redhat.com/906
commit f41595a7216e4134d5b585f977f99e25de14a625
Author: Yotam Oron <yoron(a)redhat.com>
Date: Wed Sep 7 14:24:59 2011 +0300
BZ#731698 - Fix syntax error
Change-Id: I396cf6d06d2d2c31ff031d41b66bb582a5542c1f
diff --git a/vds_bootstrap/vds_bootstrap.py b/vds_bootstrap/vds_bootstrap.py
index 1f68e8e..3f8423c 100755
--- a/vds_bootstrap/vds_bootstrap.py
+++ b/vds_bootstrap/vds_bootstrap.py
@@ -577,7 +577,7 @@ gpgcheck=0
vdcUrl = "http://%s:%s" % (
vdcName, str(vdcPort) if vdcPort else "80")
try:
- if not deployUtil.waitRouteRestore(60, vdcUrl)
+ if not deployUtil.waitRouteRestore(60, vdcUrl):
fReturn = False
self.message = "No route to %s. Check switch/router " \
"settings and try registering again." % vdcName
12 years, 7 months
[NEW PATCH] BZ#732914 Check libvirt connection on startup (via gerrit-bot)
by Federico Simoncelli
New patch submitted by Federico Simoncelli (fsimonce(a)redhat.com)
You can review this change at: http://gerrit.usersys.redhat.com/896
commit dc34ed11fe964fe2cdcc89e4df7f7f96cb639332
Author: Federico Simoncelli <fsimonce(a)redhat.com>
Date: Mon Sep 5 16:25:53 2011 +0000
BZ#732914 Check libvirt connection on startup
Change-Id: I913acefd3d41bc34e831783687f287d92c7aa282
diff --git a/vdsm/clientIF.py b/vdsm/clientIF.py
index c5744e1..bb52ecb 100644
--- a/vdsm/clientIF.py
+++ b/vdsm/clientIF.py
@@ -112,6 +112,7 @@ class clientIF:
self.serverPort = config.get('addresses', 'management_port')
self.serverIP = self._getServerIP()
self.server = self._createXMLRPCServer()
+ self.libvirt = libvirtconnection.get(self)
self._initIRS()
try:
self.vmContainer = {}
@@ -976,9 +977,8 @@ class clientIF:
"""
Return a list of vdsm created VM's.
"""
- conn = libvirtconnection.get(self)
- domIds = conn.listDomainsID()
- vms = [conn.lookupByID(domId) for domId in domIds]
+ domIds = self.libvirt.listDomainsID()
+ vms = [self.libvirt.lookupByID(domId) for domId in domIds]
return [vm for vm in vms if self.isVDSMVm(vm)]
def _recoverVm(self, vmid):
12 years, 7 months
[NEW PATCH] BZ#732914 Default signals handlers in processPool (via gerrit-bot)
by Federico Simoncelli
New patch submitted by Federico Simoncelli (fsimonce(a)redhat.com)
You can review this change at: http://gerrit.usersys.redhat.com/905
commit 81e0a2e0418b927f9ff492f76fd68f964d285ceb
Author: Federico Simoncelli <fsimonce(a)redhat.com>
Date: Wed Sep 7 09:12:13 2011 +0000
BZ#732914 Default signals handlers in processPool
Change-Id: I493684e3b1159277e3ca2d378d985360c408dc50
diff --git a/vdsm/storage/processPool.py b/vdsm/storage/processPool.py
index 2a2d364..07183d8 100644
--- a/vdsm/storage/processPool.py
+++ b/vdsm/storage/processPool.py
@@ -156,6 +156,11 @@ class Helper(object):
def _helperMainLoop(pipe, lifeLine, parentLifelineFD):
os.close(parentLifelineFD)
+ # Disabling signal handlers that could deadlock on prepareForShutdown
+ # in the children.
+ signal.signal(signal.SIGTERM, signal.SIG_DFL)
+ signal.signal(signal.SIGUSR1, signal.SIG_DFL)
+
# Removing all the handlers from the loggers. This avoid a deadlock on
# the logging locks. Multi-process and multi-threading don't mix well.
# - BZ#732652: https://bugzilla.redhat.com/show_bug.cgi?id=732652
12 years, 7 months
[NEW PATCH] BZ#728958 Don't check read delay when domain was not produced (via gerrit-bot)
by smizrahi@redhat.com
New patch submitted by Saggi Mizrahi (smizrahi(a)redhat.com)
You can review this change at: http://gerrit.usersys.redhat.com/801
commit 3649330e9f69d7dcc89c7660c2d876b30acd0749
Author: Saggi Mizrahi <smizrahi(a)redhat.com>
Date: Mon Aug 8 16:54:11 2011 +0300
BZ#728958 Don't check read delay when domain was not produced
Change-Id: Idb9a0d62299136cd8011f0e550373900b04ec3af
diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py
index 4df9efc..385d860 100644
--- a/vdsm/storage/sp.py
+++ b/vdsm/storage/sp.py
@@ -104,6 +104,12 @@ class StatsThread(threading.Thread):
delay = 0
try:
+ # If we couldn't retrieve the domain object there is something
+ # wrong with the domain. No need to log because is was logged
+ # when the produce() failed
+ if self._domain is None:
+ continue
+
# This is handled seperatly because in case of this kind
# of failure we don't want to print stack trace
delay = self._domain.getReadDelay()
12 years, 7 months
[NEW PATCH] BZ#733909 - double check spm id before claiming being it (via gerrit-bot)
by smizrahi@redhat.com
New patch submitted by Saggi Mizrahi (smizrahi(a)redhat.com)
You can review this change at: http://gerrit.usersys.redhat.com/899
commit 229e124b39d686281d3ec78e2c26935ab98555f1
Author: Saggi Mizrahi <smizrahi(a)redhat.com>
Date: Mon Sep 5 18:21:19 2011 +0300
BZ#733909 - double check spm id before claiming being it
Change-Id: Id73525ba4c75328be9f872390b50cae02d58a165
diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py
index 014da1e..2c5b5ec 100644
--- a/vdsm/storage/sp.py
+++ b/vdsm/storage/sp.py
@@ -989,6 +989,15 @@ class StoragePool:
def getVersion(self):
return self.getMasterDomain().getVersion()
+ def getSpmId(self):
+ spmid = self.getMetaParam(PMDK_SPM_ID)
+ if spmid != self.id:
+ return spmid
+
+ # If we claim to be the SPM we have to be really sure we are
+ self.invalidateMetadata()
+ return self.getMetaParam(PMDK_SPM_ID)
+
def getInfo(self):
"""
Get storage pool info.
@@ -1015,8 +1024,8 @@ class StoragePool:
info['type'] = msdInfo['type']
info['domains'] = domainListEncoder(self.getDomains())
info['name'] = self.getDescription()
+ info['spm_id'] = self.getSpmId()
info['lver'] = self.getMetaParam(PMDK_LVER)
- info['spm_id'] = self.getMetaParam(PMDK_SPM_ID)
info['master_uuid'] = msdInfo['uuid']
info['master_ver'] = self.getMasterVersion()
info['version'] = str(self.getVersion())
diff --git a/vdsm/storage/spm.py b/vdsm/storage/spm.py
index ae55e44..8a2b249 100644
--- a/vdsm/storage/spm.py
+++ b/vdsm/storage/spm.py
@@ -719,8 +719,13 @@ class SPM:
"""
pool = hsm.HSM.getPool(spUUID)
try:
+ #If this is the SPM no need to double check
+ if self.spmRole == SPM_FREE:
+ spmId = pool.getSpmId()
+ else:
+ spmId = pool.getMetaParam(sp.PMDK_SPM_ID)
+
lver = pool.getMetaParam(sp.PMDK_LVER)
- spmId = pool.getMetaParam(sp.PMDK_SPM_ID)
except se.LogicalVolumeRefreshError:
# This happens when we cannot read the MD LV
raise se.CannotRetrieveSpmStatus()
12 years, 7 months