aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Engelbrecht <[email protected]>2022-04-12 17:36:01 +0200
committerDan Engelbrecht <[email protected]>2022-04-12 17:36:01 +0200
commit8f2e85ead8f8011b29df0e60147e89fda2175ebc (patch)
treec11d54c139f541cac1e8c84416ed5d7bc405b551
parentlog resource limit info (diff)
downloadzen-8f2e85ead8f8011b29df0e60147e89fda2175ebc.tar.xz
zen-8f2e85ead8f8011b29df0e60147e89fda2175ebc.zip
set file limit on zenserver test
-rw-r--r--zenserver/zenserver.cpp24
-rw-r--r--zenstore-test/zenstore-test.cpp2
2 files changed, 24 insertions, 2 deletions
diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp
index c64b6f870..9ee2d8b22 100644
--- a/zenserver/zenserver.cpp
+++ b/zenserver/zenserver.cpp
@@ -1029,7 +1029,7 @@ ZenEntryPoint::Run()
int Error = getrlimit(RLIMIT_NOFILE, &Limit);
if (Error)
{
- ZEN_WARN("failed getting rlimit RLIMIT_NOFILE, reason '{}'", MakeErrorCode(Error).message());
+ ZEN_WARN("failed getting rlimit RLIMIT_NOFILE, reason '{}'", zen::MakeErrorCode(Error).message());
}
else
{
@@ -1185,6 +1185,28 @@ test_main(int argc, char** argv)
zen::z$_forcelink();
zen::logging::InitializeLogging();
+#if ZEN_PLATFORM_LINUX || ZEN_PLATFORM_MAC
+ struct rlimit Limit;
+ int Error = getrlimit(RLIMIT_NOFILE, &Limit);
+ if (Error)
+ {
+ ZEN_WARN("failed getting rlimit RLIMIT_NOFILE, reason '{}'", zen::MakeErrorCode(Error).message());
+ }
+ else
+ {
+ struct rlimit NewLimit = Limit;
+// NewLimit.rlim_cur = 10240;
+// NewLimit.rlim_max = 10240;
+ NewLimit.rlim_cur = NewLimit.rlim_max;
+ ZEN_INFO("changing RLIMIT_NOFILE from rlim_cur = {}, rlim_max {} to rlim_cur = {}, rlim_max {}", Limit.rlim_cur, Limit.rlim_max, NewLimit.rlim_cur, NewLimit.rlim_max);
+
+ Error = setrlimit(RLIMIT_NOFILE, &NewLimit);
+ if (Error != 0)
+ {
+ ZEN_WARN("failed to set RLIMIT_NOFILE limits from rlim_cur = {}, rlim_max {} to rlim_cur = {}, rlim_max {}, reason '{}'", Limit.rlim_cur, Limit.rlim_max, NewLimit.rlim_cur, NewLimit.rlim_max, zen::MakeErrorCode(Error).message());
+ }
+ }
+#endif
spdlog::set_level(spdlog::level::debug);
diff --git a/zenstore-test/zenstore-test.cpp b/zenstore-test/zenstore-test.cpp
index 4a4035ab1..6ebd60e95 100644
--- a/zenstore-test/zenstore-test.cpp
+++ b/zenstore-test/zenstore-test.cpp
@@ -37,7 +37,7 @@ main([[maybe_unused]] int argc, [[maybe_unused]] char* argv[])
// NewLimit.rlim_cur = 10240;
// NewLimit.rlim_max = 10240;
NewLimit.rlim_cur = NewLimit.rlim_max;
- ZEN_WARN("changing RLIMIT_NOFILE from rlim_cur = {}, rlim_max {} to rlim_cur = {}, rlim_max {}", Limit.rlim_cur, Limit.rlim_max, NewLimit.rlim_cur, NewLimit.rlim_max);
+ ZEN_INFO("changing RLIMIT_NOFILE from rlim_cur = {}, rlim_max {} to rlim_cur = {}, rlim_max {}", Limit.rlim_cur, Limit.rlim_max, NewLimit.rlim_cur, NewLimit.rlim_max);
Error = setrlimit(RLIMIT_NOFILE, &NewLimit);
if (Error != 0)