@@ -2244,6 +2244,8 @@ int main(int argc, char *argv[])
xprintf = trace;
#endif
+ claim_resources();
+
signal(SIGHUP, trigger_reopen_log);
if (tracefile)
tracefile = talloc_strdup(NULL, tracefile);
@@ -258,6 +258,9 @@ void daemonize(void);
/* Close stdin/stdout/stderr to complete daemonize */
void finish_daemonize(void);
+/* Set OOM-killer score and raise ulimit. */
+void claim_resources(void);
+
/* Open a pipe for signal handling */
void init_pipe(int reopen_log_pipe[2]);
@@ -32,6 +32,10 @@ void finish_daemonize(void)
{
}
+void claim_resources(void)
+{
+}
+
void init_pipe(int reopen_log_pipe[2])
{
reopen_log_pipe[0] = -1;
@@ -22,6 +22,7 @@
#include <fcntl.h>
#include <stdlib.h>
#include <sys/mman.h>
+#include <sys/resource.h>
#include "utils.h"
#include "xenstored_core.h"
@@ -87,6 +88,51 @@ void finish_daemonize(void)
close(devnull);
}
+static void avoid_oom_killer(void)
+{
+ char path[32];
+ char val[] = "-500";
+ int fd;
+
+ snprintf(path, sizeof(path), "/proc/%d/oom_score_adj", (int)getpid());
+
+ fd = open(path, O_WRONLY);
+ /* Do nothing if file doesn't exist. */
+ if (fd < 0)
+ return;
+ /* Ignore errors. */
+ write(fd, val, sizeof(val));
+ close(fd);
+}
+
+/* Max. 32752 domains with 2 open files per domain, plus some spare. */
+#define MAX_FILES 65536
+static void raise_ulimit(void)
+{
+ struct rlimit rlim;
+
+ if (getrlimit(RLIMIT_NOFILE, &rlim))
+ return;
+ if (rlim.rlim_max != RLIM_INFINITY && rlim.rlim_max < MAX_FILES)
+ {
+ rlim.rlim_max = MAX_FILES;
+ setrlimit(RLIMIT_NOFILE, &rlim);
+ }
+ if (getrlimit(RLIMIT_NOFILE, &rlim))
+ return;
+ if (rlim.rlim_max == RLIM_INFINITY || rlim.rlim_max > MAX_FILES)
+ rlim.rlim_cur = MAX_FILES;
+ else
+ rlim.rlim_cur = rlim.rlim_max;
+ setrlimit(RLIMIT_NOFILE, &rlim);
+}
+
+void claim_resources(void)
+{
+ avoid_oom_killer();
+ raise_ulimit();
+}
+
void init_pipe(int reopen_log_pipe[2])
{
int flags;
Xenstored is absolutely mandatory for a Xen host and it can't be restarted, so being killed by OOM-killer in case of memory shortage is to be avoided. Set /proc/$pid/oom_score_adj (if available) to -500 in order to allow xenstored to use large amounts of memory without being killed. In order to support large numbers of domains the limit for open file descriptors might need to be raised. Each domain needs 2 file descriptors (one for the event channel and one for the xl per-domain daemon to connect to xenstored). Try to raise ulimit for open files to 65536. First the hard limit if needed, and then the soft limit. Signed-off-by: Juergen Gross <jgross@suse.com> --- tools/xenstore/xenstored_core.c | 2 ++ tools/xenstore/xenstored_core.h | 3 ++ tools/xenstore/xenstored_minios.c | 4 +++ tools/xenstore/xenstored_posix.c | 46 +++++++++++++++++++++++++++++++ 4 files changed, 55 insertions(+)