summaryrefslogtreecommitdiff
path: root/distbuild.configure
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-06-05 17:40:02 +0100
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-06-05 17:42:30 +0100
commita0780a6a33358c5b94a633ea5bf3e99a692ef864 (patch)
tree2da28c34b08c82d80866b085d860ddd527e9b84f /distbuild.configure
parentc9fbdd6e6ccdb22ed14ced90b6ec002952e4dd02 (diff)
downloaddefinitions-a0780a6a33358c5b94a633ea5bf3e99a692ef864.tar.gz
Prevent distbuild nodes from filling up their disks
Distbuild workers run `morph gc` before running a build, to remove stale artifacts, but it turns out that they were configured in such a way that the command didn't do anything. Because of this, it was possible for distbuild nodes to break due to filling up their disks with cached git repos and artifacts.
Diffstat (limited to 'distbuild.configure')
-rw-r--r--distbuild.configure7
1 files changed, 2 insertions, 5 deletions
diff --git a/distbuild.configure b/distbuild.configure
index bf145b14..65ac47e3 100644
--- a/distbuild.configure
+++ b/distbuild.configure
@@ -60,9 +60,6 @@ install -d -o 0 -g 0 -m 0755 "$1/srv/distbuild"
# use. However, the setting may only be set for the distbuild
# initiator (which is what the user invokes), so in ALL other
# configuration files we unset it.
-#
-# We disable the disk space requirement checks on non-worker nodes.
-# They don't make sense unless you're building locally.
cat <<EOF > "$1/etc/morph.conf"
[config]
@@ -73,8 +70,8 @@ tempdir = /srv/distbuild/tmp
trove-host = $TROVE_ID
trove-id = $TROVE_ID
controller-initiator-address = $CONTROLLERHOST
-tempdir-min-space = 0
-cachedir-min-space = 0
+tempdir-min-space = 4G
+cachedir-min-space = 4G
build-ref-prefix = $TROVE_ID
artifact-cache-server = http://${ARTIFACT_CACHE_SERVER}:8080/
git-resolve-cache-server = http://${TROVE_ID}:8080/