November 2012 - vdsm-patches - Fedora mailing-lists

Change in vdsm[master]: Change in error message format
by barumuga＠redhat.com 06 Nov '12

06 Nov '12

Hello Ayal Baron, Timothy Asir, Saggi Mizrahi, Federico Simoncelli, Dan Kenigsberg, I'd like you to do a code review. Please visit http://gerrit.ovirt.org/8689 to review the following change. Change subject: Change in error message format ...................................................................... Change in error message format out, err or rc is added to error message only if its non-empty. Change-Id: Idb948bb212ae866600aabad2190ff52f2cbc05bf Signed-off-by: Bala.FA <barumuga(a)redhat.com> --- M vdsm/gluster/exception.py 1 file changed, 14 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/89/8689/1 diff --git a/vdsm/gluster/exception.py b/vdsm/gluster/exception.py index 6d94ae3..98f6c33 100644 --- a/vdsm/gluster/exception.py +++ b/vdsm/gluster/exception.py @@ -46,12 +46,20 @@ self.err = err def __str__(self): - return '%s\nerror: %s%s%sreturn code: %s' % \ - (self.message, - ('\n'.join(self.out) + '\n') if self.out else '', - ('\n'.join(self.err) + '\n') if self.err else '', - '\n' if not (self.out or self.err) else '', - self.rc) + o = '\n'.join(self.out) + e = '\n'.join(self.err) + if o and e: + m = o + '\n' + e + else: + m = o or e + + s = self.message + if m: + s += '\nerror: ' + m + if self.rc: + s += '\nreturn code: %s' % self.rc + + return s def response(self): return {'status': {'code': self.code, 'message': str(self), -- To view, visit http://gerrit.ovirt.org/8689 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idb948bb212ae866600aabad2190ff52f2cbc05bf Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Bala.FA <barumuga(a)redhat.com> Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com> Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com> Gerrit-Reviewer: Timothy Asir <tjeyasin(a)redhat.com>

4 7

Change in vdsm[master]: Refresh mounts in same thread with the initialization of hsm
by ybronhei＠redhat.com 06 Nov '12

06 Nov '12

Yaniv Bronhaim has uploaded a new change for review. Change subject: Refresh mounts in same thread with the initialization of hsm ...................................................................... Refresh mounts in same thread with the initialization of hsm Using external thread for refreshStorage can cause a race in working on mount during the refresh process. Verifing links and recovering tasks should be done before enabling creation of new procedures. Bug-Id: https://bugzilla.redhat.com/show_bug.cgi?id=872270i Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com> Change-Id: If5bd7bd588f68c9eaaccbf9004ad238d0e49c9c3 --- M vdsm/storage/hsm.py 1 file changed, 9 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/05/9005/1 diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py index 0c9160c..682a1bd 100644 --- a/vdsm/storage/hsm.py +++ b/vdsm/storage/hsm.py @@ -345,10 +345,12 @@ self.log.warn("Failed to clean Storage Repository.", exc_info=True) fileUtils.createdir(self.tasksDir) - # TBD: Should this be run in connectStoragePool? Should tasksDir exist under pool link as well (for hsm tasks) + # TBD: Should this be run in connectStoragePool? + # Should tasksDir exist under pool link as well (for hsm tasks) self.taskMng.loadDumpedTasks(self.tasksDir) self.taskMng.recoverDumpedTasks() + def connectPools(): _poolsTmpDir = config.get('irs', 'pools_data_dir') dirList = os.listdir(_poolsTmpDir) for spUUID in dirList: @@ -361,7 +363,12 @@ except Exception: self.log.error("Unexpected error", exc_info=True) - threading.Thread(target=storageRefresh).start() + # This part should be in same thread to prevent race on mounted path, + # otherwise, storageRefresh can unlink path that is used by another + # thread that was initiated in the same time and tried to use the + # same link. + storageRefresh() + connectPools() def _hsmSchedule(self, name, func, *args): self.taskMng.scheduleJob("hsm", self.tasksDir, vars.task, name, func, *args) -- To view, visit http://gerrit.ovirt.org/9005 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If5bd7bd588f68c9eaaccbf9004ad238d0e49c9c3 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>

