Change in vdsm[master]: storage: Move threadLocal module to vdsm storage lib

nsoffer at redhat.com nsoffer at redhat.com
Fri Mar 25 21:05:38 UTC 2016


Nir Soffer has uploaded a new change for review.

Change subject: storage:  Move threadLocal module to vdsm storage lib
......................................................................

storage:  Move threadLocal module to vdsm storage lib

Move storage.threadLocal to vdsm.storage.threadlocal

Change-Id: Ic1205799f8eca037b8b1963db62e1961684d3ce2
Signed-off-by: Nir Soffer <nsoffer at redhat.com>
---
M debian/vdsm-python.install
M debian/vdsm.install
M lib/vdsm/storage/Makefile.am
R lib/vdsm/storage/threadlocal.py
M vdsm.spec.in
M vdsm/storage/Makefile.am
M vdsm/storage/blockVolume.py
M vdsm/storage/fileVolume.py
M vdsm/storage/hsm.py
M vdsm/storage/image.py
M vdsm/storage/task.py
M vdsm/storage/volume.py
12 files changed, 10 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/55/55255/1

diff --git a/debian/vdsm-python.install b/debian/vdsm-python.install
index 7cd497c..cfa77cd 100644
--- a/debian/vdsm-python.install
+++ b/debian/vdsm-python.install
@@ -67,6 +67,7 @@
 ./usr/lib/python2.7/dist-packages/vdsm/storage/persistent.py
 ./usr/lib/python2.7/dist-packages/vdsm/storage/securable.py
 ./usr/lib/python2.7/dist-packages/vdsm/storage/sync.py
+./usr/lib/python2.7/dist-packages/vdsm/storage/threadlocal.py
 ./usr/lib/python2.7/dist-packages/vdsm/supervdsm.py
 ./usr/lib/python2.7/dist-packages/vdsm/taskset.py
 ./usr/lib/python2.7/dist-packages/vdsm/tool/__init__.py
diff --git a/debian/vdsm.install b/debian/vdsm.install
index 9671eed..95d0953 100644
--- a/debian/vdsm.install
+++ b/debian/vdsm.install
@@ -115,7 +115,6 @@
 ./usr/share/vdsm/storage/storage_mailbox.py
 ./usr/share/vdsm/storage/task.py
 ./usr/share/vdsm/storage/taskManager.py
-./usr/share/vdsm/storage/threadLocal.py
 ./usr/share/vdsm/storage/threadPool.py
 ./usr/share/vdsm/storage/volume.py
 ./usr/share/vdsm/sitecustomize.py
diff --git a/lib/vdsm/storage/Makefile.am b/lib/vdsm/storage/Makefile.am
index b98e713..d5a1106 100644
--- a/lib/vdsm/storage/Makefile.am
+++ b/lib/vdsm/storage/Makefile.am
@@ -28,4 +28,5 @@
 	persistent.py \
 	securable.py \
 	sync.py \
+	threadlocal.py \
 	$(NULL)
diff --git a/vdsm/storage/threadLocal.py b/lib/vdsm/storage/threadlocal.py
similarity index 95%
rename from vdsm/storage/threadLocal.py
rename to lib/vdsm/storage/threadlocal.py
index ea245d0..d76f9e1 100644
--- a/vdsm/storage/threadLocal.py
+++ b/lib/vdsm/storage/threadlocal.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2011 Red Hat, Inc.
+# Copyright 2011-2016 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 13918f3..04ab65e 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -946,7 +946,6 @@
 %{_datadir}/%{vdsm_name}/storage/storageServer.py*
 %{_datadir}/%{vdsm_name}/storage/taskManager.py*
 %{_datadir}/%{vdsm_name}/storage/task.py*
-%{_datadir}/%{vdsm_name}/storage/threadLocal.py*
 %{_datadir}/%{vdsm_name}/storage/threadPool.py*
 %{_datadir}/%{vdsm_name}/storage/volume.py*
 %{_datadir}/%{vdsm_name}/storage/imageRepository/__init__.py*
@@ -1151,6 +1150,7 @@
 %{python_sitelib}/%{vdsm_name}/storage/persistent.py*
 %{python_sitelib}/%{vdsm_name}/storage/securable.py*
 %{python_sitelib}/%{vdsm_name}/storage/sync.py*
+%{python_sitelib}/%{vdsm_name}/storage/threadlocal.py*
 %{python_sitelib}/%{vdsm_name}/tc/__init__.py*
 %{python_sitelib}/%{vdsm_name}/tc/_parser.py*
 %{python_sitelib}/%{vdsm_name}/tc/_wrapper.py*
