Add support for glusterd wrt #345427 by Thomas Merkel <tm@core.io>. All work done by Ultrabug <ultrabug@ultrabug.net>. Drop old

Package-Manager: portage-2.1.9.24/cvs/Linux x86_64

4 files changed, 70 insertions, 20 deletions

diff --git a/sys-cluster/glusterfs/ChangeLog b/sys-cluster/glusterfs/ChangeLog
index 7143b4f99f5e..3a2d0785e75b 100644
--- a/sys-cluster/glusterfs/ChangeLog
+++ b/sys-cluster/glusterfs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/glusterfs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.12 2010/10/14 17:09:17 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.13 2010/11/21 18:56:20 xarthisius Exp $
+
+*glusterfs-3.1.0-r1 (21 Nov 2010)
+
+  21 Nov 2010; Kacper Kowalik <xarthisius@gentoo.org> -glusterfs-3.1.0.ebuild,
+  +glusterfs-3.1.0-r1.ebuild, +files/glusterd.initd:
+  Add support for glusterd wrt #345427 by Thomas Merkel <tm@core.io>. All work
+  done by Ultrabug <ultrabug@ultrabug.net>. Drop old
 
 *glusterfs-3.1.0 (14 Oct 2010)
 
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 2c0bd96b0cfa..dd9cd7e77763 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -2,21 +2,22 @@
 Hash: SHA1
 
 AUX 50glusterfs-mode-gentoo.el 169 RMD160 406c0dd2d79d054f059fcae29961fb6b7950e367 SHA1 5cb956b94b2704d244a4031093305de3243a7a86 SHA256 2467d044665d16dd95f78f7a7a104099ce00849cd0a2a86b110fe4c91b316a9d
+AUX glusterd.initd 833 RMD160 e26b0924ede76d50625c46c051cfd50d663277d7 SHA1 d8c456643d15f7605ec97b9ca1c21d9adc60e41b SHA256 cd6d277236a9bc22cb3872269d1454c2c5a140cea6a9badb3b6ba2d88ae52232
 AUX glusterfs-2.0.8-docdir.patch 1644 RMD160 6961d29068c6b556f195615b789188f28e80b181 SHA1 4ff29870fae0039f390945ccaee3bcd25c87ae70 SHA256 d2922af3e15faae8ae06102a757b158b510b27cc11ad9ffe643ca67e2046ba07
 AUX glusterfs-3.1.0-parallel-build.patch 659 RMD160 a5127f529387a0f9a543c666d139beac6f8b306c SHA1 bf1d566d9b306b44f0a26db7d2c9ddaa10f8a872 SHA256 7aeb616d41bf898d1df2cf4773802e88e41e13271184eab03c46034a9c22027c
 AUX glusterfs.confd 129 RMD160 ba0a6f22452b70cb3a7eb6f3bdd2b06e7c441b04 SHA1 c83f9e5c0becaf798b30b1709ea7086b56dd2992 SHA256 a9023ba1112ceb4597c654228f0beb0053ed695aeb32c65e0749a7157fab563d
 AUX glusterfs.initd 3134 RMD160 6606d3c3ee825e1af9624d66f5a46e30270e73a3 SHA1 68fcfa5b64dc6b133036b645c64ba75a7afbc126 SHA256 ffa622d26add72dafc1b1f8e6de716b14a6d99911888a344dc7d236fb7667d6e
 AUX glusterfs.vim 139 RMD160 17a4589550934fd8fd3523d0075af7686fc8f905 SHA1 8aa880c49a7bd1a0e185539acede53840b138746 SHA256 f214c1c8a01c9184b535fa7ae307200a8a1dc83fd42e92bdd57a7b1cae1dc099
 DIST glusterfs-3.1.0.tar.gz 2043401 RMD160 96f8944cfe41f7d5a7971010ea47283c26998821 SHA1 b783b7be68f890684fbdc45b96bc30b092de692c SHA256 47c7d8f53f46c0a9c77bad7c1e098b63be2a9c128b379e409c81a1f37ec17da7
