[NEW PATCH] BZ#731598 Use the correct port in waitRouteRestore (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/830
commit 74eb4246985a3466eff012ae5f899b4eb4d8f759
Author: Federico Simoncelli <fsimonce(a)redhat.com>
Date: Thu Aug 18 12:29:59 2011 +0000
BZ#731598 Use the correct port in waitRouteRestore
Change-Id: Iaef8d5305a6c4eeab53a622a7693261e9b9cb8e1
diff --git a/vds_bootstrap/vds_bootstrap.py b/vds_bootstrap/vds_bootstrap.py
index 7929f36..f00cca0 100755
--- a/vds_bootstrap/vds_bootstrap.py
+++ b/vds_bootstrap/vds_bootstrap.py
@@ -552,15 +552,17 @@ gpgcheck=0
self._xmlOutput('CreateConf', self.status, None, None, self.message)
return self.rc
- def _addNetwork(self, vdcName):
+ def _addNetwork(self, vdcName, vdcPort):
fReturn = True
#add rhevm bridge
try:
fReturn = deployUtil.makeBridge(vdcName, VDSM_DIR)
if fReturn: #save current config by removing the undo files:
+ vdcUrl = "http://%s:%s" % (
+ vdcName, str(vdcPort) if vdcPort else "80")
try:
- if not deployUtil.waitRouteRestore(60, vdcName):
+ if not deployUtil.waitRouteRestore(60, vdcUrl)
fReturn = False
self.message = "No route to VDC. Check switch/router settings and try registration again"
logging.error(self.message)
@@ -604,7 +606,7 @@ gpgcheck=0
logging.error(self.message)
#Do not set rc to allow changes from rhev-m.
else:
- self._addNetwork(url)
+ self._addNetwork(url, port)
self._xmlOutput('SetNetworking', self.status, None, None, self.message)
return self.rc
12 years, 7 months
[NEW PATCH] BZ#732652 Avoid logging in the processPool Helper (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/887
commit ae8a9e17f4ccf35ef3a04f2460b906ead97b0e96
Author: Federico Simoncelli <fsimonce(a)redhat.com>
Date: Thu Sep 1 09:39:04 2011 +0000
BZ#732652 Avoid logging in the processPool Helper
Logging can cause a deadlock in a multi-threaded multi-process
environment therefore closing the logging file descriptors is
not enough we should also remove all the handlers.
Reference: http://bugs.python.org/issue6721
Change-Id: Ic70c2b390db23b48f96ba677054039d2773960ae
diff --git a/vdsm/storage/processPool.py b/vdsm/storage/processPool.py
index fc843c4..49c8d5f 100644
--- a/vdsm/storage/processPool.py
+++ b/vdsm/storage/processPool.py
@@ -151,6 +151,13 @@ def _helperMainLoop(pipe, lifeLine, parentLifelineFD):
except OSError:
pass # Nothing we can do
+ # 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
+ # - I6721: http://bugs.python.org/issue6721
+ for log in logging.Logger.manager.loggerDict.values():
+ if hasattr(log, 'handlers'): del log.handlers[:]
+
poller = select.poll()
poller.register(lifeLine, 0) # Only SIGERR\SIGHUP
poller.register(pipe.fileno(), select.EPOLLIN | select.EPOLLPRI)
12 years, 7 months
[NEW PATCH] Related BZ#729249: bootstrap: no need to install DEVEL_PACKAGES (via gerrit-bot)
by Dan Kenigsberg
New patch submitted by Dan Kenigsberg (danken(a)redhat.com)
You can review this change at: http://gerrit.usersys.redhat.com/828
commit 4a9686af7d79228c63223b5617fda74ac87fc8fa
Author: Dan Kenigsberg <danken(a)redhat.com>
Date: Wed Aug 17 22:24:37 2011 +0300
Related BZ#729249: bootstrap: no need to install DEVEL_PACKAGES
Bootstrap takes too long. Some of this time is wasted on installing
pacakges we do not really need any more.
Change-Id: I1394b513fd401fb3f3ef1a750176b51bc344ab08
diff --git a/vds_bootstrap/vds_bootstrap.py b/vds_bootstrap/vds_bootstrap.py
index 6a06852..2d086ef 100755
--- a/vds_bootstrap/vds_bootstrap.py
+++ b/vds_bootstrap/vds_bootstrap.py
@@ -77,8 +77,7 @@ REQ_PACK = ('SDL.x86_64','bridge-utils.x86_64','mesa-libGLU.x86_64',
'openssl.x86_64','m2crypto.x86_64','rsync.x86_64')
if rhel6based:
- DEVEL_PACK = ('gdb','tcpdump','strace','ltrace','sysstat','ntp',
- 'vim-common','vim-enhanced', 'systemtap-runtime')
+ DEVEL_PACK = ()
VDS_PACK = ('qemu-kvm', 'qemu-kvm-tools', VDSM_NAME, VDSM_NAME+'-cli',
'libjpeg', 'spice-server', 'pixman',
'seabios', 'qemu-img', 'fence-agents')
12 years, 7 months
[NEW PATCH] BZ#735932 vds_bootstrap: do not download and do not use redhat-lsb (via gerrit-bot)
by Dan Kenigsberg
New patch submitted by Dan Kenigsberg (danken(a)redhat.com)
You can review this change at: http://gerrit.usersys.redhat.com/898
commit d8d5b7c7b0ff150d96bae8f54b4691d95f4dadfb
Author: Dan Kenigsberg <danken(a)redhat.com>
Date: Tue Sep 6 11:24:40 2011 +0300
BZ#735932 vds_bootstrap: do not download and do not use redhat-lsb
redhat-lsb is no longer installed on RHEL by default, and comes with a
heavy dependency list. Using it lengthen installation time needlessly.
Change-Id: Ia6f0bb85b126a4471dfd63e46bebad229c28a4f9
diff --git a/vdsm_reg/deployUtil.py.in b/vdsm_reg/deployUtil.py.in
index f6bec9b..3b1a4f8 100644
--- a/vdsm_reg/deployUtil.py.in
+++ b/vdsm_reg/deployUtil.py.in
@@ -37,6 +37,7 @@ import httplib
import glob
import imp
from optparse import OptionParser
+from itertools import dropwhile, islice
try:
from ovirtnode import ovirtfunctions
@@ -61,7 +62,6 @@ EX_ECHO = '@ECHO_PATH@'
EX_GRUBBY = '@GRUBBY_PATH@'
EX_HWCLOCK = '@HWCLOCK_PATH@'
EX_IFCONFIG = '@IFCONFIG_PATH@'
-EX_LSB_RELEASE = '@LSB_RELEASE_PATH@'
EX_OPENSSL = '@OPENSSL_PATH@'
EX_REBOOT = '@REBOOT_PATH@'
EX_RPM = '@RPM_PATH@'
@@ -350,18 +350,25 @@ def isOvirt():
def getOSVersion():
"""
- Return the OS' release from accordong to LSB specification.
+ Return the OS release, similarly to `lsb_release -rs`
+
+ Return "Unknown OS" on any failure.
"""
- strReturn = "Unknown OS"
- if os.path.exists(EX_LSB_RELEASE):
- out, err, rc = _logExec([EX_LSB_RELEASE, "-rs"])
+ s = ''
+ for f in ('/etc/rhev-hypervisor-release', '/etc/redhat-release',
+ '/etc/fedora-release'):
try:
- strReturn = out.replace("\n","")
- except:
- strReturn = "Unknown OS"
+ s = file('/etc/redhat-release').read()
+ except OSError:
+ pass
- return strReturn
+ try:
+ return islice(dropwhile(lambda x: x!='release', s.split()),
+ 1, 2).next()
+ except:
+ logging.error('failed to parse os release from `%s`.', exc_info=True)
+ return "Unknown OS"
def getKernelVersion():
"""
12 years, 7 months
[NEW PATCH] BZ#602338 - Reset vdsm-reg conf file on certificate fingerprint verification failure (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/890
commit c4ce3d953e16e7ff069602033a0628f1460c2268
Author: Yotam Oron <yoron(a)redhat.com>
Date: Thu Sep 1 19:02:46 2011 +0300
BZ#602338 - Reset vdsm-reg conf file on certificate fingerprint verification failure
When the certificate verification failed, need to reset the vdsm-reg
conf file so that the ovirt node will not register
Change-Id: I394007e7794dd901356c7f9b582c682e6bfcf325
diff --git a/vdsm_reg/vdsm-config b/vdsm_reg/vdsm-config
index fec26df..313e138 100755
--- a/vdsm_reg/vdsm-config
+++ b/vdsm_reg/vdsm-config
@@ -87,6 +87,7 @@ set_addresses() {
ret_val=$?
echo "$res" >> $LOG 2>&1
if [ ! $ret_val -eq 0 ];then
+ echo "# Failed Management Server Certificate Authentication Verification" > /etc/vdsm-reg/vdsm-reg.conf
echo "Rebooting ... " >> $LOG 2>&1
/sbin/reboot
fi
12 years, 7 months
Change in vdsm[master]: Synchronize libvirtconnection.get()
by Igor Lvovsky
Igor Lvovsky has posted comments on this change.
Change subject: Synchronize libvirtconnection.get()
......................................................................
Patch Set 1: Looks good to me, but someone else must approve
--
To view, visit http://gerrit.usersys.redhat.com/904
To unsubscribe, visit http://gerrit.usersys.redhat.com/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I8d682d8cb1945f7d01008de84b20bf7893d68a1f
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Igor Lvovsky <ilvovsky(a)redhat.com>
12 years, 7 months