diff --git a/checkin_notes b/checkin_notes index 8e50786e69..87c51309a9 100644 --- a/checkin_notes +++ b/checkin_notes @@ -3322,3 +3322,13 @@ David 13 Apr 2012 client/ hostinfo_network.cpp + +David 17 Apr 2012 + - scheduler: fix bug in assigned-job logic (from Derrick Kondo) + - client: only send active tasks in get_simple_gui_info GUI RPC + + sched/ + sched_assign.cpp + client/ + client_types.h + gui_rpc_server_ops.cpp diff --git a/client/client_types.h b/client/client_types.h index 389f52d138..3b064a3f35 100644 --- a/client/client_types.h +++ b/client/client_types.h @@ -354,6 +354,8 @@ struct PROJECT : PROJ_AM { // have trickle up to send double last_rpc_time; // when last RPC finished + // not maintained across client sessions + // used by Manager (simple view) // Other stuff diff --git a/client/gui_rpc_server_ops.cpp b/client/gui_rpc_server_ops.cpp index 2f316f49a9..4235e95d10 100644 --- a/client/gui_rpc_server_ops.cpp +++ b/client/gui_rpc_server_ops.cpp @@ -116,7 +116,7 @@ static void handle_get_simple_gui_info(GUI_RPC_CONN& grc) { PROJECT* p = gstate.projects[i]; p->write_state(grc.mfout, true); } - gstate.write_tasks_gui(grc.mfout, false); + gstate.write_tasks_gui(grc.mfout, true); grc.mfout.printf("\n"); } diff --git a/sched/sched_assign.cpp b/sched/sched_assign.cpp index 72715ac14c..cd37ded150 100644 --- a/sched/sched_assign.cpp +++ b/sched/sched_assign.cpp @@ -196,7 +196,7 @@ bool send_assigned_jobs() { // sprintf(buf, "where workunitid=%d and hostid=%d", asg.workunitid, - g_request->host.id + g_reply->host.id ); retval = result.lookup(buf); if (retval != ERR_DB_NOT_FOUND) continue;