Gitweb:
http://git.fedorahosted.org/git/?p=dlm.git;a=commitdiff;h=30e3ef3ebf98e9e...
Commit: 30e3ef3ebf98e9ea753e8e8a0597030abc89bdeb
Parent: f545f48edeaab6a76e5c8e55a5f072d41b553597
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Mon Nov 5 14:20:07 2012 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Nov 5 14:20:07 2012 -0600
dlm_controld: don't use high priority scheduling
I don't think it's necessary.
Also set OOM value in service file.
Signed-off-by: David Teigland <teigland(a)redhat.com>
---
dlm_controld/dlm_daemon.h | 2 +-
dlm_controld/main.c | 5 ++++-
init/dlm.service | 1 +
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/dlm_controld/dlm_daemon.h b/dlm_controld/dlm_daemon.h
index 377f28d..ad99e17 100644
--- a/dlm_controld/dlm_daemon.h
+++ b/dlm_controld/dlm_daemon.h
@@ -89,6 +89,7 @@ enum {
enum {
daemon_debug_ind = 0,
+ foreground_ind,
log_debug_ind,
timewarn_ind,
protocol_ind,
@@ -109,7 +110,6 @@ enum {
enable_quorum_lockspace_ind,
help_ind,
version_ind,
- foreground_ind,
dlm_options_max,
};
diff --git a/dlm_controld/main.c b/dlm_controld/main.c
index d1fdb2a..91fbc4f 100644
--- a/dlm_controld/main.c
+++ b/dlm_controld/main.c
@@ -1533,6 +1533,8 @@ static void set_opt_cli(int argc, char **argv)
}
}
+#if 0
+/* When this is used, the systemd service file needs ControlGroup=cpu:/ */
static void set_scheduler(void)
{
struct sched_param sched_param;
@@ -1550,6 +1552,7 @@ static void set_scheduler(void)
errno);
}
}
+#endif
int main(int argc, char **argv)
{
@@ -1612,7 +1615,7 @@ int main(int argc, char **argv)
if (rv < 0)
return -rv;
- set_scheduler();
+ /* set_scheduler(); */
loop();
diff --git a/init/dlm.service b/init/dlm.service
index f068c63..198c8ce 100644
--- a/init/dlm.service
+++ b/init/dlm.service
@@ -3,6 +3,7 @@ Description=dlm control daemon
After=syslog.target network.target corosync.service sys-kernel-config.mount
[Service]
+OOMScoreAdjust=-1000
Type=notify
NotifyAccess=main
EnvironmentFile=/etc/sysconfig/dlm