-EBUILD glusterfs-3.1.0.ebuild 3239 RMD160 0741ef3bb4630e9e05b5ecdf43e830b2890c9677 SHA1 909091cd21c9c03557e66e25632c5f3ba866845f SHA256 52ebd46d341c069276d8680c9cc611964a54c4788a0f2e21147d2c300001ac8d
-MISC ChangeLog 2461 RMD160 1271b297605cb794bab32e39d3763773d932a680 SHA1 36213cb633e36711f348f573e029c4b4b1e96746 SHA256 d5d3b9789ab3e805c8ef5a447c08cc62dd49dde24ea4ff1f5c00cde7aa577a49
+EBUILD glusterfs-3.1.0-r1.ebuild 3540 RMD160 4910b9a731ae5db7a5d345ebe6c052e4a5ba9ebe SHA1 4dcc90fa810bce8de03718ab02d612faee8b4115 SHA256 7796d8cbf9968615fe3c14ab10b5f20fd311fd44962244106548a22feedd1232
+MISC ChangeLog 2761 RMD160 add3963d240fabf8b3666d2fea4790a9d8ff7e46 SHA1 5cba4bfafd27749a407918df8718f4ef4b608e6c SHA256 294152f855ab737149b5cf8909812161f953be8907c6e588a9703c6436397a27
 MISC metadata.xml 842 RMD160 2e8fccda5c50a0c64caf17ae528b59d4c41f5373 SHA1 9f10069f096be61a347ccdccc21f30a7411e4b5f SHA256 2a717e590d518af4d7eec71b92cacece17c0cb0c3283f37793e093b2def0ae04
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iJwEAQECAAYFAky3OUkACgkQIiMqcbOVdxRJ8AP/ZKEhVir1jgpGwMO/uAK1XOWD
-iCXcvkqc4v041NUI1JNCyi70Fgd8/wBDDY6Ad0E9EwGaOeo92NUNvgIFv5Wkz+JV
-0OZGWwhL7o9cCciRyOhI5MfcyVyymLUQz/C++qyrGHvfECdWSKLY+UojJcBYn8A4
-Z1fPQER+gEGzssDEZmo=
-=ATV/
+iJwEAQECAAYFAkzpa10ACgkQIiMqcbOVdxQtVgP+KxkxjgcEFVbpN7JlidRJvLLz
+y0ss3O5qrNPiDAtVXoi+rqnjUxjG6wQxK3Rm4MHHOqyYfpo7JM9sQL1Aoa7P5ocA
+2Il5NC/sFpAfF4ZQ6vvZOhQ7yyyBS8UZIG8tIXguE8fy24IdSOBz+6SzaOfe7/g9
+0pW6I9iaOAqDW5k6rzg=
+=UpX3
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/glusterfs/files/glusterd.initd b/sys-cluster/glusterfs/files/glusterd.initd
new file mode 100644
index 000000000000..1cd09f9d691b
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterd.initd
@@ -0,0 +1,36 @@
+#!/sbin/runscript
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/files/glusterd.initd,v 1.1 2010/11/21 18:56:20 xarthisius Exp $
+
+PIDFILE=/var/run/glusterd.pid
+
+depend() {
+	need net
+	before netmount
+}
+
+start() {
+	ebegin "Starting glusterd"
+	start-stop-daemon --start -q --exec /usr/sbin/glusterd \
+		--pidfile "${PIDFILE}" --make-pidfile --background \
+		-- -N
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping glusterd"
+	start-stop-daemon --stop -q --pidfile "${PIDFILE}"
+	eindent
+
+	einfo "Unmounting GlusterFS filesystems"
+	umount -t fuse.glusterfs -a
+
+	einfo "Killing remaining GlusterFS processes"
+	for PID in $(find /var/lib/glusterd/ -type f -name "*.pid" -exec cat {} \;); do
+		kill "${PID}"
+	done
+
+	eoutdent
+	eend $?
+}
diff --git a/sys-cluster/glusterfs/glusterfs-3.1.0.ebuild b/sys-cluster/glusterfs/glusterfs-3.1.0-r1.ebuild
index 669bdb09f9f1..a49d690a1691 100644
--- a/sys-cluster/glusterfs/glusterfs-3.1.0.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-3.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.1.0.ebuild,v 1.1 2010/10/14 17:09:17 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.1.0-r1.ebuild,v 1.1 2010/11/21 18:56:20 xarthisius Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ SRC_URI="http://ftp.gluster.com/pub/gluster/${PN}/$(get_version_component_range
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="emacs +fuse infiniband static-libs vim-syntax extras"
+IUSE="emacs extras +fuse infiniband static-libs vim-syntax"
 
 DEPEND="emacs? ( virtual/emacs )
 		fuse? ( >=sys-fs/fuse-2.7.0 )
@@ -24,7 +24,8 @@ SITEFILE="50${PN}-mode-gentoo.el"
 
 src_prepare() {
 	epatch "${FILESDIR}/${P}-parallel-build.patch" \
-		"${FILESDIR}/${PN}-2.0.8-docdir.patch"
+		"${FILESDIR}/${PN}-2.0.8-docdir.patch" \
+		"${FILESDIR}/glusterd-workdir.patch"
 	eautoreconf
 }
 
@@ -67,29 +68,34 @@ src_install() {
 	dodoc AUTHORS ChangeLog NEWS README THANKS || die
 
 	newinitd "${FILESDIR}/${PN}.initd" glusterfsd || die
+	newinitd "${FILESDIR}/glusterd.initd" glusterd || die
 	newconfd "${FILESDIR}/${PN}.confd" glusterfsd || die
 
 	keepdir /var/log/${PN} || die
+	keepdir /var/lib/glusterd || die
 }
 
 pkg_postinst() {
-	elog "The glusterfs startup script can be multiplexed."
-	elog "The default startup script uses /etc/conf.d/glusterfs to configure the"
-	elog "separate service.  To create additional instances of the glusterfs service"
-	elog "simply create a symlink to the glusterfs startup script."
+	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"
-	echo
-	elog "You can mount exported GlusterFS filesystems through /etc/fstab instead of"
-	elog "through a startup script instance.  For more information visit:"
+	elog
+	elog "For more information on how to mount exported GlusterFS filesystems visit:"
 	elog "http://www.gluster.org/docs/index.php/Mounting_a_GlusterFS_Volume"
-	echo
+	elog
 	elog "If you are upgrading from glusterfs 3.0.x please read:"
 	elog "http://www.gluster.com/community/documentation/index.php/Gluster_3.0_to_3.1_Upgrade_Guide"
-	echo
+	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."