Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

- scheduler: bug fix in HR code: 

in wu_is_infeasible(), check whether host type is unknown
    before seeing if WU is already committed  to different type

svn path=/trunk/boinc/; revision=13777
This commit is contained in:
David Anderson 2007-10-04 21:55:37 +00:00
parent 0f1461695c
commit 64db0fa655
5 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
checkin_notes
View File

@ -9153,3 +9153,13 @@ David 4 Oct 2007
prefs.C
sched/
file_upload_handler.C
David 4 Oct 2007
- scheduler: bug fix in HR code:
in wu_is_infeasible(), check whether host type is unknown
before seeing if WU is already committed to different type
sched/
sched_array.C
sched_locality.C
sched_send.C,h

4
sched/sched_array.C
View File

@ -113,7 +113,7 @@ void scan_work_array(
// don't send if host can't handle it
//
wu = wu_result.workunit;
retval = wu_is_infeasible(wu, sreq, reply, app);
retval = wu_is_infeasible(wu, sreq, reply, *app);
if (retval) {
log_messages.printf(
SCHED_MSG_LOG::MSG_DEBUG, "[HOST#%d] [WU#%d %s] WU is infeasible: %d\n",
@ -224,7 +224,7 @@ void scan_work_array(
// This ensures that jobs already assigned to a platform
// are processed first.
//
wu_result.infeasible_count++;
wu_result.infeasible_count++;
goto dont_send;
}
}

2
sched/sched_locality.C
View File

@ -306,7 +306,7 @@ static int possibly_send_result(
// INFEASIBLE_MEM, INFEASIBLE_DISK, INFEASIBLE_CPU.
// see sched_send.h.
//
if (wu_is_infeasible(wu, sreq, reply, app)) {
if (wu_is_infeasible(wu, sreq, reply, *app)) {
return ERR_INSUFFICIENT_RESOURCE;
}

17
sched/sched_send.C
View File

@ -422,19 +422,26 @@ static inline int check_deadline(
// Should move a few other checks from sched_array.C
//
int wu_is_infeasible(
WORKUNIT& wu, SCHEDULER_REQUEST& request, SCHEDULER_REPLY& reply,
APP* app
WORKUNIT& wu, SCHEDULER_REQUEST& request, SCHEDULER_REPLY& reply, APP& app
) {
int retval;
// homogeneous redundancy, quick check
//
if (config.homogeneous_redundancy || app->homogeneous_redundancy) {
if (already_sent_to_different_platform_quick(request, wu, *app)) {
if (app_hr_type(app)) {
if (hr_unknown_platform_type(reply.host, app_hr_type(app))) {
log_messages.printf(
SCHED_MSG_LOG::MSG_DEBUG,
"[HOST#%d] [WU#%d %s] host is of unknown class in HR type %d\n",
reply.host.id, wu.id, app_hr_type(app)
);
return INFEASIBLE_HR;
}
if (already_sent_to_different_platform_quick(request, wu, app)) {
log_messages.printf(
SCHED_MSG_LOG::MSG_DEBUG,
"[HOST#%d] [WU#%d %s] failed quick HR check: WU is class %d, host is class %d\n",
reply.host.id, wu.id, wu.name, wu.hr_class, hr_class(request.host, app_hr_type(*app))
reply.host.id, wu.id, wu.name, wu.hr_class, hr_class(request.host, app_hr_type(app))
);
return INFEASIBLE_HR;
}

2
sched/sched_send.h
View File

@ -53,7 +53,7 @@ extern bool app_core_compatible(WORK_REQ& wreq, APP_VERSION& av);
#define INFEASIBLE_HR 8
extern int wu_is_infeasible(
WORKUNIT&, SCHEDULER_REQUEST&, SCHEDULER_REPLY&, APP*
WORKUNIT&, SCHEDULER_REQUEST&, SCHEDULER_REPLY&, APP&
);
extern double max_allowable_disk(SCHEDULER_REQUEST&, SCHEDULER_REPLY&);