glusterfs: Glusterfs 3.12 and service cherry-picks #29952

nh2 · 2017-09-30T13:26:34Z

Motivation for this change

Cherry-pick of #29868 and #29062 (as planned in those tickets).

Things done

Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
Built on platform(s)
- NixOS
- macOS
- Linux
Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
Tested execution of all binary files (usually in ./result/bin/)
Fits CONTRIBUTING.md.

and

tested with https://github.com/nh2/nixops-gluster-example

…get. This introduces dependency cycles. A network file system to be running is not required for a network connection to be available. NixOS@19759cf#commitcomment-22044519 (cherry picked from commit 5e2815d)

…mon. See also NixOS#22225 (review) (cherry picked from commit bd54b72)

bachp · 2017-10-01T22:09:10Z

nixos/modules/services/network-filesystems/glusterfs.nix

-      after = [ "rpcbind.service" "network.target" "local-fs.target" ];
-      before = [ "network-online.target" ];
+      requires = lib.optional cfg.useRpcbind "rpcbind.service";
+      after = [ "network.target" "local-fs.target" ] ++ lib.optional cfg.useRpcbind [ "rpcbind.service" ];


Must be after = [ "network.target" "local-fs.target" ] ++ lib.optional cfg.useRpcbind "rpcbind.service";

See: #29992

Ah good catch, I thought I had fixed that already but the brackets are still there.

Thanks for fixing it!

(cherry picked from commit 2239dc6)

(cherry picked from commit e233a51)

Prevents glustereventsd failing at startup in case it starts before glusterd has started (whose `preStart` would also create the needed directory). (cherry picked from commit 08f7e45)

This is a better default for NixOS because it ensures that config changes happen fully when NixOS users expect it. (cherry picked from commit 18eecae)

Changes: * The patch `glusterfs-fix-unsubstituted-autoconf-macros` was deleted because the issue was fixed upstream: https://bugzilla.redhat.com/show_bug.cgi?id=1450588 * The `glusterd-ganesha.c` part of `glusterfs-use-PATH-instead-of-hardcodes` was detleted because `glusterd-ganesha.c` was removed upstream without replacement that has the relevant hardcoded paths. Closes NixOS#29062 (cherry picked from commit 8f40840)

nh2 · 2017-10-03T09:15:14Z

I've cherry-picked @bachp's fix for the above mentioned issue.

This is ready to land now.

nh2 · 2017-10-04T17:54:54Z

CC @joachifm who merged the master equivalents for us

joachifm · 2017-10-04T19:48:32Z

Deferring to @fpletz

FRidh · 2017-10-07T09:34:04Z

In my opinion its a bit too late for a bump like this to make it into stable, but I suppose if the maintainer, @7c6f434c , is fine with this, then it should be ok?

FRidh · 2017-10-07T09:34:38Z

Note that the service does not have a maintainer. I think it should be added (on master, first).

7c6f434c · 2017-10-07T10:31:55Z

The problem is that I don't use GlusterFS regularly nowadays, and I haven't used stable channels, hm, maybe not ever.

(Looking at the list of fixes… hm, a crash… a corruption if some combination of factors happens…) Maybe there are enough bugfixes for a bump, I dunno.

Looking at the file history, I would actually ask whether @nh2 wants to be added as the maintainer of both package and service.

nh2 · 2017-10-07T12:30:42Z

Yes, I'd be happy to maintain gluster for a while.

I have a gluster deployment based on the current release-* stable channel for which I care that it doesn't break, and I maintain nixops-gluster-example with which changes to package + service, as well as version upgrades, can be publicly tested.

So far I know only of @bachp as another NixOS user of gluster, so I've CC'd him in the past so that he can review/test changes to be made. It would be nice to know if there are other users who depend on gluster so that those can be CC'd too.

bachp · 2017-10-07T16:33:39Z

I think my usage of gluster is a lot simpler than @nh2. I currently don't use any declarative configuration of gluster volumes but mainly depend on the service to have the gluster daemons running.
I think @nh2 you did a very good job so far improving gluster support in NixOS. I would also like to see a test for glusterfs that is based on the nixops setup mentioned above.

nh2 · 2017-10-22T15:18:18Z

Uh I have some confusion here.

The PR is still open but I noticed that its commits have landed on release-17.09 by now, for example 1be7119

I noticed this only by the Github info message here:

fpletz added a commit that referenced this pull request 8 days ago

I'm of course OK with those picks since I requested them here, but I do have two questions about it:

The first one probably to @fpletz: How comes the individual commits are interleaved with other commits, as opposed to be one after the other like in the PR? Is there some tooling involved that I don't know about yet?
How can I learn that such picks happened, so that I can do cleanup actions like close this PR?

