diff --git a/checkin_notes b/checkin_notes index 28e19a1779..6d3937cec2 100755 --- a/checkin_notes +++ b/checkin_notes @@ -5999,3 +5999,12 @@ David 3 May 2005 sched/ handle_request.C server_types.C + +Bruce 3 May 2005 + - ignore fields p_fpop_err in scheduler requests (still there from + 4.19 core clients) else these generate lots of logfile noise. + David, please revert if you don't like it. + + sched/ + server_types.C + diff --git a/sched/server_types.C b/sched/server_types.C index 4b59007885..be436f8327 100644 --- a/sched/server_types.C +++ b/sched/server_types.C @@ -642,6 +642,9 @@ int HOST::parse(FILE* fin) { p_ncpus = 1; while (fgets(buf, 256, fin)) { + int trash_int; + double trash_double; + if (match_tag(buf, "")) return 0; else if (parse_int(buf, "", timezone)) continue; else if (parse_str(buf, "", domain_name, sizeof(domain_name))) continue; @@ -663,6 +666,12 @@ int HOST::parse(FILE* fin) { else if (parse_double(buf, "", d_free)) continue; else if (parse_double(buf, "", n_bwup)) continue; else if (parse_double(buf, "", n_bwdown)) continue; + // following four lines can be eliminated with a later version of + // the core client. + else if (parse_int(buf, "", trash_int)) continue; + else if (parse_int(buf, "", trash_int)) continue; + else if (parse_int(buf, "", trash_int)) continue; + else if (parse_double(buf, "", trash_double)) continue; else { log_messages.printf(SCHED_MSG_LOG::NORMAL, "HOST::parse(): unrecognized: %s\n", buf