When systemd adjusts 'OOMScoreAdjust' and 'LimitNOFILE'
we should take those settings and not try to adjust them
again on our side.
Signed-off-by: Hannes Reinecke <hare@xxxxxxx>
---
multipathd/main.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/multipathd/main.c b/multipathd/main.c
index 448ed39..b57fa5d 100644
--- a/multipathd/main.c
+++ b/multipathd/main.c
@@ -1553,7 +1553,13 @@ set_oom_adj (void)
#endif
FILE *fp;
struct stat st;
+ char *envp;
+ envp = getenv("OOMScoreAdjust");
+ if (envp) {
+ condlog(3, "Using systemd provided OOMScoreAdjust");
+ return;
+ }
do {
if (stat(file, &st) == 0){
fp = fopen(file, "w");
@@ -1630,7 +1636,11 @@ child (void * param)
setlogmask(LOG_UPTO(conf->verbosity + 3));
- if (conf->max_fds) {
+ envp = getenv("LimitNOFILE");
+
+ if (envp) {
+ condlog(2,"Using systemd provided open fds limit of %s", envp);
+ } else if (conf->max_fds) {
struct rlimit fd_limit;
if (getrlimit(RLIMIT_NOFILE, &fd_limit) < 0) {
--
1.8.1.4
--
dm-devel mailing list
dm-devel@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/dm-devel