3 7

Change in vdsm[master]: Change None equasion in storageServer
by smizrahi＠redhat.com 05 Nov '12

05 Nov '12

Saggi Mizrahi has uploaded a new change for review. Change subject: Change None equasion in storageServer ...................................................................... Change None equasion in storageServer Change-Id: Ic1e2e03c6fd662cd09ace713a88f0b2f61da159e Signed-off-by: Saggi Mizrahi <smizrahi(a)redhat.com> --- M vdsm/storage/storageServer.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/54/8354/1 diff --git a/vdsm/storage/storageServer.py b/vdsm/storage/storageServer.py index 269b8eb..af16bd4 100644 --- a/vdsm/storage/storageServer.py +++ b/vdsm/storage/storageServer.py @@ -323,7 +323,7 @@ if self._target.portal.port != portal.port: return False - if self._target.tpgt != None and self._target.tpgt != target.tpgt: + if self._target.tpgt is not None and self._target.tpgt != target.tpgt: return False if self._target.iqn != target.iqn: -- To view, visit http://gerrit.ovirt.org/8354 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic1e2e03c6fd662cd09ace713a88f0b2f61da159e Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com>

3 5

Change in vdsm[master]: Set up better threading in tests to make sure it happens cor...
by smizrahi＠redhat.com 05 Nov '12

05 Nov '12

Saggi Mizrahi has uploaded a new change for review. Change subject: Set up better threading in tests to make sure it happens correctly ...................................................................... Set up better threading in tests to make sure it happens correctly Change-Id: Ibc1c7fca8e59feb4f772b2aa5e45e3d6d00b8531 Signed-off-by: Saggi Mizrahi <smizrahi(a)redhat.com> --- M tests/testrunner.py 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/93/8793/1 diff --git a/tests/testrunner.py b/tests/testrunner.py index cdbc9d3..3fc2512 100644 --- a/tests/testrunner.py +++ b/tests/testrunner.py @@ -27,6 +27,14 @@ from nose import core from nose import result +# Monkey patch better threading +import threading +import betterThreading + +# Make pyflakes happy +threading.__name__ +betterThreading.__name__ + from testValidation import SlowTestsPlugin PERMUTATION_ATTR = "_permutations_" -- To view, visit http://gerrit.ovirt.org/8793 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibc1c7fca8e59feb4f772b2aa5e45e3d6d00b8531 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com>

3 8

Change in vdsm[master]: [WIP] Try and fix failing test
by smizrahi＠redhat.com 05 Nov '12

05 Nov '12

Saggi Mizrahi has uploaded a new change for review. Change subject: [WIP] Try and fix failing test ...................................................................... [WIP] Try and fix failing test Change-Id: Id74dcc975d48ba6d7ee18c7f4154523f08e64245 Signed-off-by: Saggi Mizrahi <smizrahi(a)redhat.com> --- M tests/miscTests.py 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/39/9039/1 diff --git a/tests/miscTests.py b/tests/miscTests.py index f9110b8..b3e3798 100644 --- a/tests/miscTests.py +++ b/tests/miscTests.py @@ -75,10 +75,10 @@ @brokentest('Test sometimes fail, when misc.getCmdArgs() returns ' 'the empty tuple right after process creation') def test(self): - args = ("sleep", "4") + args = ["sleep", "4"] sproc = misc.execCmd(args, sync=False, sudo=False) - self.assertEquals(misc.getCmdArgs(sproc.pid), args) - sproc.kill() + self.assertEqauls(sproc.poll(), None) + self.assertEquals(misc.getCmdArgs(sproc.pid), tuple(args)) sproc.wait() -- To view, visit http://gerrit.ovirt.org/9039 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id74dcc975d48ba6d7ee18c7f4154523f08e64245 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com>

2 4

Change in vdsm[master]: pep8 now also check visual aligment
by smizrahi＠redhat.com 05 Nov '12

05 Nov '12

