* Experiment with using a blkio controller.
svn path=/configurations/trunk/tud/; revision=30571
Eelco Dolstra committed
Nov 25, 2011 at 17:44 UTC
acee240d9b339598432cb6d8e1861faa8b12366e
1 file changed
+16
-3
lucifer.nix
+16
-3
@@ -64,6 +64,7 @@
64
services.hydraChannelMirror.period = "0-59/15 * * * *";
65
services.hydraChannelMirror.dataDir = "/data/releases";
66
67
+ /*
68
services.tomcat = {
69
enable = true;
70
baseDir = "/data/tomcat";
@@ -72,6 +73,7 @@
73
+ "-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=8999 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Djava.rmi.server.hostname=localhost "
74
+ "-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/data/tomcat/logs/java_pid<pid>.hprof";
75
};
76
+ */
77
78
services.cron.systemCronJobs =
79
[ "*/5 * * * * hydra-mirror flock -x /data/releases/.lock -c /home/hydra-mirror/release/mirror/mirror-nixos-isos.sh >> /home/hydra-mirror/nixos-mirror.log 2>&1" ];
@@ -82,6 +84,7 @@
84
''
85
mount {
86
cpu = /dev/cgroup/cpu;
87
+ blkio = /dev/cgroup/blkio;
88
}
89
group hydra-server {
90
cpu {
@@ -92,20 +95,30 @@
95
cpu {
96
cpu.shares = "200";
97
}
98
+ blkio {
99
+ blkio.weight = "500";
100
+ }
101
}
102
group hydra-evaluator {
103
cpu {
104
cpu.shares = "100";
105
}
106
}
107
+ group hydra-mirror {
108
+ cpu {
109
+ cpu.shares = "100";
110
+ }
111
+ }
112
'';
113
rules =
114
''
104
- root:nix-worker cpu hydra-build
105
- hydra:nix-store cpu hydra-build
106
- hydra:.hydra_build.pl-wrapped cpu hydra-build
115
+ root:nix-worker cpu,blkio hydra-build
116
+ root:build-remote.pl cpu,blkio hydra-build
117
+ hydra:nix-store cpu,blkio hydra-build
118
+ hydra:.hydra_build.pl-wrapped cpu,blkio hydra-build
119
hydra:.hydra_evaluator.pl-wrapped cpu hydra-evaluator
120
hydra:.hydra_server.pl-wrapped cpu hydra-server
121
+ hydra-mirror cpu hydra-mirror
122
'';
123
};
124