Alon Bar-Lev has uploaded a new change for review.
Change subject: packaging: move /rhev/data-center to /var/lib/vdsm/data-center ......................................................................
packaging: move /rhev/data-center to /var/lib/vdsm/data-center
rhev is a trademark should not be in ovirt.
It is not FHS compliant to add /whatever to filesystem.
Change-Id: I4ed316fedbf2e4d7e5bf741b7c77a39704994ae7 Signed-off-by: Alon Bar-Lev alonbl@redhat.com --- M configure.ac M tests/getAllVolumesTests.py M vdsm.spec.in M vdsm/storage/fileSD.py M vdsm/storage/fileVolume.py 5 files changed, 12 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/00/8500/1
diff --git a/configure.ac b/configure.ac index 450f714..665f1c6 100644 --- a/configure.ac +++ b/configure.ac @@ -75,7 +75,7 @@ AC_SUBST([vdsmexecdir], ['${libexecdir}/vdsm']) AC_SUBST([vdsmhooksdir], ['${vdsmexecdir}/hooks']) AC_SUBST([vdsmtsdir], ['${sysconfdir}/pki/vdsm']) -AC_SUBST([vdsmrepo], ['/rhev/data-center']) +AC_SUBST([vdsmrepo], ['${vdsmlibdir}/data-center']) AC_SUBST([vdsmpylibdir], ['${pyexecdir}/vdsm']) AC_SUBST([vdsmtooldir], ['${vdsmpylibdir}/tool']) AC_SUBST([vdsmtestsdir], ['${datarootdir}/vdsm/tests']) diff --git a/tests/getAllVolumesTests.py b/tests/getAllVolumesTests.py index ffc12c5..fe4c7b9 100644 --- a/tests/getAllVolumesTests.py +++ b/tests/getAllVolumesTests.py @@ -62,7 +62,7 @@ Input file name: 'glob_<sdName>.out Input file format: str(glob.glob(<imgsDir>)) When - <imgsDir> = /rhev/data-center/mnt/<mntPoint>/<sdName>/images/*.meta + <imgsDir> = @vdsmlibdir@/data-center/mnt/<mntPoint>/<sdName>/images/*.meta """ sdPath, globExp = volMetaPattern.split('/images') sdHead, sdName = os.path.split(sdPath) diff --git a/vdsm.spec.in b/vdsm.spec.in index 716489a..8e9fbba 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -460,6 +460,14 @@ fi
%post +# upgrade old locations +if [ -d /rhev/data-center ]; then + mv /rhev/data-center %{_localstatedir}/lib/vdsm/data-center.new && \ + rm -rf %{_localstatedir}/lib/vdsm/data-center && + mv %{_localstatedir}/lib/vdsm/data-center.new %{_localstatedir}/lib/vdsm/data-center && + rm -rf /rhev +fi + # set the vdsm "secret" password for libvirt %{_bindir}/vdsm-tool set-saslpasswd
diff --git a/vdsm/storage/fileSD.py b/vdsm/storage/fileSD.py index 054fadb..bb0f0ba 100644 --- a/vdsm/storage/fileSD.py +++ b/vdsm/storage/fileSD.py @@ -64,7 +64,7 @@
def getDomUuidFromMetafilePath(metafile): # Metafile path has pattern: - # /rhev/data-center/mnt/export-path/sdUUID/dom_md/metadata + # @vdsmlibdir@/data-center/mnt/export-path/sdUUID/dom_md/metadata
metaList = os.path.normpath(metafile).split('/') return metaList[-3] diff --git a/vdsm/storage/fileVolume.py b/vdsm/storage/fileVolume.py index 0aa9043..08fc8b8 100644 --- a/vdsm/storage/fileVolume.py +++ b/vdsm/storage/fileVolume.py @@ -40,7 +40,7 @@
def getDomUuidFromVolumePath(volPath): # Volume path has pattern: - # /rhev/data-center/spUUID/sdUUID/images/imgUUID/volUUID + # @vdsmlibdir@/data-center/spUUID/sdUUID/images/imgUUID/volUUID
# sdUUID position after data-center sdUUIDPos = 3
-- To view, visit http://gerrit.ovirt.org/8500 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange Gerrit-Change-Id: I4ed316fedbf2e4d7e5bf741b7c77a39704994ae7 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev alonbl@redhat.com
Alon Bar-Lev has posted comments on this change.
Change subject: packaging: move /rhev/data-center to /var/lib/vdsm/data-center ......................................................................
Patch Set 1:
Not verified...
This is more or less what I think... not sure we should do the migration...
-- To view, visit http://gerrit.ovirt.org/8500 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I4ed316fedbf2e4d7e5bf741b7c77a39704994ae7 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com
Douglas Schilling Landgraf has posted comments on this change.
Change subject: packaging: move /rhev/data-center to /var/lib/vdsm/data-center ......................................................................
Patch Set 2: Looks good to me, but someone else must approve
looks good to me, we tried to move the location two times before, let's see if this time we get it. I will verify on monday if nobody do it before.
-- To view, visit http://gerrit.ovirt.org/8500 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I4ed316fedbf2e4d7e5bf741b7c77a39704994ae7 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Ayal Baron abaron@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Ryan Harper ryanh@us.ibm.com
Dan Kenigsberg has posted comments on this change.
Change subject: packaging: move /rhev/data-center to /var/lib/vdsm/data-center ......................................................................
Patch Set 2: (1 inline comment)
.................................................... File tests/getAllVolumesTests.py Line 61: Line 62: Input file name: 'glob_<sdName>.out Line 63: Input file format: str(glob.glob(<imgsDir>)) Line 64: When Line 65: <imgsDir> = @vdsmlibdir@/data-center/mnt/<mntPoint>/<sdName>/images/*.meta pep8 explodes. you now hate me more. Line 66: """ Line 67: sdPath, globExp = volMetaPattern.split('/images') Line 68: sdHead, sdName = os.path.split(sdPath) Line 69: inp = open(os.path.join(sdHead, "glob_%s.out" % sdName),
-- To view, visit http://gerrit.ovirt.org/8500 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I4ed316fedbf2e4d7e5bf741b7c77a39704994ae7 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Ayal Baron abaron@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Ryan Harper ryanh@us.ibm.com
Alon Bar-Lev has posted comments on this change.
Change subject: packaging: move /rhev/data-center to /var/lib/vdsm/data-center ......................................................................
Patch Set 2: (1 inline comment)
.................................................... File tests/getAllVolumesTests.py Line 61: Line 62: Input file name: 'glob_<sdName>.out Line 63: Input file format: str(glob.glob(<imgsDir>)) Line 64: When Line 65: <imgsDir> = @vdsmlibdir@/data-center/mnt/<mntPoint>/<sdName>/images/*.meta File has other errors... Line 66: """ Line 67: sdPath, globExp = volMetaPattern.split('/images') Line 68: sdHead, sdName = os.path.split(sdPath) Line 69: inp = open(os.path.join(sdHead, "glob_%s.out" % sdName),
-- To view, visit http://gerrit.ovirt.org/8500 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I4ed316fedbf2e4d7e5bf741b7c77a39704994ae7 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Ayal Baron abaron@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Ryan Harper ryanh@us.ibm.com
Dan Kenigsberg has posted comments on this change.
Change subject: packaging: move /rhev/data-center to /var/lib/vdsm/data-center ......................................................................
Patch Set 2: (1 inline comment)
.................................................... File tests/getAllVolumesTests.py Line 61: Line 62: Input file name: 'glob_<sdName>.out Line 63: Input file format: str(glob.glob(<imgsDir>)) Line 64: When Line 65: <imgsDir> = @vdsmlibdir@/data-center/mnt/<mntPoint>/<sdName>/images/*.meta all is well with my python-pep8-0.6.0 Line 66: """ Line 67: sdPath, globExp = volMetaPattern.split('/images') Line 68: sdHead, sdName = os.path.split(sdPath) Line 69: inp = open(os.path.join(sdHead, "glob_%s.out" % sdName),
-- To view, visit http://gerrit.ovirt.org/8500 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I4ed316fedbf2e4d7e5bf741b7c77a39704994ae7 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Ayal Baron abaron@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Ryan Harper ryanh@us.ibm.com
Dan Kenigsberg has posted comments on this change.
Change subject: packaging: move /rhev/data-center to /var/lib/vdsm/data-center ......................................................................
Patch Set 3: Looks good to me, approved
-- To view, visit http://gerrit.ovirt.org/8500 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I4ed316fedbf2e4d7e5bf741b7c77a39704994ae7 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Ayal Baron abaron@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Ryan Harper ryanh@us.ibm.com
Alon Bar-Lev has posted comments on this change.
Change subject: packaging: move /rhev/data-center to /var/lib/vdsm/data-center ......................................................................
Patch Set 2: (1 inline comment)
.................................................... File tests/getAllVolumesTests.py Line 61: Line 62: Input file name: 'glob_<sdName>.out Line 63: Input file format: str(glob.glob(<imgsDir>)) Line 64: When Line 65: <imgsDir> = @vdsmlibdir@/data-center/mnt/<mntPoint>/<sdName>/images/*.meta $ pep8 tests/getAllVolumesTests.py tests/getAllVolumesTests.py:43:21: E128 continuation line under-indented for visual indent tests/getAllVolumesTests.py:46:25: E127 continuation line over-indented for visual indent tests/getAllVolumesTests.py:45:50: E502 the backslash is redundant between brackets tests/getAllVolumesTests.py:71:25: E127 continuation line over-indented for visual indent Line 66: """ Line 67: sdPath, globExp = volMetaPattern.split('/images') Line 68: sdHead, sdName = os.path.split(sdPath) Line 69: inp = open(os.path.join(sdHead, "glob_%s.out" % sdName),
-- To view, visit http://gerrit.ovirt.org/8500 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I4ed316fedbf2e4d7e5bf741b7c77a39704994ae7 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Ayal Baron abaron@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Ryan Harper ryanh@us.ibm.com
Douglas Schilling Landgraf has posted comments on this change.
Change subject: packaging: move /rhev/data-center to /var/lib/vdsm/data-center ......................................................................
Patch Set 3: Looks good to me, but someone else must approve
-- To view, visit http://gerrit.ovirt.org/8500 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I4ed316fedbf2e4d7e5bf741b7c77a39704994ae7 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Ayal Baron abaron@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Ryan Harper ryanh@us.ibm.com
Douglas Schilling Landgraf has posted comments on this change.
Change subject: packaging: move /rhev/data-center to /var/lib/vdsm/data-center ......................................................................
Patch Set 3: I would prefer that you didn't submit this
(3 inline comments)
Hello Alon,
Nice patch, few comments that need to be addresses. Please let me know if you want to /me continue it.
.................................................... File configure.ac Line 74: AC_SUBST([vdsmbackupdir], ['${vdsmlogdir}/backup']) Line 75: AC_SUBST([vdsmexecdir], ['${libexecdir}/vdsm']) Line 76: AC_SUBST([vdsmhooksdir], ['${vdsmexecdir}/hooks']) Line 77: AC_SUBST([vdsmtsdir], ['${sysconfdir}/pki/vdsm']) Line 78: AC_SUBST([vdsmrepo], ['${vdsmlibdir}/data-center']) What about use the full path here, as we were using?
Here the error from make rpm: ============================ RPM build errors: File must begin with "/": ${vdsmlibdir}/data-center File must begin with "/": ${vdsmlibdir}/data-center/hsm-tasks File must begin with "/": ${vdsmlibdir}/data-center/mnt Line 79: AC_SUBST([vdsmpylibdir], ['${pyexecdir}/vdsm']) Line 80: AC_SUBST([vdsmtooldir], ['${vdsmpylibdir}/tool']) Line 81: AC_SUBST([vdsmtestsdir], ['${datarootdir}/vdsm/tests']) Line 82:
.................................................... File vdsm/storage/fileSD.py Line 63: Line 64: Line 65: def getDomUuidFromMetafilePath(metafile): Line 66: # Metafile path has pattern: Line 67: # @vdsmlibdir@/data-center/mnt/export-path/sdUUID/dom_md/metadata fileSD.py is not .in file, it won't replace @vdsmlibdir@. Line 68: Line 69: metaList = os.path.normpath(metafile).split('/') Line 70: return metaList[-3] Line 71:
.................................................... File vdsm/storage/fileVolume.py Line 39: Line 40: Line 41: def getDomUuidFromVolumePath(volPath): Line 42: # Volume path has pattern: Line 43: # @vdsmlibdir@/data-center/spUUID/sdUUID/images/imgUUID/volUUID fileVolume.py is not .in file, it won't get replaced by @ macro @. Line 44: Line 45: # sdUUID position after data-center Line 46: sdUUIDPos = 3 Line 47:
-- To view, visit http://gerrit.ovirt.org/8500 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I4ed316fedbf2e4d7e5bf741b7c77a39704994ae7 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Ayal Baron abaron@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Ryan Harper ryanh@us.ibm.com
Douglas Schilling Landgraf has posted comments on this change.
Change subject: packaging: move /rhev/data-center to /var/lib/vdsm/data-center ......................................................................
Patch Set 3: (1 inline comment)
.................................................... File tests/getAllVolumesTests.py Line 61: Line 62: Input file name: 'glob_<sdName>.out Line 63: Input file format: str(glob.glob(<imgsDir>)) Line 64: When Line 65: <imgsDir> = @vdsmlibdir@/data-center/mnt/<mntPoint>/ It's not .in file @vdsmlibdir@ won't be replaced. Line 66: <sdName>/images/*.meta Line 67: """ Line 68: sdPath, globExp = volMetaPattern.split('/images') Line 69: sdHead, sdName = os.path.split(sdPath)
-- To view, visit http://gerrit.ovirt.org/8500 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I4ed316fedbf2e4d7e5bf741b7c77a39704994ae7 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Ayal Baron abaron@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Ryan Harper ryanh@us.ibm.com
Douglas Schilling Landgraf has posted comments on this change.
Change subject: packaging: move /rhev/data-center to /var/lib/vdsm/data-center ......................................................................
Patch Set 3: (1 inline comment)
.................................................... File vdsm.spec.in Line 459: /usr/sbin/setsebool sanlock_use_nfs on Line 460: fi Line 461: Line 462: %post Line 463: # upgrade old locations If possible, can you please just add few more words about this change? Line 464: if [ -d /rhev/data-center -a -z "$(ls %{_localstatedir}/lib/vdsm/data-center/hsm-tasks)" ]; then Line 465: mv /rhev/data-center %{_localstatedir}/lib/vdsm/data-center.new && \ Line 466: rm -rf %{_localstatedir}/lib/vdsm/data-center && Line 467: mv %{_localstatedir}/lib/vdsm/data-center.new %{_localstatedir}/lib/vdsm/data-center &&
-- To view, visit http://gerrit.ovirt.org/8500 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I4ed316fedbf2e4d7e5bf741b7c77a39704994ae7 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Ayal Baron abaron@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Ryan Harper ryanh@us.ibm.com
Alon Bar-Lev has posted comments on this change.
Change subject: packaging: move /rhev/data-center to /var/lib/vdsm/data-center ......................................................................
Patch Set 3: (4 inline comments)
.................................................... File tests/getAllVolumesTests.py Line 61: Line 62: Input file name: 'glob_<sdName>.out Line 63: Input file format: str(glob.glob(<imgsDir>)) Line 64: When Line 65: <imgsDir> = @vdsmlibdir@/data-center/mnt/<mntPoint>/ It is a *COMMENT*, reader should do the subst in mind. Line 66: <sdName>/images/*.meta Line 67: """ Line 68: sdPath, globExp = volMetaPattern.split('/images') Line 69: sdHead, sdName = os.path.split(sdPath)
.................................................... File vdsm.spec.in Line 459: /usr/sbin/setsebool sanlock_use_nfs on Line 460: fi Line 461: Line 462: %post Line 463: # upgrade old locations Please suggest. Line 464: if [ -d /rhev/data-center -a -z "$(ls %{_localstatedir}/lib/vdsm/data-center/hsm-tasks)" ]; then Line 465: mv /rhev/data-center %{_localstatedir}/lib/vdsm/data-center.new && \ Line 466: rm -rf %{_localstatedir}/lib/vdsm/data-center && Line 467: mv %{_localstatedir}/lib/vdsm/data-center.new %{_localstatedir}/lib/vdsm/data-center &&
.................................................... File vdsm/storage/fileSD.py Line 63: Line 64: Line 65: def getDomUuidFromMetafilePath(metafile): Line 66: # Metafile path has pattern: Line 67: # @vdsmlibdir@/data-center/mnt/export-path/sdUUID/dom_md/metadata It is a *COMMENT*, reader should do the subst in mind. Line 68: Line 69: metaList = os.path.normpath(metafile).split('/') Line 70: return metaList[-3] Line 71:
.................................................... File vdsm/storage/fileVolume.py Line 39: Line 40: Line 41: def getDomUuidFromVolumePath(volPath): Line 42: # Volume path has pattern: Line 43: # @vdsmlibdir@/data-center/spUUID/sdUUID/images/imgUUID/volUUID It is a *COMMENT*, reader should do the subst in mind. Line 44: Line 45: # sdUUID position after data-center Line 46: sdUUIDPos = 3 Line 47:
-- To view, visit http://gerrit.ovirt.org/8500 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I4ed316fedbf2e4d7e5bf741b7c77a39704994ae7 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Ayal Baron abaron@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Ryan Harper ryanh@us.ibm.com
Alon Bar-Lev has posted comments on this change.
Change subject: packaging: move /rhev/data-center to /var/lib/vdsm/data-center ......................................................................
Patch Set 3: (1 inline comment)
.................................................... File configure.ac Line 74: AC_SUBST([vdsmbackupdir], ['${vdsmlogdir}/backup']) Line 75: AC_SUBST([vdsmexecdir], ['${libexecdir}/vdsm']) Line 76: AC_SUBST([vdsmhooksdir], ['${vdsmexecdir}/hooks']) Line 77: AC_SUBST([vdsmtsdir], ['${sysconfdir}/pki/vdsm']) Line 78: AC_SUBST([vdsmrepo], ['${vdsmlibdir}/data-center']) Full paths should never be used... solved within the spec.
Thanks. Line 79: AC_SUBST([vdsmpylibdir], ['${pyexecdir}/vdsm']) Line 80: AC_SUBST([vdsmtooldir], ['${vdsmpylibdir}/tool']) Line 81: AC_SUBST([vdsmtestsdir], ['${datarootdir}/vdsm/tests']) Line 82:
-- To view, visit http://gerrit.ovirt.org/8500 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I4ed316fedbf2e4d7e5bf741b7c77a39704994ae7 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Ayal Baron abaron@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Ryan Harper ryanh@us.ibm.com
Ewoud Kohl van Wijngaarden has posted comments on this change.
Change subject: packaging: move /rhev/data-center to /var/lib/vdsm/data-center ......................................................................
Patch Set 4: I would prefer that you didn't submit this
(1 inline comment)
+1 to the idea, just an inline comment I want answered even if it's 'I thought about it'.
.................................................... File vdsm.spec.in Line 465: if [ -d /rhev/data-center -a -z "$(ls %{vdsmrepodir}/hsm-tasks)" ]; then Line 466: mv /rhev/data-center %{vdsmrepodir}/data-center.new && \ Line 467: rm -rf %{vdsmrepodir} && Line 468: mv %{vdsmrepodir}.new %{vdsmrepodir} && Line 469: rm -rf /rhev Are you sure you want to rm -rf /rhev and not rmdir --ignore-fail-on-non-empty /rhev. I think it's unlikely users stored something else in /rhev, but it might happen. Line 470: fi Line 471: Line 472: # set the vdsm "secret" password for libvirt Line 473: %{_bindir}/vdsm-tool set-saslpasswd
-- To view, visit http://gerrit.ovirt.org/8500 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I4ed316fedbf2e4d7e5bf741b7c77a39704994ae7 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Ayal Baron abaron@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Ewoud Kohl van Wijngaarden ewoud@kohlvanwijngaarden.nl Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Ryan Harper ryanh@us.ibm.com
Alon Bar-Lev has posted comments on this change.
Change subject: packaging: move /rhev/data-center to /var/lib/vdsm/data-center ......................................................................
Patch Set 4: (1 inline comment)
.................................................... File vdsm.spec.in Line 465: if [ -d /rhev/data-center -a -z "$(ls %{vdsmrepodir}/hsm-tasks)" ]; then Line 466: mv /rhev/data-center %{vdsmrepodir}/data-center.new && \ Line 467: rm -rf %{vdsmrepodir} && Line 468: mv %{vdsmrepodir}.new %{vdsmrepodir} && Line 469: rm -rf /rhev Not sure it worth leaving trash behind. Line 470: fi Line 471: Line 472: # set the vdsm "secret" password for libvirt Line 473: %{_bindir}/vdsm-tool set-saslpasswd
-- To view, visit http://gerrit.ovirt.org/8500 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I4ed316fedbf2e4d7e5bf741b7c77a39704994ae7 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Ayal Baron abaron@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Ewoud Kohl van Wijngaarden ewoud@kohlvanwijngaarden.nl Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Ryan Harper ryanh@us.ibm.com
Ewoud Kohl van Wijngaarden has posted comments on this change.
Change subject: packaging: move /rhev/data-center to /var/lib/vdsm/data-center ......................................................................
Patch Set 4: (1 inline comment)
Could you also update the comment in vdsm/storage/sp.py line 452 (v4.10.1-87-g8fd1e69 here according to git describe):
# Cleanup links to domains under /rhev/datacenter/poolName
.................................................... File vdsm.spec.in Line 465: if [ -d /rhev/data-center -a -z "$(ls %{vdsmrepodir}/hsm-tasks)" ]; then Line 466: mv /rhev/data-center %{vdsmrepodir}/data-center.new && \ Line 467: rm -rf %{vdsmrepodir} && Line 468: mv %{vdsmrepodir}.new %{vdsmrepodir} && Line 469: rm -rf /rhev Assuming there is nothing the user put there, an rmdir should be just as effective. If it's not empty, it must be user data. Personally I rather leave some (user) trash behind than remove some user data. Line 470: fi Line 471: Line 472: # set the vdsm "secret" password for libvirt Line 473: %{_bindir}/vdsm-tool set-saslpasswd
-- To view, visit http://gerrit.ovirt.org/8500 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I4ed316fedbf2e4d7e5bf741b7c77a39704994ae7 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Ayal Baron abaron@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Ewoud Kohl van Wijngaarden ewoud@kohlvanwijngaarden.nl Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Ryan Harper ryanh@us.ibm.com
Ewoud Kohl van Wijngaarden has posted comments on this change.
Change subject: packaging: move /rhev/data-center to /var/lib/vdsm/data-center ......................................................................
Patch Set 5: I would prefer that you didn't submit this
(1 inline comment)
.................................................... File vdsm.spec.in Line 465: if [ -d /rhev/data-center -a -z "$(ls %{vdsmrepodir}/hsm-tasks)" ]; then Line 466: mv /rhev/data-center %{vdsmrepodir}/data-center.new && \ Line 467: rm -rf %{vdsmrepodir} && Line 468: mv %{vdsmrepodir}.new %{vdsmrepodir} && Line 469: rmdir /rhev I think --ignore-fail-on-non-empty is an important parameter here to suppress the error in case it is non-empty. Line 470: fi Line 471: Line 472: # set the vdsm "secret" password for libvirt Line 473: %{_bindir}/vdsm-tool set-saslpasswd
-- To view, visit http://gerrit.ovirt.org/8500 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I4ed316fedbf2e4d7e5bf741b7c77a39704994ae7 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Ayal Baron abaron@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Ewoud Kohl van Wijngaarden ewoud@kohlvanwijngaarden.nl Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Ryan Harper ryanh@us.ibm.com
Alon Bar-Lev has posted comments on this change.
Change subject: packaging: move /rhev/data-center to /var/lib/vdsm/data-center ......................................................................
Patch Set 5: (1 inline comment)
.................................................... File vdsm.spec.in Line 465: if [ -d /rhev/data-center -a -z "$(ls %{vdsmrepodir}/hsm-tasks)" ]; then Line 466: mv /rhev/data-center %{vdsmrepodir}/data-center.new && \ Line 467: rm -rf %{vdsmrepodir} && Line 468: mv %{vdsmrepodir}.new %{vdsmrepodir} && Line 469: rmdir /rhev I don't like these non standard parameters. Line 470: fi Line 471: Line 472: # set the vdsm "secret" password for libvirt Line 473: %{_bindir}/vdsm-tool set-saslpasswd
-- To view, visit http://gerrit.ovirt.org/8500 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I4ed316fedbf2e4d7e5bf741b7c77a39704994ae7 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Ayal Baron abaron@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Ewoud Kohl van Wijngaarden ewoud@kohlvanwijngaarden.nl Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Ryan Harper ryanh@us.ibm.com
Ewoud Kohl van Wijngaarden has posted comments on this change.
Change subject: packaging: move /rhev/data-center to /var/lib/vdsm/data-center ......................................................................
Patch Set 6: Looks good to me, but someone else must approve
-- To view, visit http://gerrit.ovirt.org/8500 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I4ed316fedbf2e4d7e5bf741b7c77a39704994ae7 Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Ayal Baron abaron@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Ewoud Kohl van Wijngaarden ewoud@kohlvanwijngaarden.nl Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Ryan Harper ryanh@us.ibm.com
Ryan Harper has posted comments on this change.
Change subject: packaging: move /rhev/data-center to /var/lib/vdsm/data-center ......................................................................
Patch Set 6: I would prefer that you didn't submit this
(2 inline comments)
.................................................... File tests/getAllVolumesTests.py Line 61: Line 62: Input file name: 'glob_<sdName>.out Line 63: Input file format: str(glob.glob(<imgsDir>)) Line 64: When Line 65: <imgsDir> = @vdsmlibdir@/data-center/mnt/<mntPoint>/ I think we have to fetch this via vdsm.config. AFAIK, only files with the .in suffix get sed to apply the @FOO@ replacement. Line 66: <sdName>/images/*.meta Line 67: """ Line 68: sdPath, globExp = volMetaPattern.split('/images') Line 69: sdHead, sdName = os.path.split(sdPath)
.................................................... File vdsm.spec.in Line 463: %post Line 464: # upgrade old locations Line 465: if [ -d /rhev/data-center -a -z "$(ls %{vdsmrepodir}/hsm-tasks)" ]; then Line 466: mv /rhev/data-center %{vdsmrepodir}/data-center.new && \ Line 467: rm -rf %{vdsmrepodir} && Looks like you just wiped out %{vdsmrepodir}/data-center.new which was the data from /rhev/data-center ...
Is that what we're doing here? I'm assuming by upgrade, you mean to retain any existing data? Line 468: mv %{vdsmrepodir}.new %{vdsmrepodir} && Line 469: ( rmdir /rhev || : ) Line 470: fi Line 471:
-- To view, visit http://gerrit.ovirt.org/8500 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I4ed316fedbf2e4d7e5bf741b7c77a39704994ae7 Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Ayal Baron abaron@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Ewoud Kohl van Wijngaarden ewoud@kohlvanwijngaarden.nl Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Ryan Harper ryanh@us.ibm.com
Ewoud Kohl van Wijngaarden has posted comments on this change.
Change subject: packaging: move /rhev/data-center to /var/lib/vdsm/data-center ......................................................................
Patch Set 6: I would prefer that you didn't submit this
(2 inline comments)
.................................................... File tests/getAllVolumesTests.py Line 61: Line 62: Input file name: 'glob_<sdName>.out Line 63: Input file format: str(glob.glob(<imgsDir>)) Line 64: When Line 65: <imgsDir> = @vdsmlibdir@/data-center/mnt/<mntPoint>/ It has been noted in previous patches that it's just a comment and the developer should do manual replacements in h(is|er) head. I agree that's a good enough solution. Line 66: <sdName>/images/*.meta Line 67: """ Line 68: sdPath, globExp = volMetaPattern.split('/images') Line 69: sdHead, sdName = os.path.split(sdPath)
.................................................... File vdsm.spec.in Line 463: %post Line 464: # upgrade old locations Line 465: if [ -d /rhev/data-center -a -z "$(ls %{vdsmrepodir}/hsm-tasks)" ]; then Line 466: mv /rhev/data-center %{vdsmrepodir}/data-center.new && \ Line 467: rm -rf %{vdsmrepodir} && Good catch. Line 468: mv %{vdsmrepodir}.new %{vdsmrepodir} && Line 469: ( rmdir /rhev || : ) Line 470: fi Line 471:
-- To view, visit http://gerrit.ovirt.org/8500 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I4ed316fedbf2e4d7e5bf741b7c77a39704994ae7 Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Ayal Baron abaron@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Ewoud Kohl van Wijngaarden ewoud@kohlvanwijngaarden.nl Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Ryan Harper ryanh@us.ibm.com
Alon Bar-Lev has posted comments on this change.
Change subject: packaging: move /rhev/data-center to /var/lib/vdsm/data-center ......................................................................
Patch Set 6: (1 inline comment)
.................................................... File vdsm.spec.in Line 463: %post Line 464: # upgrade old locations Line 465: if [ -d /rhev/data-center -a -z "$(ls %{vdsmrepodir}/hsm-tasks)" ]; then Line 466: mv /rhev/data-center %{vdsmrepodir}/data-center.new && \ Line 467: rm -rf %{vdsmrepodir} && This happens only if /rhev/data-center exists and it won't after upgrade. Line 468: mv %{vdsmrepodir}.new %{vdsmrepodir} && Line 469: ( rmdir /rhev || : ) Line 470: fi Line 471:
-- To view, visit http://gerrit.ovirt.org/8500 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I4ed316fedbf2e4d7e5bf741b7c77a39704994ae7 Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Ayal Baron abaron@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Ewoud Kohl van Wijngaarden ewoud@kohlvanwijngaarden.nl Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Ryan Harper ryanh@us.ibm.com
Ewoud Kohl van Wijngaarden has posted comments on this change.
Change subject: packaging: move /rhev/data-center to /var/lib/vdsm/data-center ......................................................................
Patch Set 6: (1 inline comment)
.................................................... File vdsm.spec.in Line 463: %post Line 464: # upgrade old locations Line 465: if [ -d /rhev/data-center -a -z "$(ls %{vdsmrepodir}/hsm-tasks)" ]; then Line 466: mv /rhev/data-center %{vdsmrepodir}/data-center.new && \ Line 467: rm -rf %{vdsmrepodir} && I think Ryan is correct. You move /rhev/data-center to /var/lib/vdsm/data-center/data-center.new where I think you meant /var/lib/vdsm/data-center.new (i.e. %{vdsmrepodir}.new instead of %{vdsmrepodir}/data-center.new). Also the \ is redundant here and inconsistent with the following lines, but that's minor. Line 468: mv %{vdsmrepodir}.new %{vdsmrepodir} && Line 469: ( rmdir /rhev || : ) Line 470: fi Line 471:
-- To view, visit http://gerrit.ovirt.org/8500 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I4ed316fedbf2e4d7e5bf741b7c77a39704994ae7 Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Ayal Baron abaron@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Ewoud Kohl van Wijngaarden ewoud@kohlvanwijngaarden.nl Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Ryan Harper ryanh@us.ibm.com
Alon Bar-Lev has abandoned this change.
Change subject: packaging: move /rhev/data-center to /var/lib/vdsm/data-center ......................................................................
Patch Set 6: Abandoned
Storage should have taken the lead.
-- To view, visit http://gerrit.ovirt.org/8500 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: abandon Gerrit-Change-Id: I4ed316fedbf2e4d7e5bf741b7c77a39704994ae7 Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Alon Bar-Lev alonbl@redhat.com Gerrit-Reviewer: Ayal Baron abaron@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Ewoud Kohl van Wijngaarden ewoud@kohlvanwijngaarden.nl Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Ryan Harper ryanh@us.ibm.com
vdsm-patches@lists.fedorahosted.org