diff --git a/vdsm/storage/Makefile.am b/vdsm/storage/Makefile.am
index 20011b8..d964084 100644
--- a/vdsm/storage/Makefile.am
+++ b/vdsm/storage/Makefile.am
@@ -63,7 +63,6 @@
 	storageServer.py \
 	taskManager.py \
 	task.py \
-	threadLocal.py \
 	threadPool.py \
 	volume.py
 
diff --git a/vdsm/storage/blockVolume.py b/vdsm/storage/blockVolume.py
index 18ff490..a42bbf6 100644
--- a/vdsm/storage/blockVolume.py
+++ b/vdsm/storage/blockVolume.py
@@ -27,6 +27,7 @@
 from vdsm import exception
 from vdsm.config import config
 from vdsm.storage import exception as se
+from vdsm.storage.threadlocal import vars
 import vdsm.utils as utils
 
 import volume
@@ -39,7 +40,6 @@
 import task
 import lvm
 import resourceManager as rm
-from threadLocal import vars
 from sdc import sdCache
 from resourceFactories import LVM_ACTIVATION_NAMESPACE
 import fileUtils
diff --git a/vdsm/storage/fileVolume.py b/vdsm/storage/fileVolume.py
index 0afe6f3..a78a328 100644
--- a/vdsm/storage/fileVolume.py
+++ b/vdsm/storage/fileVolume.py
@@ -28,6 +28,7 @@
 from vdsm.storage import exception as se
 from vdsm.storage.constants import FILE_VOLUME_PERMISSIONS
 from vdsm.storage.constants import LEASE_FILEEXT
+from vdsm.storage.threadlocal import vars
 
 from sdc import sdCache
 import outOfProcess as oop
@@ -38,7 +39,6 @@
 import misc
 from misc import deprecated
 import task
-from threadLocal import vars
 
 META_FILEEXT = ".meta"
 LEASE_FILEOFFSET = 0
diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py
index 881f337..bd87cb4 100644
--- a/vdsm/storage/hsm.py
+++ b/vdsm/storage/hsm.py
@@ -46,6 +46,7 @@
 from vdsm.storage import exception as se
 from vdsm.storage.constants import STORAGE
 from vdsm.storage.constants import SECTOR_SIZE
+from vdsm.storage.threadlocal import vars
 
 import sp
 from spbackends import MAX_POOL_DESCRIPTION_SIZE, MAX_DOMAINS
@@ -70,7 +71,6 @@
 from misc import deprecated
 import taskManager
 import clusterlock
-from threadLocal import vars
 import resourceManager as rm
 from resourceFactories import IMAGE_NAMESPACE
 import devicemapper
diff --git a/vdsm/storage/image.py b/vdsm/storage/image.py
index ff026a3..efb95cf 100644
--- a/vdsm/storage/image.py
+++ b/vdsm/storage/image.py
@@ -29,6 +29,7 @@
 from vdsm import virtsparsify
 from vdsm.config import config
 from vdsm.storage import exception as se
+from vdsm.storage.threadlocal import vars
 
 from sdc import sdCache
 import sd
@@ -37,7 +38,6 @@
 import imageSharing
 from vdsm.exception import ActionStopped
 import task
-from threadLocal import vars
 import resourceFactories
 import resourceManager as rm
 
diff --git a/vdsm/storage/task.py b/vdsm/storage/task.py
index ae0b271..2e97618 100644
--- a/vdsm/storage/task.py
+++ b/vdsm/storage/task.py
@@ -53,11 +53,11 @@
 from functools import wraps
 
 from vdsm.storage import exception as se
+from vdsm.storage.threadlocal import vars
 
 import uuid
 import misc
 import resourceManager
-from threadLocal import vars
 from weakref import proxy
 from vdsm import concurrent
 from vdsm.config import config
diff --git a/vdsm/storage/volume.py b/vdsm/storage/volume.py
index 6ae4858..72effd5 100644
--- a/vdsm/storage/volume.py
+++ b/vdsm/storage/volume.py
@@ -28,6 +28,7 @@
 from vdsm import qemuimg
 from vdsm.storage import constants as storage_constants
 from vdsm.storage import exception as se
+from vdsm.storage.threadlocal import vars
 
 import sd
 from sdc import sdCache
@@ -35,7 +36,6 @@
 from misc import deprecated
 import fileUtils
 import task
-from threadLocal import vars
 import resourceFactories
 import resourceManager as rm
 rmanager = rm.ResourceManager.getInstance()


-- 
To view, visit https://gerrit.ovirt.org/55255
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic1205799f8eca037b8b1963db62e1961684d3ce2
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer at redhat.com>


More information about the vdsm-patches mailing list