From 71b6508313dbeecc175831e1ea831445322a500b Mon Sep 17 00:00:00 2001 From: David Anderson Date: Sat, 2 Mar 2013 22:40:49 -0800 Subject: [PATCH] - client: add config option; requests work when you update a project even if it's not highest priority --- client/work_fetch.cpp | 7 +++++++ html/ops/single_job_setup.php | 2 +- lib/cc_config.cpp | 4 ++++ lib/cc_config.h | 1 + 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/client/work_fetch.cpp b/client/work_fetch.cpp index 860f307faa..e6af204275 100644 --- a/client/work_fetch.cpp +++ b/client/work_fetch.cpp @@ -717,6 +717,13 @@ void WORK_FETCH::piggyback_work_request(PROJECT* p) { return; } + // if project was updated from manager and config says so, + // always fetch work if needed + // + if (p->sched_rpc_pending && config.fetch_on_update) { + set_all_requests_hyst(p, -1); + return; + } compute_cant_fetch_work_reason(); PROJECT* bestp = choose_project(false); if (p != bestp) { diff --git a/html/ops/single_job_setup.php b/html/ops/single_job_setup.php index 4ebb341341..23028dd9e9 100755 --- a/html/ops/single_job_setup.php +++ b/html/ops/single_job_setup.php @@ -119,7 +119,7 @@ function make_app_version_dir($app_name, $i, $platform) { } -// check for apps/appname/appname/N/platform, +// check for apps/appname/1.N/platform, // find the largest such N; see if have new wrapper // If needed, create new version, copy wrapper // diff --git a/lib/cc_config.cpp b/lib/cc_config.cpp index 4f4647839e..20c1bda7e0 100644 --- a/lib/cc_config.cpp +++ b/lib/cc_config.cpp @@ -212,6 +212,7 @@ void CONFIG::defaults() { exit_before_start = false; exit_when_idle = false; fetch_minimal_work = false; + fetch_on_update = false; force_auth = "default"; http_1_0 = false; http_transfer_timeout = 300; @@ -356,6 +357,7 @@ int CONFIG::parse_options(XML_PARSER& xp) { continue; } if (xp.parse_bool("fetch_minimal_work", fetch_minimal_work)) continue; + if (xp.parse_bool("fetch_on_update", fetch_on_update)) continue; if (xp.parse_string("force_auth", force_auth)) { downcase_string(force_auth); continue; @@ -530,6 +532,7 @@ int CONFIG::write(MIOFILE& out, LOG_FLAGS& log_flags) { " %d\n" " %d\n" " %d\n" + " %d\n" " %s\n" " %d\n" " %d\n" @@ -538,6 +541,7 @@ int CONFIG::write(MIOFILE& out, LOG_FLAGS& log_flags) { exit_before_start, exit_when_idle, fetch_minimal_work, + fetch_on_update, force_auth.c_str(), http_1_0, http_transfer_timeout, diff --git a/lib/cc_config.h b/lib/cc_config.h index 161cf2e1eb..29acd83e73 100644 --- a/lib/cc_config.h +++ b/lib/cc_config.h @@ -151,6 +151,7 @@ struct CONFIG { bool exit_before_start; bool exit_when_idle; bool fetch_minimal_work; + bool fetch_on_update; std::string force_auth; bool http_1_0; int http_transfer_timeout_bps;