- credit trickle handler: write log messages if sanity checks fail

svn path=/trunk/boinc/; revision=24018
This commit is contained in:
David Anderson 2011-08-21 11:57:00 +00:00
parent 8fda6c0497
commit 3dc556680a
2 changed files with 39 additions and 4 deletions

View File

@ -4941,3 +4941,9 @@ David 21 Aug 2011
client/ client/
acct_setup.cpp,h acct_setup.cpp,h
gui_rpc_server_ops.cpp gui_rpc_server_ops.cpp
David 21 Aug 2011
- credit trickle handler: write log messages if sanity checks fail
sched/
trickle_credit.cpp

View File

@ -24,6 +24,14 @@
// NOTE: there is no cheat-prevention mechanism here; add your own. // NOTE: there is no cheat-prevention mechanism here; add your own.
// NOTE: doesn't work for GPU apps // NOTE: doesn't work for GPU apps
// sanity-check bounds:
#define MIN_FLOPS 1e9
// if host FLOPS is < 0, set it to this
#define MAX_FLOPS 2e10
// cap host FLOPS at this
#define MAX_RUNTIME 3600.
// this corresponds to the --trickle arg to vboxwrapper
#include "error_numbers.h" #include "error_numbers.h"
#include "util.h" #include "util.h"
@ -44,8 +52,8 @@ int handle_trickle(MSG_FROM_HOST& msg) {
if (xp.parse_double("cpu_time", cpu_time)) break; if (xp.parse_double("cpu_time", cpu_time)) break;
log_messages.printf(MSG_NORMAL, "unexpected tag: %s\n", xp.parsed_tag); log_messages.printf(MSG_NORMAL, "unexpected tag: %s\n", xp.parsed_tag);
} }
if (!cpu_time) { if (cpu_time <= 0) {
log_messages.printf(MSG_NORMAL, "unexpected zero CPU time\n"); log_messages.printf(MSG_NORMAL, "unexpected nonpositive CPU time: %f\n", cpu_time);
return ERR_XML_PARSE; return ERR_XML_PARSE;
} }
@ -58,10 +66,31 @@ int handle_trickle(MSG_FROM_HOST& msg) {
// sanity checks - customize as needed // sanity checks - customize as needed
// //
if (cpu_flops_sec < 0) cpu_flops_sec = 1e9; if (cpu_time > MAX_RUNTIME) {
if (cpu_flops_sec > 2e10) cpu_flops_sec = 2e10; log_messages.printf(MSG_NORMAL,
"Reported runtime exceeds bound: %f>%f\n", cpu_time, MAX_RUNTIME
);
return 0;
}
if (cpu_flops_sec < 0) {
log_messages.printf(MSG_NORMAL,
"host CPU speed %f < 0. Using %f instead\n",
cpu_flops_sec, MIN_FLOPS
);
cpu_flops_sec = MIN_FLOPS;
}
if (cpu_flops_sec > 2e10) {
log_messages.printf(MSG_NORMAL,
"host CPU speed %f exceeds %f. Using %f instead\n",
cpu_flops_sec, MAX_FLOPS, MAX_FLOPS
);
cpu_flops_sec = 2e10;
}
double credit = cpu_time_to_credit(cpu_time, cpu_flops_sec); double credit = cpu_time_to_credit(cpu_time, cpu_flops_sec);
grant_credit(host, dtime()-86400, credit); grant_credit(host, dtime()-86400, credit);
log_messages.printf(MSG_DEBUG,
"granting %f credit to host %d\n", credit, host.id
);
// update the host's credit fields // update the host's credit fields
// //