Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6f607b806d55
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 231e67175809
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 4, 2018

  1. glusterfs service: Switch to simple unit instead of forking. 

    Gluster's pidfile handling is bug-ridden.

I have fixed https://bugzilla.redhat.com/show_bug.cgi?id=1509340
in an attempt to improve it but that is far from enough.

The gluster developers describe another pidfile issue as
"our brick-process management is a total nightmare", see
https://github.com/gluster/glusterfs/blob/f1071f17e02502c24375c0b480d369d37f4e4054/xlators/mgmt/glusterd/src/glusterd-utils.c#L5907-L5924

I have observed multiple cases where glusterd doesn't start correctly
and systemd doesn't notice because of the erroneous pidfile handling.

To improve the situation, we don't let glusterd daemonize itself any more
and instead use `--no-daemon` and the `Simple` service type.
    @nh2
    nh2 committed Nov 4, 2018
    Copy the full SHA
    92f40ba View commit details

Commits on Nov 14, 2018

  1. Merge pull request #49736 from nh2/glusterfs-service-simple-unit-no-f… 

    …orking

glusterfs service: Switch to simple unit instead of forking
    @lheckemann
    lheckemann authored Nov 14, 2018
    Copy the full SHA
    231e671 View commit details
Showing with 1 addition and 3 deletions.
  1. +1 −3 nixos/modules/services/network-filesystems/glusterfs.nix
4 changes: 1 addition & 3 deletions nixos/modules/services/network-filesystems/glusterfs.nix
View file
Original file line number Diff line number Diff line change
@@ -176,10 +176,8 @@ in
'';

serviceConfig = {
Type="forking";
PIDFile="/run/glusterd.pid";
LimitNOFILE=65536;
ExecStart="${glusterfs}/sbin/glusterd -p /run/glusterd.pid --log-level=${cfg.logLevel} ${toString cfg.extraFlags}";
ExecStart="${glusterfs}/sbin/glusterd --no-daemon --log-level=${cfg.logLevel} ${toString cfg.extraFlags}";
KillMode=cfg.killMode;
TimeoutStopSec=cfg.stopKillTimeout;
};