Change in vdsm[master]: catch libvirt timeout and return an error on setVmTicket
by Roy Golan
Roy Golan has uploaded a new change for review.
Change subject: catch libvirt timeout and return an error on setVmTicket
......................................................................
catch libvirt timeout and return an error on setVmTicket
return an errCode instead of an exception libvirt timeout in setVmTicket
verb so upper layers could handle more easily.
Change-Id: Ibb48a1baff1e059f48f71f600f4bf5d9f40a7d11
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=878064
Signed-off-by: Roy Golan <rgolan(a)redhat.com>
---
M vdsm/API.py
M vdsm/define.py
2 files changed, 10 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/85/10285/1
diff --git a/vdsm/API.py b/vdsm/API.py
index 60e37a5..239b5ad 100644
--- a/vdsm/API.py
+++ b/vdsm/API.py
@@ -44,6 +44,7 @@
import ksm
import supervdsm
+from libvirtvm import TimeoutError
# default message for system shutdown, will be displayed in guest
USER_SHUTDOWN_MESSAGE = 'System going down'
@@ -570,9 +571,13 @@
"""
try:
v = self._cif.vmContainer[self._UUID]
+ return v.setTicket(password, ttl, existingConnAction, params)
except KeyError:
return errCode['noVM']
- return v.setTicket(password, ttl, existingConnAction, params)
+ except TimeoutError as tmo:
+ err = errCode['internalVdsmTimeout']
+ err['exception'] = tmo
+ return err
def shutdown(self, delay=None, message=None):
"""
diff --git a/vdsm/define.py b/vdsm/define.py
index 0313116..684e0a3 100644
--- a/vdsm/define.py
+++ b/vdsm/define.py
@@ -131,6 +131,10 @@
{'code': 99,
'message':
'Recovering from crash or Initializing'}},
+ 'internalVdsmTimeout': {'status':
+ {'code': 101,
+ 'message': 'Internal VDSM timeout'}
+ }
}
doneCode = {'code': 0, 'message': 'Done'}
--
To view, visit http://gerrit.ovirt.org/10285
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb48a1baff1e059f48f71f600f4bf5d9f40a7d11
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Roy Golan <rgolan(a)redhat.com>
11 years, 1 month
Change in vdsm[master]: Fix the broken PYTHONPATH
by shuming＠linux.vnet.ibm.com
Shu Ming has uploaded a new change for review.
Change subject: Fix the broken PYTHONPATH
......................................................................
Fix the broken PYTHONPATH
@builddir@/vdsm is a non-exsiting path
Change-Id: I438936a7eb98206426a15aa0a751a22060b9c895
Signed-off-by: Shu Ming <shuming(a)linux.vnet.ibm.com>
---
M tests/run_tests_local.sh.in
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/09/12509/1
diff --git a/tests/run_tests_local.sh.in b/tests/run_tests_local.sh.in
index 445cdd8..81e46b4 100644
--- a/tests/run_tests_local.sh.in
+++ b/tests/run_tests_local.sh.in
@@ -3,4 +3,4 @@
PYTHON_EXE="@PYTHON@"
fi
-PYTHONDONTWRITEBYTECODE=1 LC_ALL=C PYTHONPATH="@builddir@/vdsm:@top_srcdir@:@top_srcdir@/vdsm:@top_srcdir@/vdsm_cli:@top_srcdir@/vdsm_api:$PYTHONPATH" "$PYTHON_EXE" @top_srcdir(a)/tests/testrunner.py --local-modules $@
+PYTHONDONTWRITEBYTECODE=1 LC_ALL=C PYTHONPATH="@top_srcdir@:@top_srcdir@/vdsm:@top_srcdir@/vdsm_cli:@top_srcdir@/vdsm_api:$PYTHONPATH" "$PYTHON_EXE" @top_srcdir(a)/tests/testrunner.py --local-modules $@
--
To view, visit http://gerrit.ovirt.org/12509
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I438936a7eb98206426a15aa0a751a22060b9c895
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Shu Ming <shuming(a)linux.vnet.ibm.com>
11 years, 1 month
Change in vdsm[master]: build: add load_needed_modules.py.in to EXTRA_DIST
by Federico Simoncelli
Federico Simoncelli has uploaded a new change for review.
Change subject: build: add load_needed_modules.py.in to EXTRA_DIST
......................................................................
build: add load_needed_modules.py.in to EXTRA_DIST
Change-Id: Ie8e3fd1f8a6b3ce5c96dbb4cde5e61f3d2cba4d9
Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com>
---
M vdsm-tool/Makefile.am
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/07/12507/1
diff --git a/vdsm-tool/Makefile.am b/vdsm-tool/Makefile.am
index 348940e..c763b3f 100644
--- a/vdsm-tool/Makefile.am
+++ b/vdsm-tool/Makefile.am
@@ -23,6 +23,7 @@
vdsm-tool
EXTRA_DIST = \
+ load_needed_modules.py.in \
validate_ovirt_certs.py.in
dist_vdsmtool_DATA = \
--
To view, visit http://gerrit.ovirt.org/12507
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie8e3fd1f8a6b3ce5c96dbb4cde5e61f3d2cba4d9
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>
11 years, 1 month
Change in vdsm[master]: Ignore postZero flag when deleting an image on a fileSD.
by ewarszaw＠redhat.com
Eduardo has uploaded a new change for review.
Change subject: Ignore postZero flag when deleting an image on a fileSD.
......................................................................
Ignore postZero flag when deleting an image on a fileSD.
Ignoring parameters is very bad but we will continue to do that
because fixing the engine is very hard until the day of a real
fix.
Bug-url: https://bugzilla.redhat.com/show_bug.cgi?id=911209
Change-Id: Ief50d6174fd20e16f2fdf48a6cd512d20b9f407d
Signed-off-by: Eduardo <ewarszaw(a)redhat.com>
---
M vdsm/storage/fileSD.py
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/04/12404/1
diff --git a/vdsm/storage/fileSD.py b/vdsm/storage/fileSD.py
index fa837fc..12d90f7 100644
--- a/vdsm/storage/fileSD.py
+++ b/vdsm/storage/fileSD.py
@@ -364,9 +364,9 @@
raise se.ImageDeleteError("%s %s" % (imgUUID, str(e)))
def zeroImage(self, sdUUID, imgUUID, volsImgs):
- raise se.SourceImageActionError(
- imgUUID, sdUUID, "image %s on a fileSD %s should not be zeroed." %
- (imgUUID, sdUUID))
+ self.log.warning(imgUUID, sdUUID, "image %s on a fileSD %s will be "
+ "not zeroed." % (imgUUID, sdUUID))
+ self.deleteImage(sdUUID, imgUUID, volsImgs)
def getAllVolumes(self):
"""
--
To view, visit http://gerrit.ovirt.org/12404
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ief50d6174fd20e16f2fdf48a6cd512d20b9f407d
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo <ewarszaw(a)redhat.com>
11 years, 1 month
Change in vdsm[master]: init _svdsm to none
by ybronhei＠redhat.com
Yaniv Bronhaim has uploaded a new change for review.
Change subject: init _svdsm to none
......................................................................
init _svdsm to none
we use this variable before setting it in isRunning,
can cause troubles later.
Change-Id: Ibe8496cc4d90d88aff6090cbd9c55f1036f79f08
Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com>
---
M vdsm/supervdsm.py
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/50/10550/1
diff --git a/vdsm/supervdsm.py b/vdsm/supervdsm.py
index 44f9b73..0b27e42 100644
--- a/vdsm/supervdsm.py
+++ b/vdsm/supervdsm.py
@@ -93,6 +93,7 @@
def __init__(self):
self.proxyLock = threading.Lock()
self._firstLaunch = True
+ self._svdsm = None
# Declaration of public variables that keep files' names that svdsm
# uses. We need to be able to change these variables so that running
--
To view, visit http://gerrit.ovirt.org/10550
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibe8496cc4d90d88aff6090cbd9c55f1036f79f08
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>
11 years, 1 month
Change in vdsm[master]: vdsmd.init.in: Check vdsm.log owner and permission
by ybronhei＠redhat.com
Yaniv Bronhaim has posted comments on this change.
Change subject: vdsmd.init.in: Check vdsm.log owner and permission
......................................................................
Patch Set 1: I would prefer that you didn't submit this
(1 inline comment)
....................................................
File vdsm/vdsmd.init.in
Line 188:
Line 189: test_log_perm() {
Line 190: if [ -f "/var/log/vdsm/vdsm.log" ]; then
Line 191: if [ "`stat /var/log/vdsm/vdsm.log --print=%U:%G`" != "vdsm:kvm" ]; then
Line 192: log_failure_msg "$prog: ownership on /var/log/vdsm/vdsm.log incorrect"
This is not enough, selinux or acl can block you too. you should try echo to the file as vdsm user (http://gerrit.ovirt.org/#/c/9118/6/vdsm/vdsmd.init.in) , this is the best way to verify that vdsm user has the right permissions. you can follow the patch to see why it was not accepted.
We already do the same you do here after starting the vdsm process - (http://gerrit.ovirt.org/#/c/10194/3/vdsm/vdsm), and this is why you see the respawn followed by syslog report on it
Line 193: return 1
Line 194: fi
Line 195: if [ `stat /var/log/vdsm/vdsm.log --print=%a` -lt 600 ]; then
Line 196: log_failure_msg "$prog: permission on /var/log/vdsm/vdsm.log incorrect"
--
To view, visit http://gerrit.ovirt.org/12562
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I6c088e841ee91cc674e372affea61a0a0d6a2d27
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Tom Scofield <tscofield(a)gmail.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
11 years, 1 month
Change in vdsm[master]: hsm: always check validateNotSPM when disconnecting from a p...
by Federico Simoncelli
Federico Simoncelli has uploaded a new change for review.
Change subject: hsm: always check validateNotSPM when disconnecting from a pool
......................................................................
hsm: always check validateNotSPM when disconnecting from a pool
At the moment of this writing vdsm doesn't have a valid flow to
disconnect from a pool if the host is the SPM; the side effect
of calling _disconnectPool (e.g. a failed refreshStoragePool) is
that the SPM resource will remain locked.
If we want to introduce a change to allow the disconnection from
the pool even if the host is the SPM we should do it explicitly
with a specific patch that stops the SPM.
Change-Id: I066d018eb9e5d61422c5d1ab264208cd89b0f951
Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com>
---
M vdsm/storage/hsm.py
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/71/12271/1
diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py
index 23621f9..e760afc 100644
--- a/vdsm/storage/hsm.py
+++ b/vdsm/storage/hsm.py
@@ -1012,12 +1012,12 @@
self.validateNotSPM(spUUID)
vars.task.getExclusiveLock(STORAGE, spUUID)
- self.validateNotSPM(spUUID)
-
pool = self.getPool(spUUID)
+
return self._disconnectPool(pool, hostID, scsiKey, remove)
def _disconnectPool(self, pool, hostID, scsiKey, remove):
+ self.validateNotSPM(pool.spUUID)
res = pool.disconnect()
del self.pools[pool.spUUID]
return res
--
To view, visit http://gerrit.ovirt.org/12271
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I066d018eb9e5d61422c5d1ab264208cd89b0f951
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>
11 years, 1 month
Change in vdsm[master]: Override getLocalPathBase in GlusterFSConnection
by deepakcs＠linux.vnet.ibm.com
Deepak C Shetty has uploaded a new change for review.
Change subject: Override getLocalPathBase in GlusterFSConnection
......................................................................
Override getLocalPathBase in GlusterFSConnection
Override getLocalPathBase in GlusterFSConnection as a better
way to specify mount point for GlusterSD
Change-Id: I8d7d0980b0a863f8d47d61936b2d8fdab71a6a0c
Signed-off-by: Deepak C Shetty <deepakcs(a)linux.vnet.ibm.com>
---
M vdsm/storage/storageServer.py
1 file changed, 2 insertions(+), 5 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/27/12127/1
diff --git a/vdsm/storage/storageServer.py b/vdsm/storage/storageServer.py
index 94b56a9..d7fa8af 100644
--- a/vdsm/storage/storageServer.py
+++ b/vdsm/storage/storageServer.py
@@ -251,11 +251,8 @@
class GlusterFSConnection(MountConnection):
- # TODO: Can this be made more cleaner, by avoiding this override ?
- def _getLocalPath(self):
- return os.path.join(
- self.localPathBase, "glusterSD",
- self._remotePath.replace("_", "__").replace("/", "_"))
+ def getLocalPathBase(cls):
+ return os.path.join(MountConnection.getLocalPathBase(), "glusterSD")
class NFSConnection(object):
--
To view, visit http://gerrit.ovirt.org/12127
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8d7d0980b0a863f8d47d61936b2d8fdab71a6a0c
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Deepak C Shetty <deepakcs(a)linux.vnet.ibm.com>
11 years, 1 month
