ulimit: fix setting ulimit
License: MIT Signed-off-by: Steven Allen <steven@stebalien.com>
Steven Allen committed
May 13, 2019 at 14:07 UTC
bff8326b9771b5b235111b98bde29887be954006
2 files changed
+5
-3
cmd/ipfs/util/ulimit.go
+1
-1
@@ -59,7 +59,7 @@ func ManageFdLimit() (changed bool, newLimit uint64, err error) {
59
return false, 0, err
60
}
61
62
- if maxFds <= soft {
62
+ if targetLimit <= soft {
63
return false, 0, nil
64
}
65
cmd/ipfs/util/ulimit_test.go
+4
-2
@@ -38,8 +38,10 @@ func TestManageInvalidNFds(t *testing.T) {
38
t.Fatal("Cannot set the IPFS_FD_MAX env variable")
39
}
40
41
- if _, _, err := ManageFdLimit(); err == nil {
42
- t.Errorf("ManageFdLimit should return an error")
41
+ t.Logf("setting ulimit to %d, max %d, cur %d", value, rlimit.Max, rlimit.Cur)
42
+
43
+ if changed, new, err := ManageFdLimit(); err == nil {
44
+ t.Errorf("ManageFdLimit should return an error: changed %t, new: %d", changed, new)
45
} else if err != nil {
46
flag := strings.Contains(err.Error(),
47
"failed to raise ulimit to IPFS_FD_MAX")