Re: [gluster-packaging] glusterfs-3.11.0 released

2017-06-30 Thread Patrick Matthäi 

Am 02.06.2017 um 13:49 schrieb Niels de Vos:
> On Thu, Jun 01, 2017 at 10:55:34AM +0200, Patrick Matthäi wrote:
>
>> 1) gluster group: shouldn't the init script chgrp the statedump dir on
>> starting glusterfs? /run (or /var/run) are on most systems on tmpfs
> We use a tmpfiles.d/ snippet for that on systemd environments. Older RPM
> distributions do not have /var/run as tmpfs and the owner/group are
> properties of the RPM contents.

Thanks for your hint. I have added extras/run-gluster.tmpfiles.in to the
packaging.


>
>> 2) Patch 02-init-remote-fs.diff: please merge it
> This introduces a dependency for starting the glusterd management
> daemon. Before starting the daemon, the $remote_fs service(s) need to
> start. This will be a problem for fuse.glusterfs mountpoints that are
> listed in /etc/fstab. Can you explain why this is not a problem or if it
> is something that was missed?
I have dropped it now, too. Looks like the requirement on $remote_fs
(for a mounted /usr) is obsolete with Debian Stretch now.


>> 4) Patch 03-shell-script-syntax.diff: it fixes syntax errors with dash
>> and bash. To be checked by you is my change of $b(/.*)? to just $b -
>> cant recognize what do you try there. It fails in dash and bash

This "$b(/.*)?" issue is still there:

E: glusterfs-server: shell-script-fails-syntax-check
var/lib/glusterd/hooks/1/create/post/S10selinux-label-brick.sh
N:
N:Running this shell script with the shell's -n option set fails, which
N:means that the script has syntax errors. The most common cause of this
N:problem is a script expecting /bin/sh to be bash checked on a system
N:using dash as /bin/sh.
N:
N:Run e.g. sh -n yourscript to see the errors yourself.

me@srv1:~/build/glusterfs-3.11.1$ LC_ALL=C bash -n
./extras/hook-scripts/create/post/S10selinux-label-brick.sh
./extras/hook-scripts/create/post/S10selinux-label-brick.sh: line 46:
syntax error near unexpected token `('
./extras/hook-scripts/create/post/S10selinux-label-brick.sh: line 46:
`semanage fcontext --add -t glusterd_brick_t -r s0 $b(/.*)?'

me@srv1:~/build/glusterfs-3.11.1$ LC_ALL=C dash -n
./extras/hook-scripts/create/post/S10selinux-label-brick.sh
./extras/hook-scripts/create/post/S10selinux-label-brick.sh: 46:
./extras/hook-scripts/create/post/S10selinux-label-brick.sh: Syntax
error: "(" unexpected (expecting "done")

-- 
/*
Mit freundlichem Gruß / With kind regards,
 Patrick Matthäi
 GNU/Linux Debian Developer

  Blog: http://www.linux-dev.org/
E-Mail: pmatth...@debian.org
patr...@linux-dev.org
*/




signature.asc
Description: OpenPGP digital signature
___
packaging mailing list
packaging@gluster.org
http://lists.gluster.org/mailman/listinfo/packaging

Re: [gluster-packaging] glusterfs-3.11.0 released

2017-06-01 Thread Patrick Matthäi 
Am 30.05.2017 um 15:24 schrieb Gluster Build System:
>
> SRC: http://bits.gluster.org/pub/gluster/glusterfs/src/glusterfs-3.11.0.tar.gz
>
> This release is made off jenkins-release-197
>
> -- Gluster Build System
> ___
> packaging mailing list
> packaging@gluster.org
> http://lists.gluster.org/mailman/listinfo/packaging

Thanks for this release. I have uploaded it to the Debian repository,
which now also adds the "gluster" group. But I have got some questions /
patches:

1) gluster group: shouldn't the init script chgrp the statedump dir on
starting glusterfs? /run (or /var/run) are on most systems on tmpfs
2) Patch 02-init-remote-fs.diff: please merge it
3) Patch 04-spelling-errors.diff: please merge it, same procedure as
every release.. ;)
4) Patch 03-shell-script-syntax.diff: it fixes syntax errors with dash
and bash. To be checked by you is my change of $b(/.*)? to just $b -
cant recognize what do you try there. It fails in dash and bash

Thank you

-- 
/*
Mit freundlichem Gruß / With kind regards,
 Patrick Matthäi
 GNU/Linux Debian Developer

  Blog: http://www.linux-dev.org/
E-Mail: pmatth...@debian.org
patr...@linux-dev.org
*/

# Add missing dependency on $remote_fs

