You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by sh...@apache.org on 2017/12/19 14:47:49 UTC
[trafficserver] branch master updated: remove code to set hard
limit in ink_max_out_rlimit(),
hard limit should be set in the system outside of ats
This is an automated email from the ASF dual-hosted git repository.
shinrich pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 68ee4b9 remove code to set hard limit in ink_max_out_rlimit(), hard limit should be set in the system outside of ats
68ee4b9 is described below
commit 68ee4b9072fb4ba97146300d3628e1074bcbaf3c
Author: Fei Deng <du...@gmail.com>
AuthorDate: Mon Dec 18 10:37:56 2017 -0600
remove code to set hard limit in ink_max_out_rlimit(), hard limit should be set in the system outside of ats
---
cmd/traffic_manager/traffic_manager.cc | 10 +++++-----
lib/ts/ink_sys_control.cc | 35 +++++++++++-----------------------
lib/ts/ink_sys_control.h | 2 +-
proxy/Main.cc | 10 +++++-----
proxy/logging/LogStandalone.cc | 2 +-
5 files changed, 23 insertions(+), 36 deletions(-)
diff --git a/cmd/traffic_manager/traffic_manager.cc b/cmd/traffic_manager/traffic_manager.cc
index 941c51b..5af53f3 100644
--- a/cmd/traffic_manager/traffic_manager.cc
+++ b/cmd/traffic_manager/traffic_manager.cc
@@ -342,12 +342,12 @@ set_process_limits(RecInt fds_throttle)
rlim_t maxfiles;
// Set needed rlimits (root)
- ink_max_out_rlimit(RLIMIT_NOFILE, true, false);
- ink_max_out_rlimit(RLIMIT_STACK, true, true);
- ink_max_out_rlimit(RLIMIT_DATA, true, true);
- ink_max_out_rlimit(RLIMIT_FSIZE, true, false);
+ ink_max_out_rlimit(RLIMIT_NOFILE);
+ ink_max_out_rlimit(RLIMIT_STACK);
+ ink_max_out_rlimit(RLIMIT_DATA);
+ ink_max_out_rlimit(RLIMIT_FSIZE);
#ifdef RLIMIT_RSS
- ink_max_out_rlimit(RLIMIT_RSS, true, true);
+ ink_max_out_rlimit(RLIMIT_RSS);
#endif
maxfiles = ink_get_max_files();
diff --git a/lib/ts/ink_sys_control.cc b/lib/ts/ink_sys_control.cc
index 968bab6..b7f192c 100644
--- a/lib/ts/ink_sys_control.cc
+++ b/lib/ts/ink_sys_control.cc
@@ -29,7 +29,7 @@
#include "ts/Diags.h"
rlim_t
-ink_max_out_rlimit(int which, bool max_it, bool unlim_it)
+ink_max_out_rlimit(int which)
{
struct rlimit rl;
@@ -39,34 +39,21 @@ ink_max_out_rlimit(int which, bool max_it, bool unlim_it)
#define MAGIC_CAST(x) x
#endif
- if (max_it) {
- ink_release_assert(getrlimit(MAGIC_CAST(which), &rl) >= 0);
- if (rl.rlim_cur != rl.rlim_max) {
+ ink_release_assert(getrlimit(MAGIC_CAST(which), &rl) >= 0);
+ if (rl.rlim_cur != rl.rlim_max) {
#if defined(darwin)
- if (which == RLIMIT_NOFILE)
- rl.rlim_cur = (OPEN_MAX < rl.rlim_max) ? OPEN_MAX : rl.rlim_max;
- else
- rl.rlim_cur = rl.rlim_max;
-#else
+ if (which == RLIMIT_NOFILE) {
+ rl.rlim_cur = (OPEN_MAX < rl.rlim_max) ? OPEN_MAX : rl.rlim_max;
+ } else {
rl.rlim_cur = rl.rlim_max;
-#endif
- if (setrlimit(MAGIC_CAST(which), &rl) != 0) {
- Warning("Failed to set Limit : %s", strerror(errno));
- }
}
- }
-
-#if !(defined(darwin) || defined(freebsd))
- if (unlim_it) {
- ink_release_assert(getrlimit(MAGIC_CAST(which), &rl) >= 0);
- if (rl.rlim_cur != (rlim_t)RLIM_INFINITY) {
- rl.rlim_cur = (rl.rlim_max = RLIM_INFINITY);
- if (setrlimit(MAGIC_CAST(which), &rl) != 0) {
- Warning("Failed to set Limit : %s", strerror(errno));
- }
+#else
+ rl.rlim_cur = rl.rlim_max;
+#endif
+ if (setrlimit(MAGIC_CAST(which), &rl) != 0) {
+ Warning("Failed to set Limit : %s", strerror(errno));
}
}
-#endif
ink_release_assert(getrlimit(MAGIC_CAST(which), &rl) >= 0);
return rl.rlim_cur;
}
diff --git a/lib/ts/ink_sys_control.h b/lib/ts/ink_sys_control.h
index 7326f6b..479f335 100644
--- a/lib/ts/ink_sys_control.h
+++ b/lib/ts/ink_sys_control.h
@@ -26,7 +26,7 @@
#include <sys/resource.h>
-rlim_t ink_max_out_rlimit(int which, bool max_it = true, bool unlim_it = true);
+rlim_t ink_max_out_rlimit(int which);
rlim_t ink_get_max_files();
#endif /*_INK_SYS_CONTROL_H*/
diff --git a/proxy/Main.cc b/proxy/Main.cc
index 3663cd2..f6df8a9 100644
--- a/proxy/Main.cc
+++ b/proxy/Main.cc
@@ -534,7 +534,7 @@ init_system()
//
// Delimit file Descriptors
//
- fds_limit = ink_max_out_rlimit(RLIMIT_NOFILE, true, false);
+ fds_limit = ink_max_out_rlimit(RLIMIT_NOFILE);
}
static void
@@ -1147,12 +1147,12 @@ adjust_sys_settings()
}
}
- ink_max_out_rlimit(RLIMIT_STACK, true, true);
- ink_max_out_rlimit(RLIMIT_DATA, true, true);
- ink_max_out_rlimit(RLIMIT_FSIZE, true, false);
+ ink_max_out_rlimit(RLIMIT_STACK);
+ ink_max_out_rlimit(RLIMIT_DATA);
+ ink_max_out_rlimit(RLIMIT_FSIZE);
#ifdef RLIMIT_RSS
- ink_max_out_rlimit(RLIMIT_RSS, true, true);
+ ink_max_out_rlimit(RLIMIT_RSS);
#endif
}
diff --git a/proxy/logging/LogStandalone.cc b/proxy/logging/LogStandalone.cc
index d2091b3..07e8c2e 100644
--- a/proxy/logging/LogStandalone.cc
+++ b/proxy/logging/LogStandalone.cc
@@ -81,7 +81,7 @@ logging_crash_handler(int signo, siginfo_t *info, void *ptr)
static void
init_system(bool notify_syslog)
{
- fds_limit = ink_max_out_rlimit(RLIMIT_NOFILE, true, false);
+ fds_limit = ink_max_out_rlimit(RLIMIT_NOFILE);
signal_register_crash_handler(logging_crash_handler);
if (notify_syslog) {
--
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>'].