On Thu, Jun 01, 2017 at 10:55:34AM +0200, Patrick Matthäi wrote: > 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:
Thanks for the package update in Debian and the patches! Kaleb has posted them in Gerrit, and they are going through review and regression testing now. > 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. > 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? Niels > 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.t 2017-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=000000 > 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.t 2017-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 15 secs > > EXPECT_WITHIN $REBALANCE_TIMEOUT "0" rebalance_completed > > diff -Naur glusterfs-3.11.0.orig/tests/cluster.rc > glusterfs-3.11.0/tests/cluster.rc > --- glusterfs-3.11.0.orig/tests/cluster.rc 2017-05-30 15:23:46.556785772 > +0200 > +++ glusterfs-3.11.0/tests/cluster.rc 2017-06-01 10:32:10.507733723 +0200 > @@ -141,7 +141,7 @@ > } > > function cluster_rebalance_status_field { > - #The rebalance status can be upto 3 words, (ex:'fix-layout in > progress'), hence the awk-print $7 thru $9. > + #The rebalance status can be up to 3 words, (ex:'fix-layout in > progress'), hence the awk-print $7 thru $9. > #But if the status is less than 3 words, it also prints the next > field i.e the run_time_in_secs.(ex:'completed 3.00'). > #So we trim the numbers out with `tr`. Finally remove the trailing > white spaces with sed. What we get is one of the > #strings in the 'cli_vol_task_status_str' char array of cli-rpc-ops.c > diff -Naur glusterfs-3.11.0.orig/tests/volume.rc > glusterfs-3.11.0/tests/volume.rc > --- glusterfs-3.11.0.orig/tests/volume.rc 2017-05-30 15:23:46.561785781 > +0200 > +++ glusterfs-3.11.0/tests/volume.rc 2017-06-01 10:32:26.971652103 +0200 > @@ -73,7 +73,7 @@ > } > > function fix-layout_status_field { > - #The fix-layout status can be upto 3 words, (ex:'fix-layout in > progress'), hence the awk-print $2 thru $4. > + #The fix-layout status can be up to 3 words, (ex:'fix-layout in > progress'), hence the awk-print $2 thru $4. > #But if the status is less than 3 words, it also prints the next > field i.e the run_time_in_secs.(ex:'completed 3.00'). > #So we trim the numbers out with `tr`. Finally remove the trailing > white spaces with sed. What we get is one of the > #strings in the 'cli_vol_task_status_str' char array of cli-rpc-ops.c > diff -Naur glusterfs-3.11.0.orig/xlators/cluster/dht/src/dht-shared.c > glusterfs-3.11.0/xlators/cluster/dht/src/dht-shared.c > --- glusterfs-3.11.0.orig/xlators/cluster/dht/src/dht-shared.c > 2017-05-30 15:23:46.572785805 +0200 > +++ glusterfs-3.11.0/xlators/cluster/dht/src/dht-shared.c 2017-06-01 > 10:30:18.332290299 +0200 > @@ -489,7 +489,7 @@ > DHT_MSG_INVALID_OPTION, > "Invalid option: Reconfigure: " > "rebal-throttle should be > {lazy|normal|aggressive}" > - " or a number upto number of cores > available," > + " or a number up to number of cores > available," > " not (%s), defaulting to (%d)", > temp_str, conf->dthrottle); > ret = -1; > @@ -874,7 +874,7 @@ > DHT_MSG_INVALID_OPTION, > "Invalid option: Reconfigure: " > "rebal-throttle should be > {lazy|normal|aggressive}" > - " or a number upto number of cores > available," > + " or a number up to number of cores > available," > " not (%s), defaulting to (%d)", > temp_str, conf->dthrottle); > ret = -1; > diff -Naur glusterfs-3.11.0.orig/xlators/cluster/ec/src/ec-helpers.c > glusterfs-3.11.0/xlators/cluster/ec/src/ec-helpers.c > --- glusterfs-3.11.0.orig/xlators/cluster/ec/src/ec-helpers.c 2017-05-30 > 15:23:46.578785814 +0200 > +++ glusterfs-3.11.0/xlators/cluster/ec/src/ec-helpers.c 2017-06-01 > 10:33:44.307268438 +0200 > @@ -366,7 +366,7 @@ > * instead of saying that it doesn't exist. > * > * We need to filter out this case and consider that a config xattr == 0 > is > - * the same than a non-existant xattr. Otherwise ec_config_check() will > + * the same than a non-existent xattr. Otherwise ec_config_check() will > * fail. > */ > if (data == 0) { > diff -Naur > glusterfs-3.11.0.orig/xlators/features/quota/src/quota-enforcer-client.c > glusterfs-3.11.0/xlators/features/quota/src/quota-enforcer-client.c > --- glusterfs-3.11.0.orig/xlators/features/quota/src/quota-enforcer-client.c > 2017-05-30 15:23:46.603785865 +0200 > +++ glusterfs-3.11.0/xlators/features/quota/src/quota-enforcer-client.c > 2017-06-01 10:31:38.907890492 +0200 > @@ -199,7 +199,7 @@ > > if (priv->quotad_conn_status == 0) { > /* retry connecting after 5secs for 12 retries > - * (upto 60sec). > + * (up to 60sec). > */ > gf_log (this->name, GF_LOG_DEBUG, "retry connecting > to " > "quotad (retry count %d)", > diff -Naur > glusterfs-3.11.0.orig/xlators/mgmt/glusterd/src/glusterd-volume-set.c > glusterfs-3.11.0/xlators/mgmt/glusterd/src/glusterd-volume-set.c > --- glusterfs-3.11.0.orig/xlators/mgmt/glusterd/src/glusterd-volume-set.c > 2017-05-30 15:23:46.631785920 +0200 > +++ glusterfs-3.11.0/xlators/mgmt/glusterd/src/glusterd-volume-set.c > 2017-06-01 10:34:10.883136526 +0200 > @@ -583,8 +583,8 @@ > } else { > ret = -1; > snprintf (errstr, sizeof (errstr), "%s should be " > - "{lazy|normal|aggressive} or a number upto number > of" > - " cores available (cores availble - %ld)", key, > + "{lazy|normal|aggressive} or a number up to number > of" > + " cores available (cores available - %ld)", key, > cores_available); > gf_msg (this->name, GF_LOG_ERROR, EINVAL, > GD_MSG_INVALID_ENTRY, "%s", errstr); > @@ -3317,7 +3317,7 @@ > .op_version = GD_OP_VERSION_3_11_0, > .description = "enable/disable storing of entries that were > lookedup" > " and found to be present in the volume, thus > lookup" > - " on non existant file is served from the cache", > + " on non existent file is served from the cache", > }, > { .key = "performance.nl-cache-limit", > .voltype = "performance/nl-cache", > diff -Naur glusterfs-3.11.0.orig/xlators/nfs/server/src/nlm4.h > glusterfs-3.11.0/xlators/nfs/server/src/nlm4.h > --- glusterfs-3.11.0.orig/xlators/nfs/server/src/nlm4.h 2017-05-30 > 15:23:46.639785937 +0200 > +++ glusterfs-3.11.0/xlators/nfs/server/src/nlm4.h 2017-06-01 > 10:34:03.627172520 +0200 > @@ -62,7 +62,7 @@ > #elif defined(__NetBSD__) > #define GF_RPC_STATD_PROG "/usr/sbin/rpc.statd" > #define GF_RPC_STATD_PIDFILE "/var/run/rpc.statd.pid" > -#define GF_SM_NOTIFY_PIDFILE "/var/run/inexistant.pid" > +#define GF_SM_NOTIFY_PIDFILE "/var/run/inexistent.pid" > #else > #define GF_RPC_STATD_PROG "/sbin/rpc.statd" > #define GF_RPC_STATD_PIDFILE "/var/run/rpc.statd.pid" > diff -Naur > glusterfs-3.11.0.orig/xlators/performance/nl-cache/src/nl-cache-helper.c > glusterfs-3.11.0/xlators/performance/nl-cache/src/nl-cache-helper.c > --- glusterfs-3.11.0.orig/xlators/performance/nl-cache/src/nl-cache-helper.c > 2017-05-30 15:23:46.642785943 +0200 > +++ glusterfs-3.11.0/xlators/performance/nl-cache/src/nl-cache-helper.c > 2017-06-01 10:33:55.211214266 +0200 > @@ -834,7 +834,7 @@ > { > /* There is one possiblility where we need to search before > * adding NE: when there are two parallel lookups on a non > - * existant file */ > + * existent file */ > if (!__nlc_search_ne (nlc_ctx, name)) { > __nlc_add_ne (this, nlc_ctx, name); > __nlc_set_dir_state (nlc_ctx, NLC_NE_VALID); > _______________________________________________ > packaging mailing list > packaging@gluster.org > http://lists.gluster.org/mailman/listinfo/packaging
signature.asc
Description: PGP signature
_______________________________________________ packaging mailing list packaging@gluster.org http://lists.gluster.org/mailman/listinfo/packaging