diff -Naur glusterfs-3.10.1.orig/extras/init.d/glusterd-Debian.in 
glusterfs-3.10.1/extras/init.d/glusterd-Debian.in
--- glusterfs-3.10.1.orig/extras/init.d/glusterd-Debian.in  2017-03-30 
20:35:57.198620558 +0200
+++ glusterfs-3.10.1/extras/init.d/glusterd-Debian.in   2017-03-31 
14:21:47.718509753 +0200
@@ -1,8 +1,8 @@
 #!/bin/sh
 ### BEGIN INIT INFO
 # Provides:  glusterd
-# Required-Start:$local_fs $network
-# Required-Stop: $local_fs $network
+# Required-Start:$local_fs $remote_fs $network
+# Required-Stop: $local_fs $remote_fs $network
 # Default-Start: 2 3 4 5
 # Default-Stop:  0 1 6
 # Short-Description: Gluster File System service for volume management
diff -Naur glusterfs-3.10.1.orig/extras/init.d/glustereventsd-Debian.in 
glusterfs-3.10.1/extras/init.d/glustereventsd-Debian.in
--- glusterfs-3.10.1.orig/extras/init.d/glustereventsd-Debian.in
2017-03-30 20:35:57.198620558 +0200
+++ glusterfs-3.10.1/extras/init.d/glustereventsd-Debian.in 2017-03-31 
14:22:13.682370100 +0200
@@ -1,8 +1,8 @@
 #!/bin/sh
 ### BEGIN INIT INFO
 # Provides:  glustereventsd
-# Required-Start:$local_fs $network
-# Required-Stop: $local_fs $network
+# Required-Start:$local_fs $remote_fs $network
+# Required-Stop: $local_fs $remote_fs $network
 # Default-Start: 2 3 4 5
 # Default-Stop:  0 1 6
 # Short-Description: Gluster Events Server
# Fix syntax errors in shell script.
# TODO: $b(/.*)? fails in dash and bash. Maybe this has to get fixed on
# another way.

diff -Naur 
glusterfs-3.11.0.orig/extras/hook-scripts/create/post/S10selinux-label-brick.sh 
glusterfs-3.11.0/extras/hook-scripts/create/post/S10selinux-label-brick.sh
--- 
glusterfs-3.11.0.orig/extras/hook-scripts/create/post/S10selinux-label-brick.sh 
2017-05-30 15:23:46.476785612 +0200
+++ glusterfs-3.11.0/extras/hook-scripts/create/post/S10selinux-label-brick.sh  
2017-06-01 10:23:06.782426237 +0200
@@ -13,7 +13,7 @@
 OPTSPEC="volname:"
 VOL=
 
-function parse_args () {
+parse_args () {
 ARGS=$(getopt -l $OPTSPEC  -name $PROGNAME $@)
 eval set -- "$ARGS"
 
@@ -32,7 +32,7 @@
 done
 }
 
-function set_brick_labels()
+set_brick_labels()
 {
 volname=$1
 
@@ -43,7 +43,7 @@
 do
 # Add a file context for each brick path and associate with the
 # glusterd_brick_t SELinux type.
-semanage fcontext --add -t glusterd_brick_t -r s0 $b(/.*)?
+semanage fcontext --add -t glusterd_brick_t -r s0 $b
 
 # Set the labels on the new brick path.
 restorecon -R $b
# Fix new spelling errors.

diff -Naur glusterfs-3.11.0.orig/tests/basic/gfapi/gfapi-ssl-test.t 
glusterfs-3.11.0/tests/basic/gfapi/gfapi-ssl-test.t
--- glusterfs-3.11.0.orig/tests/basic/gfapi/gfapi-ssl-test.t2017-05-30 
15:23:46.530785720 +0200
+++ glusterfs-3.11.0/tests/basic/gfapi/gfapi-ssl-test.t 2017-06-01 
10:32:41.087581891 +0200
@@ -55,7 +55,7 @@
 
 cleanup;
 
-# NetBSD build scripts are not upto date therefore this test
+# NetBSD build scripts are not up to date therefore this test
 # is failing in NetBSD. Therefore skipping the test in NetBSD
 # as of now.
 #G_TESTDEF_TEST_STATUS_NETBSD7=KNOWN_ISSUE,BUG=00
diff -Naur glusterfs-3.11.0.orig/tests/bugs/distribute/bug-915554.t 
glusterfs-3.11.0/tests/bugs/distribute/bug-915554.t
--- glusterfs-3.11.0.orig/tests/bugs/distribute/bug-915554.t2017-05-30 
15:23:46.539785738 +0200
+++ glusterfs-3.11.0/tests/bugs/distribute/bug-915554.t 2017-06-01 
10:32:18.359694757 +0200
@@ -59,7 +59,7 @@
 
 TEST $CLI volume rebalance $V0 start force
 
-# check if rebalance has completed for upto 15 secs
+# check if rebalance has completed for up to