Saggi Mizrahi has uploaded a new change for review. Change subject: pep8 now also check visual aligment ...................................................................... pep8 now also check visual aligment Change-Id: Ia27f420e173eec667a8f81e8bdd13a4bd98bf200 Signed-off-by: Saggi Mizrahi <smizrahi(a)redhat.com> --- M tests/miscTests.py M tests/testrunner.py 2 files changed, 30 insertions(+), 28 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/38/9038/1 diff --git a/tests/miscTests.py b/tests/miscTests.py index de33973..f9110b8 100644 --- a/tests/miscTests.py +++ b/tests/miscTests.py @@ -49,7 +49,7 @@ def watchCmd(cmd, stop, cwd=None, data=None, recoveryCallback=None): ret, out, err = misc.watchCmd(cmd, stop, cwd=cwd, data=data, - recoveryCallback=recoveryCallback) + recoveryCallback=recoveryCallback) return ret, out, err @@ -59,12 +59,12 @@ sleepProcs = [] for i in range(3): sleepProcs.append(misc.execCmd(["sleep", "3"], sync=False, - sudo=False)) + sudo=False)) pids = misc.pgrep("sleep") for proc in sleepProcs: self.assertTrue(proc.pid in pids, "pid %d was not located by pgrep" - % proc.pid) + % proc.pid) for proc in sleepProcs: proc.kill() @@ -246,7 +246,7 @@ Tests that the method fails correctly when given a non existing dir. """ self.assertRaises(OSError, misc.rotateFiles, "/I/DONT/EXIST", "prefix", - 2, persist=persist) + 2, persist=persist) def testEmptyDir(self, persist=False): """ @@ -493,7 +493,7 @@ #Copy self.assertRaises(misc.se.MiscBlockWriteException, ddWatchCopy, - srcPath, "/tmp/tmp", None, 100) + srcPath, "/tmp/tmp", None, 100) def testStop(self): """ @@ -587,21 +587,21 @@ Test that validator detects when a non HEX char is in the input. """ self.assertRaises(misc.se.InvalidParameterException, misc.validateUUID, - "Dc08ff668-4072-4191-9fbb-f1c8f2daz333") + "Dc08ff668-4072-4191-9fbb-f1c8f2daz333") def testInvalidInputInteger(self): """ Test that validator detects when an integer is in the input. """ self.assertRaises(misc.se.InvalidParameterException, misc.validateUUID, - 23) + 23) def testInvalidInputUTF(self): """ Test that validator detects encoded utf-8 is in the input """ self.assertRaises(misc.se.InvalidParameterException, misc.validateUUID, - u'\xe4\xbd\xa0\xe5\xa5\xbd') + u'\xe4\xbd\xa0\xe5\xa5\xbd') def testWrongLength(self): """ @@ -609,13 +609,13 @@ length """ self.assertRaises(misc.se.InvalidParameterException, misc.validateUUID, - "Dc08ff668-4072-4191-9fbb-f1c8f2daa33") + "Dc08ff668-4072-4191-9fbb-f1c8f2daa33") self.assertRaises(misc.se.InvalidParameterException, misc.validateUUID, - "Dc08ff668-4072-4191-9fb-f1c8f2daa333") + "Dc08ff668-4072-4191-9fb-f1c8f2daa333") self.assertRaises(misc.se.InvalidParameterException, misc.validateUUID, - "Dc08ff68-4072-4191-9fbb-f1c8f2daa333") + "Dc08ff68-4072-4191-9fbb-f1c8f2daa333") self.assertRaises(misc.se.InvalidParameterException, misc.validateUUID, - "Dc08ff668-4072-4191-9fbb-f1c8f2daa3313") + "Dc08ff668-4072-4191-9fbb-f1c8f2daa3313") class UuidPack(TestCaseBase): @@ -681,7 +681,7 @@ count = 802 with tempfile.NamedTemporaryFile() as f: cmd = [EXT_DD, "bs=1", "if=/dev/urandom", 'of=%s' % f.name, - 'count=%d' % count] + 'count=%d' % count] rc, out, err = misc.execCmd(cmd, sudo=False) self.assertTrue(misc.validateDDBytes(err, count)) @@ -693,7 +693,7 @@ count = 802 with tempfile.NamedTemporaryFile() as f: cmd = [EXT_DD, "bs=1", "if=/dev/urandom", 'of=%s' % f.name, - 'count=%d' % count] + 'count=%d' % count] rc, out, err = misc.execCmd(cmd, sudo=False) self.assertFalse(misc.validateDDBytes(err, count + 1)) @@ -703,9 +703,11 @@ Test that the method handles wired input. """ self.assertRaises(misc.se.InvalidParameterException, - misc.validateDDBytes, ["I AM", "PRETENDING TO", "BE DD"], "BE") + misc.validateDDBytes, + ["I AM", "PRETENDING TO", "BE DD"], "BE") self.assertRaises(misc.se.InvalidParameterException, - misc.validateDDBytes, ["I AM", "PRETENDING TO", "BE DD"], 32) + misc.validateDDBytes, + ["I AM", "PRETENDING TO", "BE DD"], 32) class ReadBlock(TestCaseBase): @@ -761,7 +763,7 @@ """ offset = 513 self.assertRaises(misc.se.MiscBlockReadException, misc.readblock, - "/dev/urandom", offset, 512) + "/dev/urandom", offset, 512) def testInvalidSize(self): """ @@ -769,7 +771,7 @@ """ size = 513 self.assertRaises(misc.se.MiscBlockReadException, misc.readblock, - "/dev/urandom", 512, size) + "/dev/urandom", 512, size) def testReadingMoreTheFileSize(self): """ @@ -786,7 +788,7 @@ path = self._createTempFile(offset + size - 100, writeData) self.assertRaises(misc.se.MiscBlockReadIncomplete, misc.readblock, - path, offset, size) + path, offset, size) os.unlink(path) @@ -950,7 +952,7 @@ # (C) Terry Pratchet - Small Gods code = "import sys; sys.stderr.write('%s')" % line ret, stdout, stderr = watchCmd([EXT_PYTHON, "-c", code], - lambda: False) + lambda: False) self.assertEquals(stderr[0], line) def testLeakFd(self): @@ -999,7 +1001,7 @@ # (C) Fox - The X Files code = "import sys; sys.stderr.write('%s')" % line ret, stdout, stderr = misc.execCmd([EXT_PYTHON, "-c", code], - sudo=False) + sudo=False) self.assertEquals(stderr[0], line) def testSudo(self): diff --git a/tests/testrunner.py b/tests/testrunner.py index cdbc9d3..51b5748 100644 --- a/tests/testrunner.py +++ b/tests/testrunner.py @@ -130,7 +130,7 @@ storage, label, isfail = self.errorClasses[SkipTest] storage.append((test, reason)) self._writeResult(test, 'SKIP : %s' % reason, TermColor.blue, 'S', - True) + True) def addError(self, test, err): stream = getattr(self, 'stream', None) @@ -197,10 +197,10 @@ testdir = os.path.dirname(os.path.abspath(__file__)) conf = config.Config(stream=stream, - env=os.environ, - verbosity=verbosity, - workingDir=testdir, - plugins=core.DefaultPluginManager()) + env=os.environ, + verbosity=verbosity, + workingDir=testdir, + plugins=core.DefaultPluginManager()) conf.plugins.addPlugin(SlowTestsPlugin()) runner = VdsmTestRunner(stream=conf.stream, @@ -242,8 +242,8 @@ if __name__ == '__main__': if "--help" in sys.argv: print("testrunner options:\n" - "--local-modules use vdsm modules from source tree, " - "instead of installed ones.\n") + "--local-modules use vdsm modules from source tree, " + "instead of installed ones.\n") if findRemove(sys.argv, "--local-modules"): hackVdsmModule() run() -- To view, visit http://gerrit.ovirt.org/9038 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia27f420e173eec667a8f81e8bdd13a4bd98bf200 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com>

