[arvados] created: 2.7.0-6611-ge672f48416
git repository hosting
git at public.arvados.org
Thu May 23 14:41:31 UTC 2024
at e672f484160faae900fb7f7e281d06952fd35d28 (commit)
commit e672f484160faae900fb7f7e281d06952fd35d28
Author: Tom Clegg <tom at curii.com>
Date: Thu May 23 10:34:49 2024 -0400
21640: Stop accidentally reducing NOFILE limit.
LimitNOFILE=65536 used to increase softlimit from 1024 to 65536. But
Go >= 1.19 automatically raises softlimit to hardlimit, so now
LimitNOFILE=65536 only serves to reduce hardlimit from 524288 to
65536, which we don't want.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/cmd/arvados-server/arvados-controller.service b/cmd/arvados-server/arvados-controller.service
index a66db787a7..66c6ed2074 100644
--- a/cmd/arvados-server/arvados-controller.service
+++ b/cmd/arvados-server/arvados-controller.service
@@ -13,8 +13,6 @@ StartLimitIntervalSec=0
Type=notify
EnvironmentFile=-/etc/arvados/environment
ExecStart=/usr/bin/arvados-controller
-# Set a reasonable default for the open file limit
-LimitNOFILE=65536
Restart=always
RestartSec=1
RestartPreventExitStatus=2
diff --git a/cmd/arvados-server/arvados-dispatch-cloud.service b/cmd/arvados-server/arvados-dispatch-cloud.service
index 09b0ba94a9..38dd90beae 100644
--- a/cmd/arvados-server/arvados-dispatch-cloud.service
+++ b/cmd/arvados-server/arvados-dispatch-cloud.service
@@ -13,8 +13,6 @@ StartLimitIntervalSec=0
Type=notify
EnvironmentFile=-/etc/arvados/environment
ExecStart=/usr/bin/arvados-dispatch-cloud
-# Set a reasonable default for the open file limit
-LimitNOFILE=65536
Restart=always
RestartSec=1
RestartPreventExitStatus=2
diff --git a/cmd/arvados-server/arvados-dispatch-lsf.service b/cmd/arvados-server/arvados-dispatch-lsf.service
index a683e85688..fa7e674cea 100644
--- a/cmd/arvados-server/arvados-dispatch-lsf.service
+++ b/cmd/arvados-server/arvados-dispatch-lsf.service
@@ -13,8 +13,6 @@ StartLimitIntervalSec=0
Type=notify
EnvironmentFile=-/etc/arvados/environment
ExecStart=/usr/bin/arvados-dispatch-lsf
-# Set a reasonable default for the open file limit
-LimitNOFILE=65536
Restart=always
RestartSec=1
RestartPreventExitStatus=2
diff --git a/cmd/arvados-server/arvados-health.service b/cmd/arvados-server/arvados-health.service
index 899bfac219..8bc6ad6bba 100644
--- a/cmd/arvados-server/arvados-health.service
+++ b/cmd/arvados-server/arvados-health.service
@@ -13,8 +13,6 @@ StartLimitIntervalSec=0
Type=notify
EnvironmentFile=-/etc/arvados/environment
ExecStart=/usr/bin/arvados-health
-# Set a reasonable default for the open file limit
-LimitNOFILE=65536
Restart=always
RestartSec=1
RestartPreventExitStatus=2
diff --git a/cmd/arvados-server/arvados-ws.service b/cmd/arvados-server/arvados-ws.service
index fc6eb4978a..6bba90274a 100644
--- a/cmd/arvados-server/arvados-ws.service
+++ b/cmd/arvados-server/arvados-ws.service
@@ -12,8 +12,6 @@ StartLimitIntervalSec=0
[Service]
Type=notify
ExecStart=/usr/bin/arvados-ws
-# Set a reasonable default for the open file limit
-LimitNOFILE=65536
Restart=always
RestartSec=1
RestartPreventExitStatus=2
diff --git a/cmd/arvados-server/crunch-dispatch-slurm.service b/cmd/arvados-server/crunch-dispatch-slurm.service
index 83933c1760..4ec96ad681 100644
--- a/cmd/arvados-server/crunch-dispatch-slurm.service
+++ b/cmd/arvados-server/crunch-dispatch-slurm.service
@@ -13,8 +13,6 @@ StartLimitIntervalSec=0
Type=notify
EnvironmentFile=-/etc/arvados/environment
ExecStart=/usr/bin/crunch-dispatch-slurm
-# Set a reasonable default for the open file limit
-LimitNOFILE=65536
Restart=always
RestartSec=1
RestartPreventExitStatus=2
diff --git a/cmd/arvados-server/keep-balance.service b/cmd/arvados-server/keep-balance.service
index 1d759d6237..589e950a93 100644
--- a/cmd/arvados-server/keep-balance.service
+++ b/cmd/arvados-server/keep-balance.service
@@ -13,8 +13,6 @@ StartLimitIntervalSec=0
Type=notify
EnvironmentFile=-/etc/arvados/environment
ExecStart=/usr/bin/keep-balance
-# Set a reasonable default for the open file limit
-LimitNOFILE=65536
Restart=always
RestartSec=10s
Nice=19
diff --git a/cmd/arvados-server/keep-web.service b/cmd/arvados-server/keep-web.service
index d94124c6de..a803ddac85 100644
--- a/cmd/arvados-server/keep-web.service
+++ b/cmd/arvados-server/keep-web.service
@@ -13,8 +13,6 @@ StartLimitIntervalSec=0
Type=notify
EnvironmentFile=-/etc/arvados/environment
ExecStart=/usr/bin/keep-web
-# Set a reasonable default for the open file limit
-LimitNOFILE=65536
Restart=always
RestartSec=1
RestartPreventExitStatus=2
diff --git a/cmd/arvados-server/keepproxy.service b/cmd/arvados-server/keepproxy.service
index c4083f23c9..24805d9c59 100644
--- a/cmd/arvados-server/keepproxy.service
+++ b/cmd/arvados-server/keepproxy.service
@@ -13,8 +13,6 @@ StartLimitIntervalSec=0
Type=notify
EnvironmentFile=-/etc/arvados/environment
ExecStart=/usr/bin/keepproxy
-# Set a reasonable default for the open file limit
-LimitNOFILE=65536
Restart=always
RestartSec=1
RestartPreventExitStatus=2
diff --git a/cmd/arvados-server/keepstore.service b/cmd/arvados-server/keepstore.service
index aa5e013dee..e640bb9fa0 100644
--- a/cmd/arvados-server/keepstore.service
+++ b/cmd/arvados-server/keepstore.service
@@ -17,8 +17,6 @@ StartLimitIntervalSec=0
Environment=GOGC=10
Type=notify
ExecStart=/usr/bin/keepstore
-# Set a reasonable default for the open file limit
-LimitNOFILE=65536
Restart=always
RestartSec=1
RestartPreventExitStatus=2
diff --git a/lib/install/arvados.service b/lib/install/arvados.service
index f536001f77..4877e00b69 100644
--- a/lib/install/arvados.service
+++ b/lib/install/arvados.service
@@ -17,7 +17,6 @@ ExecReload=/usr/bin/arvados-server config-check
ExecReload=kill -HUP $MAINPID
Restart=always
RestartSec=1
-LimitNOFILE=65536
[Install]
WantedBy=multi-user.target
diff --git a/services/crunch-dispatch-local/crunch-dispatch-local.service b/services/crunch-dispatch-local/crunch-dispatch-local.service
index b4fc10f83e..f40359de2e 100644
--- a/services/crunch-dispatch-local/crunch-dispatch-local.service
+++ b/services/crunch-dispatch-local/crunch-dispatch-local.service
@@ -11,11 +11,8 @@ StartLimitIntervalSec=0
Type=simple
EnvironmentFile=-/etc/arvados/crunch-dispatch-local-credentials
ExecStart=/usr/bin/crunch-dispatch-local -poll-interval=1 -crunch-run-command=/usr/bin/crunch-run
-# Set a reasonable default for the open file limit
-LimitNOFILE=65536
Restart=always
RestartSec=1
-LimitNOFILE=1000000
[Install]
WantedBy=multi-user.target
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list