systemd: Introduce systemd_service_oomscoreadjust_extra_in

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/locking/meson.build b/src/locking/meson.build
index f3bdf57483a904ec78ee121c7011631c0d31e615..d15e2cb84a4d45b48697ceae6d4bfe527b9a7ea5 100644 (file)
--- a/src/locking/meson.build
+++ b/src/locking/meson.build
@@ -145,6 +145,7 @@ if conf.has('WITH_LIBVIRTD')
     'service': 'virtlockd',
     'service_in': files('virtlockd.service.in'),
     'service_extra_in': [
+      systemd_service_oomscoreadjust_extra_in,
       systemd_service_limitnofile_extra_in,
     ],
     'name': 'locking',

diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in
index 5c374fea8f4e4beb92945c902f4c50410623c90f..cd6c77c6af7eda04a488806fd4f0626eadf93212 100644 (file)
--- a/src/locking/virtlockd.service.in
+++ b/src/locking/virtlockd.service.in
@@ -13,10 +13,6 @@ Environment=VIRTLOCKD_ARGS=
 EnvironmentFile=-@initconfdir@/virtlockd
 ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS
 ExecReload=/bin/kill -USR1 $MAINPID
-# Losing the locks is a really bad thing that will
-# cause the machine to be fenced (rebooted), so make
-# sure we discourage OOM killer
-OOMScoreAdjust=-900
 
 [Install]
 WantedBy=multi-user.target

diff --git a/src/logging/meson.build b/src/logging/meson.build
index a3d0ad297ce586d1999175ac97662afb5ca55afe..fbf492b16e739bd4fd1d265602302a79d6387164 100644 (file)
--- a/src/logging/meson.build
+++ b/src/logging/meson.build
@@ -92,6 +92,7 @@ if conf.has('WITH_LIBVIRTD')
     'service': 'virtlogd',
     'service_in': files('virtlogd.service.in'),
     'service_extra_in': [
+      systemd_service_oomscoreadjust_extra_in,
       systemd_service_limitnofile_extra_in,
     ],
     'name': 'logging',

diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in
index 9108dd1ff9e4f5e9383ea18d9ffb790a05a3cbb7..569c9f88ad318e3201eecb16d13716bdeb49e49a 100644 (file)
--- a/src/logging/virtlogd.service.in
+++ b/src/logging/virtlogd.service.in
@@ -13,10 +13,6 @@ Environment=VIRTLOGD_ARGS=
 EnvironmentFile=-@initconfdir@/virtlogd
 ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS
 ExecReload=/bin/kill -USR1 $MAINPID
-# Losing the logs is a really bad thing that will
-# cause the machine to be fenced (rebooted), so make
-# sure we discourage OOM killer
-OOMScoreAdjust=-900
 
 [Install]
 WantedBy=multi-user.target

diff --git a/src/meson.build b/src/meson.build
index 28e4b83619546fd3e4e5487c8ac5f209e525bb64..05e89c998f534b05927726aa196da9f64d70827b 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -197,6 +197,7 @@ guest_unit_files = []
 systemd_service_limitnofile_extra_in = files('virtd.service.limitnofile.extra.in')
 systemd_service_tasksmax_extra_in = files('virtd.service.tasksmax.extra.in')
 systemd_service_limitmemlock_extra_in = files('virtd.service.limitmemlock.extra.in')
+systemd_service_oomscoreadjust_extra_in = files('virtd.service.oomscoreadjust.extra.in')
 
 # virt_daemon_units:
 #   generate libvirt daemon systemd unit files

diff --git a/src/virtd.service.oomscoreadjust.extra.in b/src/virtd.service.oomscoreadjust.extra.in
new file mode 100644 (file)
index 0000000..53b93ef
--- /dev/null
+++ b/src/virtd.service.oomscoreadjust.extra.in
@@ -0,0 +1,5 @@
+[Service]
+# Losing this daemon is a really bad thing that will
+# cause the machine to be fenced (rebooted), so make
+# sure we discourage OOM killer
+OOMScoreAdjust=-900