From 52c51fbae46f9c1f6aa954d119e11cc29ac753b3 Mon Sep 17 00:00:00 2001 From: Lana Alber Date: Fri, 15 Oct 2004 23:02:44 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=4333 --- checkin_notes | 8 ++++++++ sched/db_purge.C | 39 ++++++++++++++++++++------------------- sched/transitioner.C | 3 ++- 3 files changed, 30 insertions(+), 20 deletions(-) diff --git a/checkin_notes b/checkin_notes index 39a68ba2b7..7c8548e95d 100755 --- a/checkin_notes +++ b/checkin_notes @@ -18443,3 +18443,11 @@ David 15 Oct 2004 client/win/ wingui_mainwindow.cpp + +Lana 15 Oct 2004 + - fixed bug in transitioner marking validate state as NO CHECK + for the workunits with the number of results exceeding max total + results + + sched/ + transitioner.C diff --git a/sched/db_purge.C b/sched/db_purge.C index 7d2d713fc0..b70703eb40 100644 --- a/sched/db_purge.C +++ b/sched/db_purge.C @@ -48,7 +48,7 @@ using namespace std; #define DB_QUERY_LIMIT 1000 #define NUMBER_RECORDS_PER_ARCHIVE_FILE 100000 -#define MAX_WORKUNITS_PURGED_IN_ONE_RUN 100000 +#define MAX_WORKUNITS_PURGED_IN_ONE_RUN 5 SCHED_CONFIG config; FILE *wu_stream; @@ -64,10 +64,10 @@ int open_archive(char* filename_prefix, FILE*& f, int id){ (id - (id % NUMBER_RECORDS_PER_ARCHIVE_FILE)) ); - log_messages.printf(SCHED_MSG_LOG::NORMAL, "Opening archive %s\n", path); + fprintf(stdout, "Opening archive %s\n", path); if ((f = fopen( path,"a")) == NULL) { - log_messages.printf(SCHED_MSG_LOG::CRITICAL, + fprintf(stdout, "Can't open archive file %s\n", path ); return ERR_FOPEN; @@ -84,7 +84,7 @@ int open_archive(char* filename_prefix, FILE*& f, int id){ int archive_result(DB_RESULT& result) { int retval = open_archive(RESULT_FILENAME_PREFIX, re_stream, result.id); if (retval) { - log_messages.printf(SCHED_MSG_LOG::CRITICAL, + fprintf(stdout, "Can't open result archive for result %d\n", result.id ); exit(1); @@ -165,7 +165,7 @@ int archive_result(DB_RESULT& result) { int archive_wu(DB_WORKUNIT& wu) { int retval = open_archive(WU_FILENAME_PREFIX, wu_stream, wu.id); if (retval) { - log_messages.printf(SCHED_MSG_LOG::CRITICAL, + fprintf(stdout, "Can't open archive for workunit %d\n", wu.id ); exit(1); @@ -244,22 +244,22 @@ int purge_and_archive_results(DB_WORKUNIT& wu, int& number_results) { number_results=0; - sprintf(buf, "where workunitid=%d order by id", wu.id); + sprintf(buf, "where workunitid=%d by id", wu.id); while (!result.enumerate(buf)) { retval= archive_result(result); if (retval) { - log_messages.printf(SCHED_MSG_LOG::CRITICAL, + fprintf(stdout, "Failed to archive result [%d] to a file\n", result.id ); return retval; } - log_messages.printf(SCHED_MSG_LOG::NORMAL, + fprintf(stdout, "Archived result [%d] to a file\n", result.id ); retval= result.delete_from_db(); if (retval) return retval; - log_messages.printf(SCHED_MSG_LOG::NORMAL, + fprintf(stdout, "Purged result [%d] from database\n", result.id ); @@ -275,19 +275,20 @@ int main(int argc, char** argv) { retval= config.parse_file(".."); if (retval) { - log_messages.printf(SCHED_MSG_LOG::CRITICAL, + fprintf(stdout, "Can't parse config file\n"); exit(1); } - log_messages.printf(SCHED_MSG_LOG::NORMAL, "Starting DB Purger\n"); + fprintf(stdout, "Starting DB Purger\n"); retval = boinc_db.open(config.db_name, config.db_host, config.db_user, config.db_passwd); if (retval) { - log_messages.printf(SCHED_MSG_LOG::CRITICAL, "Can't open DB\n"); + fprintf(stdout, "Can't open DB\n"); exit(1); } + fprintf(stdout, "Opened DB\n"); mkdir("../archives", 0777); @@ -295,7 +296,7 @@ int main(int argc, char** argv) { DB_WORKUNIT wu; char buf[256]; - sprintf(buf, "where file_delete_state=%d order by id limit %d", + sprintf(buf, "where file_delete_state=%d limit %d", FILE_DELETE_DONE, DB_QUERY_LIMIT); int n= 0; while (!wu.enumerate(buf)) { @@ -306,22 +307,22 @@ int main(int argc, char** argv) { retval= archive_wu(wu); if (retval) { - log_messages.printf(SCHED_MSG_LOG::CRITICAL, + fprintf(stdout, "Failed to write to XML file workunit:%d\n", wu.id ); exit(1); } - log_messages.printf(SCHED_MSG_LOG::NORMAL, + fprintf(stdout, "Archived workunit [%d] to a file\n", wu.id); retval= wu.delete_from_db(); if (retval) { - log_messages.printf(SCHED_MSG_LOG::CRITICAL, + fprintf(stdout, "Can't delete workunit [%d] from database:%d\n", wu.id, retval ); exit(1); } - log_messages.printf(SCHED_MSG_LOG::NORMAL, + fprintf(stdout, "Purged workunit [%d] from database\n", wu.id ); @@ -332,11 +333,11 @@ int main(int argc, char** argv) { boinc_db.close(); if (!did_something) { - log_messages.printf(SCHED_MSG_LOG::CRITICAL, "Did not do anything\n"); + fprintf(stdout, "Did not do anything\n"); exit(1); } - log_messages.printf(SCHED_MSG_LOG::NORMAL, + fprintf(stdout, "Archived %d workunits and %d results\n", purged_workunits,purged_results ); diff --git a/sched/transitioner.C b/sched/transitioner.C index 9698e138fd..975ee44295 100644 --- a/sched/transitioner.C +++ b/sched/transitioner.C @@ -210,7 +210,8 @@ int handle_wu( res_item.res_outcome = RESULT_OUTCOME_DIDNT_NEED; update_result = true; } - if (res_item.res_validate_state == VALIDATE_STATE_INIT) { + if ((res_item.res_validate_state == VALIDATE_STATE_INIT) && + (res_item.res_outcome != RESULT_OUTCOME_SUCCESS)) { res_item.res_validate_state = VALIDATE_STATE_NO_CHECK; update_result = true; }