From Dan Kenigsberg danken@redhat.com:
Dan Kenigsberg has uploaded a new change for review.
Change subject: py3: take Queue from six.moves ......................................................................
py3: take Queue from six.moves
Affected modules are still not complient with Python 3, but this cleanup is simple and takes us one tiny step forward.
Change-Id: I7c3e547b0d87de56bf65cccb633db5da7f63565f Signed-off-by: Dan Kenigsberg danken@redhat.com --- M tests/storage_monitor_test.py M vdsm/storage/resourceManager.py M vdsm/storage/storage_mailbox.py M vdsm/storage/threadPool.py 4 files changed, 12 insertions(+), 9 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/98/66698/1
diff --git a/tests/storage_monitor_test.py b/tests/storage_monitor_test.py index 8f72402..4ae2d29 100644 --- a/tests/storage_monitor_test.py +++ b/tests/storage_monitor_test.py @@ -18,12 +18,13 @@ # Refer to the README and COPYING files for full details of the license #
-import Queue import logging import threading import time
from contextlib import contextmanager + +from six.moves.queue import Queue, Empty
from vdsm.storage import exception as se
@@ -181,13 +182,13 @@ self.thread = thread self.event = event self.checker = checker - self.queue = Queue.Queue() + self.queue = Queue() self.thread.cycleCallback = self._callback
def wait_for_cycle(self): try: self.queue.get(True, CYCLE_TIMEOUT) - except Queue.Empty: + except Empty: raise RuntimeError("Timeout waiting for monitor cycle")
def _callback(self): diff --git a/vdsm/storage/resourceManager.py b/vdsm/storage/resourceManager.py index 20aa06c..413b936 100644 --- a/vdsm/storage/resourceManager.py +++ b/vdsm/storage/resourceManager.py @@ -25,7 +25,8 @@ from functools import partial from contextlib import nested from uuid import uuid4 -from Queue import Queue + +from six.moves.queue import Queue
from vdsm.logUtils import SimpleLogAdapter from vdsm import concurrent diff --git a/vdsm/storage/storage_mailbox.py b/vdsm/storage/storage_mailbox.py index 0d240fe..4853285 100644 --- a/vdsm/storage/storage_mailbox.py +++ b/vdsm/storage/storage_mailbox.py @@ -22,11 +22,12 @@ import errno import time import threading -import Queue import struct import logging
import uuid + +from six.moves.queue import Queue, Empty
from vdsm.config import config from vdsm.storage import misc @@ -185,7 +186,7 @@ self._poolID = str(poolID) self._monitorInterval = monitorInterval self._spmStorageDir = config.get('irs', 'repository') - self._queue = Queue.Queue(-1) + self._queue = Queue(-1) # *** IMPORTANT NOTE: The SPM's inbox is the HSMs' outbox and vice # versa *** # self._inbox = os.path.join(self._spmStorageDir, self._poolID, @@ -455,7 +456,7 @@ self._handleMessage(message) message = None sendMail = True - except Queue.Empty: + except Empty: pass
if self._stop: @@ -472,7 +473,7 @@ self._handleMessage(message) message = None sendMail = True - except Queue.Empty: + except Empty: empty = True
if self._flush: diff --git a/vdsm/storage/threadPool.py b/vdsm/storage/threadPool.py index e2ecf74..ae1d8b0 100644 --- a/vdsm/storage/threadPool.py +++ b/vdsm/storage/threadPool.py @@ -11,7 +11,7 @@ import logging import threading
-from Queue import Queue, Empty +from six.moves.queue import Queue, Empty from time import sleep
from vdsm import concurrent
From Dan Kenigsberg danken@redhat.com:
Dan Kenigsberg has posted comments on this change.
Change subject: py3: take Queue from six.moves ......................................................................
Patch Set 2: Verified+1
passes QE tier1
From Dan Kenigsberg danken@redhat.com:
Dan Kenigsberg has posted comments on this change.
Change subject: py3: take Queue from six.moves ......................................................................
Patch Set 4: Verified+1
spm kicks in, VM starts
From Dan Kenigsberg danken@redhat.com:
Dan Kenigsberg has submitted this change and it was merged.
Change subject: py3: take Queue from six.moves ......................................................................
py3: take Queue from six.moves
Affected modules are still not complient with Python 3, but this cleanup is simple and takes us one tiny step forward.
Change-Id: I7c3e547b0d87de56bf65cccb633db5da7f63565f Signed-off-by: Dan Kenigsberg danken@redhat.com --- M lib/vdsm/storage/threadPool.py M tests/storage_monitor_test.py M vdsm/storage/resourceManager.py M vdsm/storage/storage_mailbox.py 4 files changed, 12 insertions(+), 9 deletions(-)
Approvals: Nir Soffer: Looks good to me, approved Jenkins CI: Passed CI tests Dan Kenigsberg: Verified
vdsm-patches@lists.fedorahosted.org