(I also noticed that I typoed the PR title to glusterfs 1.2 instead of 3.12, will fix that now.)

fpletz · 2017-10-23T13:47:27Z

@nh2 As release manager, I regularly go through the changes in master and pick relevant fixes to the release branch. Unfortunately, I was a bit busy the last few weeks so I wasn't also monitoring incoming pull requests. Sorry about that.

There isn't any kind of notification from github when commits are picked. However, if a PR or issue is mentioned in the commit message, cherry-picking the commit triggers a message. No notification via email, though.

After trying to merge this, there is no diff to release-17.09, so we can safely close this. Thanks a lot for your efforts!

nh2 · 2017-10-23T14:47:05Z

@fpletz OK, thank you!

nh2 added 2 commits September 30, 2017 15:00

glusterfs service: Don't make it a prerequisite of network-online.tar…

e8b54c7

…get. This introduces dependency cycles. A network file system to be running is not required for a network connection to be available. NixOS@19759cf#commitcomment-22044519 (cherry picked from commit 5e2815d)

glusterfs service: Add settings to disable rpcbind and the events dae…

3c50cc4

…mon. See also NixOS#22225 (review) (cherry picked from commit bd54b72)

nh2 requested review from copumpkin, edolstra, edwtjo, FRidh, LnL7 and peti as code owners September 30, 2017 13:26

nh2 changed the base branch from master to release-17.09 September 30, 2017 13:27

peti removed their request for review September 30, 2017 13:36

joachifm added the 8.has: port to stable A PR already has a backport to the stable release. label Sep 30, 2017

bachp approved these changes Sep 30, 2017

View reviewed changes

bachp reviewed Oct 1, 2017

View reviewed changes

bachp and others added 5 commits October 3, 2017 11:14

glusterfs service: fix issues with useRpcbind

7fc8dfb

(cherry picked from commit 2239dc6)

glusterfs service: Add killMode and stopKillTimeout options

4f14f77

(cherry picked from commit e233a51)

glusterfs service: Ensure log directory exists for glustereventsd.

4c5f0af

Prevents glustereventsd failing at startup in case it starts before glusterd has started (whose `preStart` would also create the needed directory). (cherry picked from commit 08f7e45)

glusterfs service: Change default killMode to "control-group".

10b0fb4

This is a better default for NixOS because it ensures that config changes happen fully when NixOS users expect it. (cherry picked from commit 18eecae)

nh2 force-pushed the glusterfs-1.2-release-17.09 branch from a9ce8ec to 2fb4e64 Compare October 3, 2017 09:14

copumpkin removed their request for review October 3, 2017 18:21

FRidh removed request for edolstra, LnL7 and edwtjo October 7, 2017 09:29

FRidh requested a review from 7c6f434c October 7, 2017 09:34

nh2 changed the title ~~glusterfs: Glusterfs 1.2 and service cherry-picks~~ glusterfs: Glusterfs 3.12 and service cherry-picks Oct 22, 2017

fpletz closed this Oct 23, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

glusterfs: Glusterfs 3.12 and service cherry-picks #29952

glusterfs: Glusterfs 3.12 and service cherry-picks #29952

nh2 commented Sep 30, 2017

bachp Oct 1, 2017 •

edited

nh2 Oct 2, 2017

nh2 commented Oct 3, 2017

nh2 commented Oct 4, 2017 •

edited

joachifm commented Oct 4, 2017

FRidh commented Oct 7, 2017

FRidh commented Oct 7, 2017

7c6f434c commented Oct 7, 2017

nh2 commented Oct 7, 2017

bachp commented Oct 7, 2017

nh2 commented Oct 22, 2017

fpletz commented Oct 23, 2017

nh2 commented Oct 23, 2017

glusterfs: Glusterfs 3.12 and service cherry-picks #29952

glusterfs: Glusterfs 3.12 and service cherry-picks #29952

Conversation

nh2 commented Sep 30, 2017

Motivation for this change

Things done

bachp Oct 1, 2017 • edited

Choose a reason for hiding this comment

nh2 Oct 2, 2017

Choose a reason for hiding this comment

nh2 commented Oct 3, 2017

nh2 commented Oct 4, 2017 • edited

joachifm commented Oct 4, 2017

FRidh commented Oct 7, 2017

FRidh commented Oct 7, 2017

7c6f434c commented Oct 7, 2017

nh2 commented Oct 7, 2017

bachp commented Oct 7, 2017

nh2 commented Oct 22, 2017

fpletz commented Oct 23, 2017

nh2 commented Oct 23, 2017

bachp Oct 1, 2017 •

edited

nh2 commented Oct 4, 2017 •

edited