2 3

Change in vdsm[master]: itmap unit tests
by ybronhei＠redhat.com 04 Nov '12

04 Nov '12

Yaniv Bronhaim has uploaded a new change for review. Change subject: itmap unit tests ...................................................................... itmap unit tests Change-Id: I26e258a035f49a8ecd57e992b9a68b9475a58839 Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com> --- M tests/miscTests.py 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/46/8746/1 diff --git a/tests/miscTests.py b/tests/miscTests.py index 6339986..ebaeffc 100644 --- a/tests/miscTests.py +++ b/tests/miscTests.py @@ -196,6 +196,23 @@ self.fail("tmap did not throw an exception") +class ITMap(TestCaseBase): + def testMoreArgsThanThreads(self): + def dummy(arg): + time.sleep(1) + return arg + data = [1, 2, 3, 4] + self.assertEquals(list(misc.itmap(dummy, data, 3)), data) + + def testMoreThreadsThanArgs(self): + data = [1, 2, 3] + self.assertEquals(list(misc.itmap(int, data, 80)), data) + + def testInvalidITMapParams(self): + data = 1 + self.assertRaises(Exception, misc.itmap(int, data, 0)) + + class RotateFiles(TestCaseBase): def testNonExistingDir(self, persist=False): """ -- To view, visit http://gerrit.ovirt.org/8746 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I26e258a035f49a8ecd57e992b9a68b9475a58839 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>

6 21

Change in vdsm[master]: fileVolume: make getVSize a real classmethod
by Federico Simoncelli 04 Nov '12

04 Nov '12

Federico Simoncelli has uploaded a new change for review. Change subject: fileVolume: make getVSize a real classmethod ...................................................................... fileVolume: make getVSize a real classmethod Until now fileVolume even if declared as classmethod it was actually relying on producing the object to obtain the required information. This patch makes it a real classmethod, which is particularly useful to be used also with an half-baked volume. Bug-Url: https://bugzilla.redhat.com/871811 Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com> Change-Id: I336d4e763da4ddc3c0dd8eacb68e84305995e6ab --- M vdsm/storage/fileVolume.py 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/95/8995/1 diff --git a/vdsm/storage/fileVolume.py b/vdsm/storage/fileVolume.py index f19fa26..e2f4e85 100644 --- a/vdsm/storage/fileVolume.py +++ b/vdsm/storage/fileVolume.py @@ -460,7 +460,11 @@ @classmethod def getVSize(cls, sdobj, imgUUID, volUUID, bs=512): - return sdobj.produceVolume(imgUUID, volUUID).getVolumeSize(bs) + imagePath = image.Image(sdobj._getRepoPath()).getImageDir( + sdobj.sdUUID, imgUUID) + volPath = os.path.join(imagePath, volUUID) + stSize = oop.getProcessPool(sdobj.sdUUID).os.stat(volPath).st_size + return int(stSize / bs) @classmethod def getVTrueSize(cls, sdobj, imgUUID, volUUID, bs=512): -- To view, visit http://gerrit.ovirt.org/8995 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I336d4e763da4ddc3c0dd8eacb68e84305995e6ab Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>

6 9

Change in vdsm[master]: Make sure during upgrade that lease files have correct permi...
by smizrahi＠redhat.com 03 Nov '12

03 Nov '12

Saggi Mizrahi has uploaded a new change for review. Change subject: Make sure during upgrade that lease files have correct permission ...................................................................... Make sure during upgrade that lease files have correct permission Change-Id: I6e0a19ae3ea5b256850a4ef557ac14c5a1f660ef Signed-off-by: Saggi Mizrahi <smizrahi(a)redhat.com> --- M vdsm/storage/fileSD.py M vdsm/storage/imageRepository/formatConverter.py 2 files changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/85/8985/1 diff --git a/vdsm/storage/fileSD.py b/vdsm/storage/fileSD.py index f92ed98..61c15e2 100644 --- a/vdsm/storage/fileSD.py +++ b/vdsm/storage/fileSD.py @@ -128,6 +128,16 @@ self.imageGarbageCollector() self._registerResourceNamespaces() + def verifyLeaseFilePermissions(self): + procPool = oop.getProcessPool(self.sdUUID) + for metaFile in (sd.LEASES, sd.IDS, sd.INBOX, sd.OUTBOX): + try: + fpath = os.path.join(self.getMDPath(), metaFile) + procPool.os.chmod(fpath, 0660) + except Exception, e: + raise se.StorageDomainMetadataCreationError( + "Lease permission change file '%s' failed: %s" % (metaFile, str(e))) + @classmethod def _prepareMetadata(cls, domPath, sdUUID, domainName, domClass, remotePath, storageType, version): diff --git a/vdsm/storage/imageRepository/formatConverter.py b/vdsm/storage/imageRepository/formatConverter.py index d118e87..19fd4ef 100644 --- a/vdsm/storage/imageRepository/formatConverter.py +++ b/vdsm/storage/imageRepository/formatConverter.py @@ -100,6 +100,10 @@ V2META_SECTORSIZE = 512 + if domain.getStorageType() in sd.FILE_DOMAIN_TYPES: + domain.verifyLeaseFilePermissions() + + def v3ResetMetaVolSize(vol): # BZ811880 Verifiying that the volume size is the same size advertised # by the metadata -- To view, visit http://gerrit.ovirt.org/8985 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6e0a19ae3ea5b256850a4ef557ac14c5a1f660ef Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com>

5 6

Change in vdsm[master]: Applied PEP-8 guideline on code
by Vinzenz Feenstra 03 Nov '12

03 Nov '12

Vinzenz Feenstra has uploaded a new change for review. Change subject: Applied PEP-8 guideline on code ...................................................................... Applied PEP-8 guideline on code Change-Id: I3b1ce77b01d848adb008d375decb2c214617ad2e Signed-off-by: Vinzenz Feenstra <vfeenstr(a)redhat.com> --- M vdsm/guestIF.py 1 file changed, 25 insertions(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/33/8933/1 diff --git a/vdsm/guestIF.py b/vdsm/guestIF.py index d51af14..a486f38 100644 --- a/vdsm/guestIF.py +++ b/vdsm/guestIF.py @@ -26,9 +26,9 @@ __RESTRICTED_CHARS = set(range(8 + 1)).union( set(range(0xB, 0xC + 1))).union( - set(range(0xE, 0x1F + 1))).union( - set(range(0x7F, 0x84 + 1))).union( - set(range(0x86, 0x9F + 1))) + set(range(0xE, 0x1F + 1))).union( + set(range(0x7F, 0x84 + 1))).union( + set(range(0x86, 0x9F + 1))) def _filterXmlChars(u): @@ -61,9 +61,15 @@ self._stopped = True self.guestStatus = None self.guestInfo = { - 'username': user, 'memUsage': 0, 'guestIPs': ips, - 'session': 'Unknown', 'appsList': [], 'disksUsage': [], - 'netIfaces': [], 'memoryStats': {}} + 'username': user, + 'memUsage': 0, + 'guestIPs': ips, + 'session': 'Unknown', + 'appsList': [], + 'disksUsage': [], + 'netIfaces': [], + 'memoryStats': {} + } self._agentTimestamp = 0 self._channelListener = channelListener if connect: @@ -72,8 +78,12 @@ except: self.log.error("Failed to prepare vmchannel", exc_info=True) else: - self._channelListener.register(self._sock_fd, self._connect, - self._onChannelRead, self._onChannelTimeout, self) + self._channelListener.register( + self._sock_fd, + self._connect, + self._onChannelRead, + self._onChannelTimeout, + self) def _prepare_socket(self): supervdsm.getProxy().prepareVmChannel(self._socketName) @@ -190,10 +200,13 @@ if self.isResponsive(): return self.guestInfo else: - return {'username': 'Unknown', - 'session': 'Unknown', 'memUsage': 0, - 'appsList': self.guestInfo['appsList'], - 'guestIPs': self.guestInfo['guestIPs']} + return { + 'username': 'Unknown', + 'session': 'Unknown', + 'memUsage': 0, + 'appsList': self.guestInfo['appsList'], + 'guestIPs': self.guestInfo['guestIPs'] + } def onReboot(self): self.guestStatus = 'RebootInProgress' -- To view, visit http://gerrit.ovirt.org/8933 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3b1ce77b01d848adb008d375decb2c214617ad2e Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Vinzenz Feenstra <vfeenstr(a)redhat.com>

5 10

Change in vdsm[master]: vdsm.spec: pyflakes/python-pep8 BuildRequirement
by Douglas Schilling Landgraf 02 Nov '12

02 Nov '12

Douglas Schilling Landgraf has uploaded a new change for review. Change subject: vdsm.spec: pyflakes/python-pep8 BuildRequirement ...................................................................... vdsm.spec: pyflakes/python-pep8 BuildRequirement pyflakes and python-pep8 are not default RHEL packages. This patch will move it for non rhel system requirements. Change-Id: Ieaf21db9542ae3c9e107a94f64e0e52c7a7e62c1 Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com> --- M vdsm.spec.in 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/40/8940/1 diff --git a/vdsm.spec.in b/vdsm.spec.in index 37f37a3..c117ee5 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -35,9 +35,7 @@ BuildRequires: python BuildRequires: python-devel -BuildRequires: pyflakes BuildRequires: python-nose -BuildRequires: python-pep8 # BuildRequires needed by the tests during the build BuildRequires: python-ethtool @@ -54,6 +52,8 @@ %endif %if !0%{?rhel} +BuildRequires: pyflakes +BuildRequires: python-pep8 BuildRequires: systemd-units %endif -- To view, visit http://gerrit.ovirt.org/8940 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieaf21db9542ae3c9e107a94f64e0e52c7a7e62c1 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com>

2 3

Change in vdsm[master]: configure.ac: pyflakes/python-pep8 reduce to warn
by Douglas Schilling Landgraf 02 Nov '12

02 Nov '12

Douglas Schilling Landgraf has uploaded a new change for review. Change subject: configure.ac: pyflakes/python-pep8 reduce to warn ...................................................................... configure.ac: pyflakes/python-pep8 reduce to warn Replace error message for warning message if build system doesn't contain pyflakes and python-pep8 packages installed. Change-Id: Ife89071bcbd0b2b4a50166080575f09e0048cec7 Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com> --- M configure.ac 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/39/8939/1 diff --git a/configure.ac b/configure.ac index 450f714..7cb12ef 100644 --- a/configure.ac +++ b/configure.ac @@ -100,13 +100,13 @@ # Checking for pyflakes AC_PATH_PROG([PYFLAKES], [pyflakes]) if test "x$PYFLAKES" = "x"; then - AC_MSG_ERROR([pyflakes not found, please install it.]) + AC_MSG_WARN([pyflakes not found]) fi # Checking for pep8 AC_PATH_PROG([PEP8], [pep8]) if test "x$PEP8" = "x"; then - AC_MSG_ERROR([python-pep8 not found, please install it.]) + AC_MSG_WARN([python-pep8 not found]) fi # Checking for python-devel -- To view, visit http://gerrit.ovirt.org/8939 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ife89071bcbd0b2b4a50166080575f09e0048cec7 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com>

2 3

Change in vdsm[master]: doh! fix the former commit
by Dan Kenigsberg 01 Nov '12

01 Nov '12

Dan Kenigsberg has uploaded a new change for review. Change subject: doh! fix the former commit ...................................................................... doh! fix the former commit I've decorated the class instead of the test method :-( Change-Id: I5d99275ee7cf04e8464f4718c765bca901178e8c Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M tests/miscTests.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/84/8984/1 diff --git a/tests/miscTests.py b/tests/miscTests.py index 93a20cd..eeb14d4 100644 --- a/tests/miscTests.py +++ b/tests/miscTests.py @@ -70,9 +70,9 @@ proc.wait() -@brokentest('Test sometimes fail, when misc.getCmdArgs() returns ' - 'the empty tuple right after process creation') class GetCmdArgsTests(TestCaseBase): + @brokentest('Test sometimes fail, when misc.getCmdArgs() returns ' + 'the empty tuple right after process creation') def test(self): args = ("sleep", "4") sproc = misc.execCmd(args, sync=False, sudo=False) -- To view, visit http://gerrit.ovirt.org/8984 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5d99275ee7cf04e8464f4718c765bca901178e8c Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

1 2

Change in vdsm[master]: Revert "Save a few seconds while running misc tests"
by Dan Kenigsberg 01 Nov '12

01 Nov '12

Dan Kenigsberg has uploaded a new change for review. Change subject: Revert "Save a few seconds while running misc tests" ...................................................................... Revert "Save a few seconds while running misc tests" This reverts commit 86a259a804fbe6ebac600511f10fdae9b093b552. as it causes a yet-unexplained regression in jenkins's unit tests FAIL: test (miscTests.GetCmdArgsTests) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/jenkins/workspace/vdsm_unit_tests/tests/miscTests.py", line 77, in test self.assertEquals(misc.getCmdArgs(sproc.pid), args) AssertionError: Tuples differ: () != ('sleep', '4') Second tuple contains 2 additional elements. First extra element 0: sleep - () + ('sleep', '4') Change-Id: I92ef357cb68c0d54c8520fd1f51bc8c90c0f2f22 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M tests/miscTests.py 1 file changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/57/8957/1 diff --git a/tests/miscTests.py b/tests/miscTests.py index aa03312..6339986 100644 --- a/tests/miscTests.py +++ b/tests/miscTests.py @@ -60,13 +60,14 @@ sleepProcs.append(misc.execCmd(["sleep", "3"], sync=False, sudo=False)) + time.sleep(1) + pids = misc.pgrep("sleep") for proc in sleepProcs: self.assertTrue(proc.pid in pids, "pid %d was not located by pgrep" % proc.pid) for proc in sleepProcs: - proc.kill() proc.wait() @@ -74,8 +75,8 @@ def test(self): args = ("sleep", "4") sproc = misc.execCmd(args, sync=False, sudo=False) + time.sleep(1) self.assertEquals(misc.getCmdArgs(sproc.pid), args) - sproc.kill() sproc.wait() @@ -83,13 +84,13 @@ def test(self): args = ["sleep", "3"] sproc = misc.execCmd(args, sync=False, sudo=False) + time.sleep(1) stats = misc.pidStat(sproc.pid) pid = int(stats[0]) # procName comes in the format of (procname) name = stats[1] self.assertEquals(pid, sproc.pid) self.assertEquals(name, args[0]) - sproc.kill() sproc.wait() -- To view, visit http://gerrit.ovirt.org/8957 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I92ef357cb68c0d54c8520fd1f51bc8c90c0f2f22 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

2 4

Change in vdsm[master]: Fix getCmdArgs() failing on some hosts
by smizrahi＠redhat.com 01 Nov '12

01 Nov '12

Saggi Mizrahi has uploaded a new change for review. Change subject: Fix getCmdArgs() failing on some hosts ...................................................................... Fix getCmdArgs() failing on some hosts Change-Id: Id06b03192f065d975c078e865e8514441e81450c Signed-off-by: Saggi Mizrahi <smizrahi(a)redhat.com> --- M vdsm/storage/misc.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/74/8974/1 diff --git a/vdsm/storage/misc.py b/vdsm/storage/misc.py index 426d181..945e3b2 100644 --- a/vdsm/storage/misc.py +++ b/vdsm/storage/misc.py @@ -1068,7 +1068,7 @@ def getCmdArgs(pid): with open("/proc/%d/cmdline" % pid, "r") as f: - return tuple(f.readline().split("\0")[:-1]) + return tuple(f.read().split("\0")[:-1]) def pidStat(pid): -- To view, visit http://gerrit.ovirt.org/8974 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id06b03192f065d975c078e865e8514441e81450c Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com>

2 3

Change in vdsm[master]: Don't ignore nfs_mount_options in vdsm.conf
by gpadgett＠redhat.com 01 Nov '12

01 Nov '12

Greg Padgett has uploaded a new change for review. Change subject: Don't ignore nfs_mount_options in vdsm.conf ...................................................................... Don't ignore nfs_mount_options in vdsm.conf The nfs_mount_options configuration setting in vdsm.conf was ignored. The options will now be processed, but options passed to VDSM from the backend will take priority. Change-Id: I3c1d13bfd98a9b41b9728bdcb7f01b3161c26bd8 Signed-off-by: Greg Padgett <gpadgett(a)redhat.com> --- M vdsm/storage/fileUtils.py M vdsm/storage/storageServer.py 2 files changed, 7 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/68/5368/1 -- To view, visit http://gerrit.ovirt.org/5368 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3c1d13bfd98a9b41b9728bdcb7f01b3161c26bd8 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Greg Padgett <gpadgett(a)redhat.com>

6 42

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches November 2012