From Dan Kenigsberg <dan...@redhat.com>:
Dan Kenigsberg has uploaded a new change for review.
Change subject: storage: move task and taskManager to lib
......................................................................
storage: move task and taskManager to lib
Change-Id: I97890c2600ffd8bfef7b51fdc4457e5b92459164
Signed-off-by: Dan Kenigsberg <dan...@redhat.com>
---
M lib/vdsm/storage/Makefile.am
R lib/vdsm/storage/task.py
R lib/vdsm/storage/taskManager.py
M vdsm.spec.in
M vdsm/storage/Makefile.am
M vdsm/storage/blockVolume.py
M vdsm/storage/dispatcher.py
M vdsm/storage/fileVolume.py
M vdsm/storage/hsm.py
M vdsm/storage/image.py
M vdsm/storage/storage_mailbox.py
M vdsm/storage/volume.py
12 files changed, 14 insertions(+), 12 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/29/69329/1
diff --git a/lib/vdsm/storage/Makefile.am b/lib/vdsm/storage/Makefile.am
index b6efac5..4cf1b33 100644
--- a/lib/vdsm/storage/Makefile.am
+++ b/lib/vdsm/storage/Makefile.am
@@ -49,6 +49,8 @@
resourceManager.py \
rwlock.py \
securable.py \
+ task.py \
+ taskManager.py \
threadPool.py \
threadlocal.py \
types.py \
diff --git a/vdsm/storage/task.py b/lib/vdsm/storage/task.py
similarity index 99%
rename from vdsm/storage/task.py
rename to lib/vdsm/storage/task.py
index 20fa809..b23fd07 100644
--- a/vdsm/storage/task.py
+++ b/lib/vdsm/storage/task.py
@@ -45,6 +45,7 @@
recovered (loaded) from its persisted store.
'''
+from __future__ import absolute_import
import os
import logging
import threading
diff --git a/vdsm/storage/taskManager.py b/lib/vdsm/storage/taskManager.py
similarity index 98%
rename from vdsm/storage/taskManager.py
rename to lib/vdsm/storage/taskManager.py
index 3a67370..2c5736d 100644
--- a/vdsm/storage/taskManager.py
+++ b/lib/vdsm/storage/taskManager.py
@@ -18,6 +18,7 @@
# Refer to the README and COPYING files for full details of the license
#
+from __future__ import absolute_import
import os
import logging
import threading
@@ -26,7 +27,7 @@
from vdsm.storage import exception as se
from vdsm.storage.threadPool import ThreadPool
-from task import Task, Job, TaskCleanType
+from .task import Task, Job, TaskCleanType
class TaskManager:
diff --git a/vdsm.spec.in b/vdsm.spec.in
index db979ad..dfa33f3 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -952,8 +952,6 @@
%{_datadir}/%{vdsm_name}/storage/spbackends.py*
%{_datadir}/%{vdsm_name}/storage/storage_mailbox.py*
%{_datadir}/%{vdsm_name}/storage/storageServer.py*
-%{_datadir}/%{vdsm_name}/storage/taskManager.py*
-%{_datadir}/%{vdsm_name}/storage/task.py*
%{_datadir}/%{vdsm_name}/storage/volume.py*
%{_datadir}/%{vdsm_name}/storage/imageRepository/__init__.py*
%{_datadir}/%{vdsm_name}/storage/imageRepository/formatConverter.py*
@@ -1211,6 +1209,8 @@
%{python_sitelib}/%{vdsm_name}/storage/resourceManager.py*
%{python_sitelib}/%{vdsm_name}/storage/rwlock.py*
%{python_sitelib}/%{vdsm_name}/storage/securable.py*
+%{python_sitelib}/%{vdsm_name}/storage/task.py*
+%{python_sitelib}/%{vdsm_name}/storage/taskManager.py*
%{python_sitelib}/%{vdsm_name}/storage/threadPool.py*
%{python_sitelib}/%{vdsm_name}/storage/threadlocal.py*
%{python_sitelib}/%{vdsm_name}/storage/types.py*
diff --git a/vdsm/storage/Makefile.am b/vdsm/storage/Makefile.am
index 8ebecbb..edcd55f 100644
--- a/vdsm/storage/Makefile.am
+++ b/vdsm/storage/Makefile.am
@@ -45,8 +45,6 @@
spbackends.py \
storage_mailbox.py \
storageServer.py \
- taskManager.py \
- task.py \
volume.py
dist_vdsmexec_SCRIPTS = \
diff --git a/vdsm/storage/blockVolume.py b/vdsm/storage/blockVolume.py
index edb4c7a..c16da71 100644
--- a/vdsm/storage/blockVolume.py
+++ b/vdsm/storage/blockVolume.py
@@ -34,6 +34,7 @@
from vdsm.storage import lvm
from vdsm.storage import misc
from vdsm.storage import resourceManager as rm
+from vdsm.storage import task
from vdsm.storage.misc import deprecated
from vdsm.storage.threadlocal import vars
from vdsm.storage.volumemetadata import VolumeMetadata
@@ -43,7 +44,6 @@
import image
import sd
import blockSD
-import task
from sdc import sdCache
diff --git a/vdsm/storage/dispatcher.py b/vdsm/storage/dispatcher.py
index ab26986..6f037bd 100644
--- a/vdsm/storage/dispatcher.py
+++ b/vdsm/storage/dispatcher.py
@@ -23,8 +23,8 @@
from vdsm.config import config
from vdsm.storage import exception as se
+from vdsm.storage import task
-import task
_EXPORTED_ATTRIBUTE = "__dispatcher_exported__"
diff --git a/vdsm/storage/fileVolume.py b/vdsm/storage/fileVolume.py
index 4533b07..0c3fb02 100644
--- a/vdsm/storage/fileVolume.py
+++ b/vdsm/storage/fileVolume.py
@@ -29,6 +29,7 @@
from vdsm.storage import exception as se
from vdsm.storage import misc
from vdsm.storage import outOfProcess as oop
+from vdsm.storage import task
from vdsm.storage.misc import deprecated
from vdsm.storage.threadlocal import vars
from vdsm.storage.volumemetadata import VolumeMetadata
@@ -38,7 +39,6 @@
import image
import sd
import fileSD
-import task
META_FILEEXT = ".meta"
LEASE_FILEOFFSET = 0
diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py
index 799985f..4299801 100644
--- a/vdsm/storage/hsm.py
+++ b/vdsm/storage/hsm.py
@@ -57,6 +57,7 @@
from vdsm.storage import multipath
from vdsm.storage import outOfProcess as oop
from vdsm.storage import resourceManager as rm
+from vdsm.storage import taskManager
from vdsm.storage import types
from vdsm.storage.constants import STORAGE
from vdsm.storage.constants import SECTOR_SIZE
@@ -76,7 +77,6 @@
from sdc import sdCache
import image
import merge
-import taskManager
import dispatcher
import storageServer
diff --git a/vdsm/storage/image.py b/vdsm/storage/image.py
index 2720c04..67b29a0 100644
--- a/vdsm/storage/image.py
+++ b/vdsm/storage/image.py
@@ -34,13 +34,13 @@
from vdsm.storage import imageSharing
from vdsm.storage import misc
from vdsm.storage import resourceManager as rm
+from vdsm.storage import task
from vdsm.storage import workarounds
from vdsm.storage.threadlocal import vars
from sdc import sdCache
import sd
from vdsm.common.exception import ActionStopped
-import task
log = logging.getLogger('storage.Image')
diff --git a/vdsm/storage/storage_mailbox.py b/vdsm/storage/storage_mailbox.py
index 9f855f6..6a227bf 100644
--- a/vdsm/storage/storage_mailbox.py
+++ b/vdsm/storage/storage_mailbox.py
@@ -31,10 +31,10 @@
from vdsm.config import config
from vdsm.storage import misc
+from vdsm.storage import task
from vdsm.storage.exception import InvalidParameterException
from vdsm.storage.threadPool import ThreadPool
-import task
from vdsm import concurrent
from vdsm import constants
diff --git a/vdsm/storage/volume.py b/vdsm/storage/volume.py
index 53020f1..d428719 100644
--- a/vdsm/storage/volume.py
+++ b/vdsm/storage/volume.py
@@ -32,13 +32,13 @@
from vdsm.storage import guarded
from vdsm.storage import misc
from vdsm.storage import resourceManager as rm
+from vdsm.storage import task
from vdsm.storage.misc import deprecated
from vdsm.storage.threadlocal import vars
from vdsm.storage.volumemetadata import VolumeMetadata
import sd
from sdc import sdCache
-import task
DOMAIN_MNT_POINT = 'mnt'
--
To view, visit https://gerrit.ovirt.org/69329
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I97890c2600ffd8bfef7b51fdc4457e5b92459164
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <dan...@redhat.com>
_______________________________________________
vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
