From 661c8e36f9f57e1be8577b02833daf2d01e07cc7 Mon Sep 17 00:00:00 2001 From: Tiziano Müller Date: Wed, 25 Jun 2014 15:48:20 +0000 Subject: Revision bump to pull in yet another important fix for 3.4.4 (client crash after rebalance, upstream bug #961615). (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x1A5D023975B0583D!) --- sys-cluster/glusterfs/ChangeLog | 10 +- ...-Don-t-do-extra-unref-in-dht-migration-ch.patch | 48 +++++++ sys-cluster/glusterfs/glusterfs-3.4.4-r1.ebuild | 148 -------------------- sys-cluster/glusterfs/glusterfs-3.4.4-r2.ebuild | 149 +++++++++++++++++++++ 4 files changed, 206 insertions(+), 149 deletions(-) create mode 100644 sys-cluster/glusterfs/files/glusterfs-3.4.4-cluster-dht-Don-t-do-extra-unref-in-dht-migration-ch.patch delete mode 100644 sys-cluster/glusterfs/glusterfs-3.4.4-r1.ebuild create mode 100644 sys-cluster/glusterfs/glusterfs-3.4.4-r2.ebuild (limited to 'sys-cluster') diff --git a/sys-cluster/glusterfs/ChangeLog b/sys-cluster/glusterfs/ChangeLog index 302fb7b97fbf..d92ebf76aaa3 100644 --- a/sys-cluster/glusterfs/ChangeLog +++ b/sys-cluster/glusterfs/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sys-cluster/glusterfs # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.56 2014/06/25 09:54:31 dev-zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.57 2014/06/25 15:48:20 dev-zero Exp $ + +*glusterfs-3.4.4-r2 (25 Jun 2014) + + 25 Jun 2014; Tiziano Müller +files/glusterfs-3.4.4-clust + er-dht-Don-t-do-extra-unref-in-dht-migration-ch.patch, + +glusterfs-3.4.4-r2.ebuild, -glusterfs-3.4.4-r1.ebuild: + Revision bump to pull in yet another important fix for 3.4.4 (client crash + after rebalance, upstream bug #961615). *glusterfs-3.4.4-r1 (25 Jun 2014) diff --git a/sys-cluster/glusterfs/files/glusterfs-3.4.4-cluster-dht-Don-t-do-extra-unref-in-dht-migration-ch.patch b/sys-cluster/glusterfs/files/glusterfs-3.4.4-cluster-dht-Don-t-do-extra-unref-in-dht-migration-ch.patch new file mode 100644 index 000000000000..c26085a9dfe7 --- /dev/null +++ b/sys-cluster/glusterfs/files/glusterfs-3.4.4-cluster-dht-Don-t-do-extra-unref-in-dht-migration-ch.patch @@ -0,0 +1,48 @@ +From 2b789331dc933b186360fc8cbffb06289ee60ee9 Mon Sep 17 00:00:00 2001 +From: Vijay Bellur +Date: Tue, 10 Jun 2014 22:21:28 +0530 +Subject: [PATCH 1/3] cluster/dht: Don't do extra unref in dht-migration checks + +Problem: +syncop_open used to perform a ref in syncop_open_cbk so the extra +unref was needed but now syncop_open_cbk does not take a ref so no +need to do extra unref. + +Fix: +remove the extra fd_unref and let dht_local_wipe do the final unref. + +Change-Id: Ibe8f9a678d456a0c7bff175306068b5cd297ecc4 +BUG: 961615 +Signed-off-by: Pranith Kumar K +Signed-off-by: Vijay Bellur +Reviewed-on: http://review.gluster.org/8029 +Tested-by: Gluster Build System +Tested-by: Joe Julian +Reviewed-by: Kaleb KEITHLEY +--- + xlators/cluster/dht/src/dht-helper.c | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +diff --git a/xlators/cluster/dht/src/dht-helper.c b/xlators/cluster/dht/src/dht-helper.c +index ef29e3f..dd8dc49 100644 +--- a/xlators/cluster/dht/src/dht-helper.c ++++ b/xlators/cluster/dht/src/dht-helper.c +@@ -802,13 +802,10 @@ dht_migration_complete_check_task (void *data) + if (!local->fd) + goto out; + /* once we detect the migration complete, the fd-ctx is no more +- required.. delete the ctx, and do one extra 'fd_unref' for open fd */ ++ required.. delete the ctx */ + ret = fd_ctx_del (local->fd, this, NULL); +- if (!ret) { +- fd_unref (local->fd); +- ret = 0; ++ if (!ret) + goto out; +- } + + /* perform open as root:root. There is window between linkfile + * creation(root:root) and setattr with the correct uid/gid +-- +1.9.2 + diff --git a/sys-cluster/glusterfs/glusterfs-3.4.4-r1.ebuild b/sys-cluster/glusterfs/glusterfs-3.4.4-r1.ebuild deleted file mode 100644 index edea95e962e1..000000000000 --- a/sys-cluster/glusterfs/glusterfs-3.4.4-r1.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.4.4-r1.ebuild,v 1.1 2014/06/25 09:54:31 dev-zero Exp $ - -EAPI=5 - -PYTHON_COMPAT=( python{2_6,2_7} ) -AUTOTOOLS_AUTORECONF=1 - -inherit autotools-utils elisp-common eutils multilib python-single-r1 versionator - -DESCRIPTION="GlusterFS is a powerful network/cluster filesystem" -HOMEPAGE="http://www.gluster.org/" -SRC_URI="http://download.gluster.org/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz" - -LICENSE="|| ( GPL-2 LGPL-3+ )" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="bd-xlator debug emacs extras +fuse +georeplication infiniband static-libs systemtap vim-syntax" - -REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="bd-xlator? ( sys-fs/lvm2 ) - emacs? ( virtual/emacs ) - fuse? ( >=sys-fs/fuse-2.7.0 ) - georeplication? ( ${PYTHON_DEPS} ) - infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm ) - systemtap? ( dev-util/systemtap ) - sys-libs/readline - dev-libs/libaio - dev-libs/libxml2 - dev-libs/openssl - || ( sys-libs/glibc sys-libs/argp-standalone )" -DEPEND="${RDEPEND} - virtual/pkgconfig - sys-devel/bison - sys-devel/flex" - -SITEFILE="50${PN}-mode-gentoo.el" - -PATCHES=( - "${FILESDIR}/${PN}-3.4.0-silent_rules.patch" - "${FILESDIR}/${PN}-3.4.0-build-shared-only.patch" - "${FILESDIR}/${PN}-3.4.4-fuse-fix-memory-leak-in-fuse_getxattr.patch" -) - -DOCS=( AUTHORS ChangeLog NEWS README THANKS ) - -# Maintainer notes: -# * The build system will always configure & build argp-standalone but it'll never use it -# if the argp.h header is found in the system. Which should be the case with -# glibc or if argp-standalone is installed. - -pkg_setup() { - use georeplication && python-single-r1_pkg_setup -} - -src_configure() { - local myeconfargs=( - --disable-dependency-tracking - --disable-silent-rules - --disable-fusermount - $(use_enable debug) - $(use_enable bd-xlator ) - $(use_enable fuse fuse-client) - $(use_enable georeplication) - $(use_enable infiniband ibverbs) - $(use_enable static-libs static) - $(use_enable systemtap) - --docdir=/usr/share/doc/${PF} - --localstatedir=/var - ) - autotools-utils_src_configure -} - -src_compile() { - autotools-utils_src_compile - - use emacs && elisp-compile extras/glusterfs-mode.el -} - -src_install() { - autotools-utils_src_install - - rm "${D}/etc/glusterfs/glusterfs-logrotate" || die "removing false logrotate failed" - insinto /etc/logrotate.d - newins "${FILESDIR}"/glusterfs.logrotate glusterfs - - if use emacs ; then - elisp-install ${PN} extras/glusterfs-mode.el* - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi - - if use vim-syntax ; then - insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim - insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim - fi - - if use extras ; then - sed -i -e "s|quota-remove-xattr.sh|${PN}-quota-remove-xattr|" extras/quota-metadata-cleanup.sh || die "sed failed" - for e in backend-xattr-sanitize backend-cleanup migrate-unify-to-distribute quota-metadata-cleanup quota-remove-xattr ; do - newbin extras/${e}.sh ${PN}-${e} - done - newbin extras/disk_usage_sync.sh ${PN}-disk-usage-sync - fi - - newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd - newinitd "${FILESDIR}/glusterd-r1.initd" glusterd - newconfd "${FILESDIR}/${PN}.confd" glusterfsd - - keepdir /var/log/${PN} - keepdir /var/lib/glusterd - - # QA - rm -rf "${ED}/var/run/" - - use georeplication && python_fix_shebang "${ED}" -} - -pkg_postinst() { - elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your" - elog "volumes dynamically. To do so, simply use the gluster CLI after running:" - elog " /etc/init.d/glusterd start" - elog - elog "For static configurations, the glusterfsd startup script can be multiplexed." - elog "The default startup script uses /etc/conf.d/glusterfsd to configure the" - elog "separate service. To create additional instances of the glusterfsd service" - elog "simply create a symlink to the glusterfsd startup script." - elog - elog "Example:" - elog " # ln -s glusterfsd /etc/init.d/glusterfsd2" - elog " # ${EDITOR} /etc/glusterfs/glusterfsd2.vol" - elog "You can now treat glusterfsd2 like any other service" - elog - ewarn "You need to use a ntp client to keep the clocks synchronized across all" - ewarn "of your servers. Setup a NTP synchronizing service before attempting to" - ewarn "run GlusterFS." - - elog - elog "If you are upgrading from a previous version of ${PN}, please read:" - elog " https://vbellur.wordpress.com/2013/07/15/upgrading-to-glusterfs-3-4/" - - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/sys-cluster/glusterfs/glusterfs-3.4.4-r2.ebuild b/sys-cluster/glusterfs/glusterfs-3.4.4-r2.ebuild new file mode 100644 index 000000000000..4c25f5743797 --- /dev/null +++ b/sys-cluster/glusterfs/glusterfs-3.4.4-r2.ebuild @@ -0,0 +1,149 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.4.4-r2.ebuild,v 1.1 2014/06/25 15:48:20 dev-zero Exp $ + +EAPI=5 + +PYTHON_COMPAT=( python{2_6,2_7} ) +AUTOTOOLS_AUTORECONF=1 + +inherit autotools-utils elisp-common eutils multilib python-single-r1 versionator + +DESCRIPTION="GlusterFS is a powerful network/cluster filesystem" +HOMEPAGE="http://www.gluster.org/" +SRC_URI="http://download.gluster.org/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz" + +LICENSE="|| ( GPL-2 LGPL-3+ )" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="bd-xlator debug emacs extras +fuse +georeplication infiniband static-libs systemtap vim-syntax" + +REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND="bd-xlator? ( sys-fs/lvm2 ) + emacs? ( virtual/emacs ) + fuse? ( >=sys-fs/fuse-2.7.0 ) + georeplication? ( ${PYTHON_DEPS} ) + infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm ) + systemtap? ( dev-util/systemtap ) + sys-libs/readline + dev-libs/libaio + dev-libs/libxml2 + dev-libs/openssl + || ( sys-libs/glibc sys-libs/argp-standalone )" +DEPEND="${RDEPEND} + virtual/pkgconfig + sys-devel/bison + sys-devel/flex" + +SITEFILE="50${PN}-mode-gentoo.el" + +PATCHES=( + "${FILESDIR}/${PN}-3.4.0-silent_rules.patch" + "${FILESDIR}/${PN}-3.4.0-build-shared-only.patch" + "${FILESDIR}/${PN}-3.4.4-fuse-fix-memory-leak-in-fuse_getxattr.patch" + "${FILESDIR}/${PN}-3.4.4-cluster-dht-Don-t-do-extra-unref-in-dht-migration-ch.patch" +) + +DOCS=( AUTHORS ChangeLog NEWS README THANKS ) + +# Maintainer notes: +# * The build system will always configure & build argp-standalone but it'll never use it +# if the argp.h header is found in the system. Which should be the case with +# glibc or if argp-standalone is installed. + +pkg_setup() { + use georeplication && python-single-r1_pkg_setup +} + +src_configure() { + local myeconfargs=( + --disable-dependency-tracking + --disable-silent-rules + --disable-fusermount + $(use_enable debug) + $(use_enable bd-xlator ) + $(use_enable fuse fuse-client) + $(use_enable georeplication) + $(use_enable infiniband ibverbs) + $(use_enable static-libs static) + $(use_enable systemtap) + --docdir=/usr/share/doc/${PF} + --localstatedir=/var + ) + autotools-utils_src_configure +} + +src_compile() { + autotools-utils_src_compile + + use emacs && elisp-compile extras/glusterfs-mode.el +} + +src_install() { + autotools-utils_src_install + + rm "${D}/etc/glusterfs/glusterfs-logrotate" || die "removing false logrotate failed" + insinto /etc/logrotate.d + newins "${FILESDIR}"/glusterfs.logrotate glusterfs + + if use emacs ; then + elisp-install ${PN} extras/glusterfs-mode.el* + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + fi + + if use vim-syntax ; then + insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim + insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim + fi + + if use extras ; then + sed -i -e "s|quota-remove-xattr.sh|${PN}-quota-remove-xattr|" extras/quota-metadata-cleanup.sh || die "sed failed" + for e in backend-xattr-sanitize backend-cleanup migrate-unify-to-distribute quota-metadata-cleanup quota-remove-xattr ; do + newbin extras/${e}.sh ${PN}-${e} + done + newbin extras/disk_usage_sync.sh ${PN}-disk-usage-sync + fi + + newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd + newinitd "${FILESDIR}/glusterd-r1.initd" glusterd + newconfd "${FILESDIR}/${PN}.confd" glusterfsd + + keepdir /var/log/${PN} + keepdir /var/lib/glusterd + + # QA + rm -rf "${ED}/var/run/" + + use georeplication && python_fix_shebang "${ED}" +} + +pkg_postinst() { + elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your" + elog "volumes dynamically. To do so, simply use the gluster CLI after running:" + elog " /etc/init.d/glusterd start" + elog + elog "For static configurations, the glusterfsd startup script can be multiplexed." + elog "The default startup script uses /etc/conf.d/glusterfsd to configure the" + elog "separate service. To create additional instances of the glusterfsd service" + elog "simply create a symlink to the glusterfsd startup script." + elog + elog "Example:" + elog " # ln -s glusterfsd /etc/init.d/glusterfsd2" + elog " # ${EDITOR} /etc/glusterfs/glusterfsd2.vol" + elog "You can now treat glusterfsd2 like any other service" + elog + ewarn "You need to use a ntp client to keep the clocks synchronized across all" + ewarn "of your servers. Setup a NTP synchronizing service before attempting to" + ewarn "run GlusterFS." + + elog + elog "If you are upgrading from a previous version of ${PN}, please read:" + elog " https://vbellur.wordpress.com/2013/07/15/upgrading-to-glusterfs-3-4/" + + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} -- cgit v1.2.3-65-gdbad