summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2017-09-13 10:45:02 +0200
committerErich Eckner <git@eckner.net>2017-09-13 10:45:02 +0200
commitcea5727be1cd69dd721afccdba462ee5e242df44 (patch)
treec9c7f6c0bd6c5c2e75b1436e8102425006bfcdbe
parentef1582777fff756ed391b403266b3bbbabb182a0 (diff)
downloadbuilder-cea5727be1cd69dd721afccdba462ee5e242df44.tar.xz
remove "max_parallel_build_per_client" - every client should run only one build job! - but hand out an old, locked assignment again to the same build slave
-rwxr-xr-xbin/build-packages9
-rwxr-xr-xbin/get-assignment13
-rwxr-xr-xconf/default.conf2
3 files changed, 3 insertions, 21 deletions
diff --git a/bin/build-packages b/bin/build-packages
index 0ba4a57..c0e69d8 100755
--- a/bin/build-packages
+++ b/bin/build-packages
@@ -428,15 +428,6 @@ while [ "${count}" -ne 0 ]; do
;;
- 4)
-
- >&2 echo 'get-assignment told me:'
- >&2 echo " come back, when you've done your work - you hit the limit on"
- >&2 echo ' maximum allowed parallel jobs per ip'
- exit 1
-
- ;;
-
*)
>&2 echo "ERROR: Unknown exit code ${err} from 'get-assignment'."
diff --git a/bin/get-assignment b/bin/get-assignment
index bb9cb40..fb35c0c 100755
--- a/bin/get-assignment
+++ b/bin/get-assignment
@@ -10,8 +10,6 @@
# but currently none has all its dependencies ready
# 3: come back after the next run of get-package-updates - currently
# there are no pending packages
-# 4: come back, when you've done your work - you hit the limit on
-# maximum allowed parallel jobs per ip
# TODO:
@@ -75,9 +73,8 @@ clean_up() {
trap clean_up EXIT
# Check if there are any pending packages at all and if the requester
-# has already hit its max_parallel_build_per_client limit.
+# has already got an assignment.
-num_jobs=0
pending_packages=false
while read -r package git_revision mod_git_revision repository; do
@@ -96,7 +93,8 @@ while read -r package git_revision mod_git_revision repository; do
if [ -f "${work_dir}/package-states/${package}.${git_revision}.${mod_git_revision}.${repository}.locked" ];
then
if [ "${slave}" = "$(head -n1 "${work_dir}/package-states/${package}.${git_revision}.${mod_git_revision}.${repository}.locked")" ]; then
- num_jobs=$((num_jobs+1));
+ echo "${package} ${git_revision} ${mod_git_revision} ${repository}"
+ exit
fi
else
pending_packages=true
@@ -109,11 +107,6 @@ if ! ${pending_packages}; then
exit 3
fi
-if [ ${num_jobs} -ge ${max_parallel_build_per_client} ]; then
- >&2 echo "come back, when you've done your work - you hit the limit on maximum allowed parallel jobs per ip"
- exit 4
-fi
-
# Find first package of build-list whose dependencies are all met
for hand_out_broken in false true; do
diff --git a/conf/default.conf b/conf/default.conf
index c78cc4b..81f68e8 100755
--- a/conf/default.conf
+++ b/conf/default.conf
@@ -29,8 +29,6 @@ master_build_server_port="22"
master_build_server_user="slave"
master_build_server_identity="${work_dir}/.ssh/id_rsa"
-max_parallel_build_per_client=2
-
repo_key='0xdeadbeef'
package_key='0x15eebadc0de'