Change in vdsm[master]: lvm.env: move to /usr/share/vdsm/storage
Dan Kenigsberg has posted comments on this change. Change subject: lvm.env: move to /usr/share/vdsm/storage .. Patch Set 2: Verified+1 rebased, verified, fixed alphabetization, and added to debina/install. -- To view, visit http://gerrit.ovirt.org/21872 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6ae6bc789efa22321eb06422e910bf272c575007 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Ayal Baron aba...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Eduardo ewars...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Gadi Ickowicz gicko...@redhat.com Gerrit-Reviewer: Haim Ateya hat...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: lvm.env: move to /usr/share/vdsm/storage
oVirt Jenkins CI Server has posted comments on this change. Change subject: lvm.env: move to /usr/share/vdsm/storage .. Patch Set 2: Build Successful http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/5990/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/5194/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/6082/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/111/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/21872 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6ae6bc789efa22321eb06422e910bf272c575007 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Ayal Baron aba...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Eduardo ewars...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Gadi Ickowicz gicko...@redhat.com Gerrit-Reviewer: Haim Ateya hat...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: lvm.env: move to /usr/share/vdsm/storage
Nir Soffer has posted comments on this change. Change subject: lvm.env: move to /usr/share/vdsm/storage .. Patch Set 2: Code-Review+1 -- To view, visit http://gerrit.ovirt.org/21872 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6ae6bc789efa22321eb06422e910bf272c575007 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Ayal Baron aba...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Eduardo ewars...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Gadi Ickowicz gicko...@redhat.com Gerrit-Reviewer: Haim Ateya hat...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: lvm.env: move to /usr/share/vdsm/storage
Dan Kenigsberg has submitted this change and it was merged. Change subject: lvm.env: move to /usr/share/vdsm/storage .. lvm.env: move to /usr/share/vdsm/storage lvm.env is a tiny helper script, intended to make it a bit easier to debug Vdsm-controlled lvm state. It is being created whenever the lvm module is loaded, which generates an annoying warning message in unit test. This patch makes lvm.env ship statically with vdsm. It can be used by . /usr/share/vdsm/storage/lvm.env Change-Id: I6ae6bc789efa22321eb06422e910bf272c575007 Signed-off-by: Dan Kenigsberg dan...@redhat.com Reviewed-on: http://gerrit.ovirt.org/21872 Reviewed-by: Nir Soffer nsof...@redhat.com --- M .gitignore M debian/vdsm.install M vdsm.spec.in M vdsm/storage/Makefile.am A vdsm/storage/lvm.env.in M vdsm/storage/lvm.py 6 files changed, 17 insertions(+), 14 deletions(-) Approvals: Nir Soffer: Looks good to me, but someone else must approve Dan Kenigsberg: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/21872 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6ae6bc789efa22321eb06422e910bf272c575007 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Ayal Baron aba...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Eduardo ewars...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Gadi Ickowicz gicko...@redhat.com Gerrit-Reviewer: Haim Ateya hat...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: lvm.env: move to /usr/share/vdsm/storage
Dan Kenigsberg has posted comments on this change. Change subject: lvm.env: move to /usr/share/vdsm/storage .. Patch Set 2: Code-Review+2 -- To view, visit http://gerrit.ovirt.org/21872 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6ae6bc789efa22321eb06422e910bf272c575007 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Ayal Baron aba...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Eduardo ewars...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Gadi Ickowicz gicko...@redhat.com Gerrit-Reviewer: Haim Ateya hat...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: lvm.env: move to /usr/share/vdsm/storage
oVirt Jenkins CI Server has posted comments on this change. Change subject: lvm.env: move to /usr/share/vdsm/storage .. Patch Set 3: Build Successful http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/114/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/21872 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6ae6bc789efa22321eb06422e910bf272c575007 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Ayal Baron aba...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Eduardo ewars...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Gadi Ickowicz gicko...@redhat.com Gerrit-Reviewer: Haim Ateya hat...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: lvm.env: move to /usr/share/vdsm/storage
Dan Kenigsberg has posted comments on this change. Change subject: lvm.env: move to /usr/share/vdsm/storage .. Patch Set 1: (1 comment) File vdsm/storage/Makefile.am Line 73: dist_vdsmexec_SCRIPTS = \ Line 74:curl-img-wrap Line 75: Line 76: nodist_vdsmstorage_DATA = \ Line 77:lvm.env \ We need to distribute lvm.env.in, since the exact value of the @VDSMRUNDIR@ macro is decided only when the user runs ./configure on his target machine. Line 78:$(NULL) Line 79: Line 80: EXTRA_DIST = \ Line 81:lvm.env.in \ -- To view, visit http://gerrit.ovirt.org/21872 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6ae6bc789efa22321eb06422e910bf272c575007 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Ayal Baron aba...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Eduardo ewars...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Gadi Ickowicz gicko...@redhat.com Gerrit-Reviewer: Haim Ateya hat...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: lvm.env: move to /usr/share/vdsm/storage
Nir Soffer has posted comments on this change.
Change subject: lvm.env: move to /usr/share/vdsm/storage
..
Patch Set 1:
(1 comment)
File vdsm.spec.in
Line 911: %{_datadir}/%{vdsm_name}/storage/iscsiadm.py*
Line 912: %{_datadir}/%{vdsm_name}/storage/iscsi.py*
Line 913: %{_datadir}/%{vdsm_name}/storage/localFsSD.py*
Line 914: %{_datadir}/%{vdsm_name}/storage/lvm.py*
Line 915: %{_datadir}/%{vdsm_name}/storage/lvm.env
I share this rant :-)
Line 916: %{_datadir}/%{vdsm_name}/storage/misc.py*
Line 917: %{_datadir}/%{vdsm_name}/storage/mount.py*
Line 918: %{_datadir}/%{vdsm_name}/storage/multipath.py*
Line 919: %{_datadir}/%{vdsm_name}/storage/nfsSD.py*
--
To view, visit http://gerrit.ovirt.org/21872
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I6ae6bc789efa22321eb06422e910bf272c575007
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Ayal Baron aba...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Eduardo ewars...@redhat.com
Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com
Gerrit-Reviewer: Gadi Ickowicz gicko...@redhat.com
Gerrit-Reviewer: Haim Ateya hat...@redhat.com
Gerrit-Reviewer: Nir Soffer nsof...@redhat.com
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: lvm.env: move to /usr/share/vdsm/storage
Nir Soffer has posted comments on this change. Change subject: lvm.env: move to /usr/share/vdsm/storage .. Patch Set 1: Code-Review+1 -- To view, visit http://gerrit.ovirt.org/21872 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6ae6bc789efa22321eb06422e910bf272c575007 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Ayal Baron aba...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Eduardo ewars...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Gadi Ickowicz gicko...@redhat.com Gerrit-Reviewer: Haim Ateya hat...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: lvm.env: move to /usr/share/vdsm/storage
Nir Soffer has posted comments on this change. Change subject: lvm.env: move to /usr/share/vdsm/storage .. Patch Set 1: (1 comment) Good change - the makefile seems wrong (or I'm confused by autotools). Why depend on unmerged commit instead of HEAD? File vdsm/storage/Makefile.am Line 73: dist_vdsmexec_SCRIPTS = \ Line 74:curl-img-wrap Line 75: Line 76: nodist_vdsmstorage_DATA = \ Line 77:lvm.env \ Isn't this reversed? We don't want to distribute lvm.env.in, and we do want to distribute lvm.env. Line 78:$(NULL) Line 79: Line 80: EXTRA_DIST = \ Line 81:lvm.env.in \ -- To view, visit http://gerrit.ovirt.org/21872 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6ae6bc789efa22321eb06422e910bf272c575007 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Ayal Baron aba...@redhat.com Gerrit-Reviewer: Haim Ateya hat...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: lvm.env: move to /usr/share/vdsm/storage
Dan Kenigsberg has uploaded a new change for review.
Change subject: lvm.env: move to /usr/share/vdsm/storage
..
lvm.env: move to /usr/share/vdsm/storage
lvm.env is a tiny helper script, intended to make it a bit easier to
debug Vdsm-controlled lvm state. It is being created whenever the lvm
module is loaded, which generates an annoying warning message in unit
test.
This patch makes lvm.env ship statically with vdsm. It can be used by
. /usr/share/vdsm/storage/lvm.env
Change-Id: I6ae6bc789efa22321eb06422e910bf272c575007
Signed-off-by: Dan Kenigsberg dan...@redhat.com
---
M .gitignore
M vdsm.spec.in
M vdsm/storage/Makefile.am
A vdsm/storage/lvm.env.in
M vdsm/storage/lvm.py
5 files changed, 16 insertions(+), 14 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/72/21872/1
diff --git a/.gitignore b/.gitignore
index 7ec1993..3042c43 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,6 +53,7 @@
vdsm/mom.conf
vdsm/sos/vdsm.py
vdsm/storage/protect/safelease
+vdsm/storage/lvm.env
vdsm/storage/vdsm-lvm.rules
vdsm/sudoers.vdsm
vdsm/svdsm.logger.conf
diff --git a/vdsm.spec.in b/vdsm.spec.in
index f248b74..a059ad6 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -912,6 +912,7 @@
%{_datadir}/%{vdsm_name}/storage/iscsi.py*
%{_datadir}/%{vdsm_name}/storage/localFsSD.py*
%{_datadir}/%{vdsm_name}/storage/lvm.py*
+%{_datadir}/%{vdsm_name}/storage/lvm.env
%{_datadir}/%{vdsm_name}/storage/misc.py*
%{_datadir}/%{vdsm_name}/storage/mount.py*
%{_datadir}/%{vdsm_name}/storage/multipath.py*
diff --git a/vdsm/storage/Makefile.am b/vdsm/storage/Makefile.am
index 2d3e9a6..6d0d769 100644
--- a/vdsm/storage/Makefile.am
+++ b/vdsm/storage/Makefile.am
@@ -20,6 +20,8 @@
SUBDIRS = protect imageRepository
+include $(top_srcdir)/build-aux/Makefile.subs
+
vdsmstoragedir = $(vdsmdir)/storage
dist_vdsmstorage_PYTHON = \
__init__.py \
@@ -71,5 +73,13 @@
dist_vdsmexec_SCRIPTS = \
curl-img-wrap
+nodist_vdsmstorage_DATA = \
+ lvm.env \
+ $(NULL)
+
+EXTRA_DIST = \
+ lvm.env.in \
+ $(NULL)
+
check-local:
PYTHONPATH=$(top_srcdir)/lib:$$PYTHONPATH PYTHONDONTWRITEBYTECODE=1
$(PYTHON) $(srcdir)/storage_exception.py
diff --git a/vdsm/storage/lvm.env.in b/vdsm/storage/lvm.env.in
new file mode 100644
index 000..25f73cb
--- /dev/null
+++ b/vdsm/storage/lvm.env.in
@@ -0,0 +1,4 @@
+#
+# source this into your shell to gain vdsm's view of lvm.
+#
+export LVM_SYSTEM_DIR=@VDSMRUNDIR@/lvm
diff --git a/vdsm/storage/lvm.py b/vdsm/storage/lvm.py
index 559f169..2b892d7 100644
--- a/vdsm/storage/lvm.py
+++ b/vdsm/storage/lvm.py
@@ -161,19 +161,6 @@
log.warning(Cannot create %s file %s, VDSM_LVM_CONF, str(e))
-def _setupLVMEnv():
-lvmenvfname = os.path.join(VAR_RUN_VDSM, lvm.env)
-with file(lvmenvfname, w) as lvmenv:
-lvmenv.write(export LVM_SYSTEM_DIR=%s\n % VDSM_LVM_SYSTEM_DIR)
-
-
-def _setupLVM():
-try:
-_setupLVMEnv()
-except IOError as e:
-log.warning(Cannot create env file %s, e)
-
-
#
# Make sure that args is suitable for consumption in interfaces
# that expect an iterabale argument. The string is treated a single
@@ -294,7 +281,6 @@
def __init__(self):
self._filterStale = True
self._extraCfg = None
-_setupLVM()
self._filterLock = threading.Lock()
self._oplock = misc.OperationMutex()
self._stalepv = True
--
To view, visit http://gerrit.ovirt.org/21872
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6ae6bc789efa22321eb06422e910bf272c575007
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
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: lvm.env: move to /usr/share/vdsm/storage
oVirt Jenkins CI Server has posted comments on this change. Change subject: lvm.env: move to /usr/share/vdsm/storage .. Patch Set 1: Build Successful http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/5827/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/5919/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/5031/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/21872 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6ae6bc789efa22321eb06422e910bf272c575007 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
