From Dan Kenigsberg <[email protected]>: Dan Kenigsberg has uploaded a new change for review.
Change subject: storage: move multipath to lib ...................................................................... storage: move multipath to lib Change-Id: I49d957fdb7b278f38f7ceada382fe1277586821d Signed-off-by: Dan Kenigsberg <[email protected]> --- M lib/vdsm/storage/Makefile.am R lib/vdsm/storage/multipath.py M vdsm.spec.in M vdsm/storage/Makefile.am M vdsm/storage/blockSD.py M vdsm/storage/hsm.py M vdsm/storage/lvm.py M vdsm/storage/sdc.py M vdsm/supervdsmServer 9 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/51/67851/1 diff --git a/lib/vdsm/storage/Makefile.am b/lib/vdsm/storage/Makefile.am index 4b01a98..313371b 100644 --- a/lib/vdsm/storage/Makefile.am +++ b/lib/vdsm/storage/Makefile.am @@ -42,6 +42,7 @@ iscsiadm.py \ misc.py \ mount.py \ + multipath.py \ outOfProcess.py \ persistent.py \ rwlock.py \ diff --git a/vdsm/storage/multipath.py b/lib/vdsm/storage/multipath.py similarity index 100% rename from vdsm/storage/multipath.py rename to lib/vdsm/storage/multipath.py diff --git a/vdsm.spec.in b/vdsm.spec.in index 0e38d77..3058a6c 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -963,7 +963,6 @@ %{_datadir}/%{vdsm_name}/storage/localFsSD.py* %{_datadir}/%{vdsm_name}/storage/lvm.env %{_datadir}/%{vdsm_name}/storage/lvm.py* -%{_datadir}/%{vdsm_name}/storage/multipath.py* %{_datadir}/%{vdsm_name}/storage/nfsSD.py* %{_datadir}/%{vdsm_name}/storage/resourceFactories.py* %{_datadir}/%{vdsm_name}/storage/resourceManager.py* @@ -1217,6 +1216,7 @@ %{python_sitelib}/%{vdsm_name}/storage/iscsiadm.py* %{python_sitelib}/%{vdsm_name}/storage/misc.py* %{python_sitelib}/%{vdsm_name}/storage/mount.py* +%{python_sitelib}/%{vdsm_name}/storage/multipath.py* %{python_sitelib}/%{vdsm_name}/storage/outOfProcess.py* %{python_sitelib}/%{vdsm_name}/storage/persistent.py* %{python_sitelib}/%{vdsm_name}/storage/rwlock.py* diff --git a/vdsm/storage/Makefile.am b/vdsm/storage/Makefile.am index 9e79cc4..342af8f 100644 --- a/vdsm/storage/Makefile.am +++ b/vdsm/storage/Makefile.am @@ -37,7 +37,6 @@ localFsSD.py \ lvm.py \ monitor.py \ - multipath.py \ nfsSD.py \ resourceFactories.py \ resourceManager.py \ diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py index 4cda48d..4e3657d 100644 --- a/vdsm/storage/blockSD.py +++ b/vdsm/storage/blockSD.py @@ -46,6 +46,7 @@ from vdsm.storage import iscsi from vdsm.storage import misc from vdsm.storage import mount +from vdsm.storage import multipath from vdsm.storage.persistent import PersistentDict, DictValidator from vdsm.storage.threadlocal import vars import vdsm.supervdsm as svdsm @@ -54,7 +55,6 @@ from sdm import volume_artifacts import lvm import blockVolume -import multipath import resourceFactories from storage_mailbox import MAILBOX_SIZE import resourceManager as rm diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py index f5b99dc..9936003 100644 --- a/vdsm/storage/hsm.py +++ b/vdsm/storage/hsm.py @@ -53,6 +53,7 @@ from vdsm.storage import iscsi from vdsm.storage import misc from vdsm.storage import mount +from vdsm.storage import multipath from vdsm.storage import outOfProcess as oop from vdsm.storage.constants import STORAGE from vdsm.storage.constants import SECTOR_SIZE @@ -70,7 +71,6 @@ import glusterSD import localFsSD import lvm -import multipath from sdc import sdCache import image import taskManager diff --git a/vdsm/storage/lvm.py b/vdsm/storage/lvm.py index a2442ca..8d9a19d 100644 --- a/vdsm/storage/lvm.py +++ b/vdsm/storage/lvm.py @@ -41,9 +41,9 @@ from vdsm.storage import devicemapper from vdsm.storage import exception as se from vdsm.storage import misc +from vdsm.storage import multipath from vdsm.storage.constants import VG_EXTENT_SIZE_MB -import multipath from vdsm.config import config log = logging.getLogger("storage.LVM") diff --git a/vdsm/storage/sdc.py b/vdsm/storage/sdc.py index 4df521c..7fa13ea 100644 --- a/vdsm/storage/sdc.py +++ b/vdsm/storage/sdc.py @@ -28,9 +28,9 @@ from vdsm.config import config from vdsm.storage import exception as se from vdsm.storage import misc +from vdsm.storage import multipath import lvm -import multipath # Default cache age until forcibly refreshed DEFAULT_REFRESH_INTERVAL = 300 diff --git a/vdsm/supervdsmServer b/vdsm/supervdsmServer index cd892db..d78682b 100755 --- a/vdsm/supervdsmServer +++ b/vdsm/supervdsmServer @@ -63,12 +63,12 @@ from vdsm.storage.fileUtils import validateAccess as _validateAccess from vdsm.storage.iscsi import getDevIscsiInfo as _getdeviSCSIinfo from vdsm.storage.iscsi import readSessionInfo as _readSessionInfo +from vdsm.storage.multipath import getScsiSerial as _getScsiSerial +from vdsm.storage import multipath from vdsm.supervdsm import _SuperVdsmManager from vdsm.network import sourceroutethread -from storage.multipath import getScsiSerial as _getScsiSerial -from storage import multipath from vdsm.constants import METADATA_GROUP, \ VDSM_USER, GLUSTER_MGMT_ENABLED from vdsm.config import config -- To view, visit https://gerrit.ovirt.org/67851 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I49d957fdb7b278f38f7ceada382fe1277586821d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <[email protected]> _______________________________________________ vdsm-patches mailing list -- [email protected] To unsubscribe send an email to [email protected]
