diff --git a/checkin_notes b/checkin_notes
index 57812e473e..bb49da64e3 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -7694,3 +7694,24 @@ Charlie 19 July 2006
mac_build/
boinc.xcodeproj/
project.pbxproj
+
+David 19 July 2006
+ - make test_uc.py work again:
+ - request work fetch when master URL fetch completed
+ - set CGI and file upload handler debugging mode in test
+ - use cc_config.xml instead of log_flags.xml
+ - use min_sendwork_interval = 0 if test
+ - added some work fetch messages
+ - core client: only do "platform change" logic
+ if there was an original platform
+
+ client/
+ client_state.C
+ cs_scheduler.C
+ scheduler_op.C
+ py/Boinc/
+ setup_project.py
+ test/
+ cc_config.xml (new)
+ log_flags.xml (removed)
+ testbase.py
diff --git a/client/client_state.C b/client/client_state.C
index d253b9e123..da4d450aae 100644
--- a/client/client_state.C
+++ b/client/client_state.C
@@ -297,7 +297,7 @@ int CLIENT_STATE::init() {
// Has platform name changed? If so reset all.
// This could happen e.g. if user copies files from PPC to Intel Mac
//
- if (strcmp(platform_name, statefile_platform_name.c_str())) {
+ if (statefile_platform_name.size() && strcmp(platform_name, statefile_platform_name.c_str())) {
msg_printf(NULL, MSG_INFO,
"Platform changed from %s to %s - resetting projects",
statefile_platform_name.c_str(), platform_name
diff --git a/client/cs_scheduler.C b/client/cs_scheduler.C
index 5cee067125..c2e4535b73 100644
--- a/client/cs_scheduler.C
+++ b/client/cs_scheduler.C
@@ -601,7 +601,15 @@ int CLIENT_STATE::compute_work_requests() {
p->work_request = 0;
p->work_request_urgency = WORK_FETCH_DONT_NEED;
- if (!p->contactable()) continue;
+ if (!p->contactable()) {
+ if (log_flags.work_fetch_debug) {
+ msg_printf(0, MSG_INFO,
+ "compute_work_requests(): project '%s' is not contactable",
+ p->project_name
+ );
+ }
+ continue;
+ }
// if system has been running in round robin,
// then all projects will have a LT debt greater than
@@ -617,6 +625,12 @@ int CLIENT_STATE::compute_work_requests() {
&& (overall_work_fetch_urgency != WORK_FETCH_NEED_IMMEDIATELY)
&& (prrs != p->resource_share)
) {
+ if (log_flags.work_fetch_debug) {
+ msg_printf(0, MSG_INFO,
+ "compute_work_requests(): project '%s' is overworked",
+ p->project_name
+ );
+ }
continue;
}
diff --git a/client/scheduler_op.C b/client/scheduler_op.C
index 8508f7563a..e877370a8e 100644
--- a/client/scheduler_op.C
+++ b/client/scheduler_op.C
@@ -434,6 +434,7 @@ bool SCHEDULER_OP::poll() {
backoff(cur_proj, buf);
}
}
+ gstate.request_work_fetch("Master fetch complete");
cur_proj = NULL;
return true;
}
diff --git a/py/Boinc/setup_project.py b/py/Boinc/setup_project.py
index f69b0bafef..9a46c8e3e3 100644
--- a/py/Boinc/setup_project.py
+++ b/py/Boinc/setup_project.py
@@ -378,15 +378,16 @@ class Project:
config.db_passwd = options.db_passwd
config.db_host = options.db_host
config.shmem_key = generate_shmem_key()
- config.output_level = 3
config.uldl_dir_fanout = 1024
local_host = socket.gethostname()
config.host = local_host.split('.')[0]
- config.min_sendwork_interval = 6
+ config.min_sendwork_interval = 0
config.max_wus_to_send = 50
config.daily_result_quota = 500
config.disable_account_creation = 1
config.show_results = 1
+ config.sched_debug_level = 3
+ config.fuh_debug_level = 3
config.master_url = master_url or os.path.join(options.html_url , self.short_name , '')
config.download_url = os.path.join(config.master_url, 'download')
@@ -398,6 +399,7 @@ class Project:
config.app_dir = os.path.join(self.project_dir, 'apps')
if production:
config.one_result_per_user_per_wu = '1'
+ config.min_sendwork_interval = 6
self.scheduler_url = os.path.join(config.cgi_url , 'cgi')
diff --git a/test/cc_config.xml b/test/cc_config.xml
new file mode 100644
index 0000000000..2679fc1238
--- /dev/null
+++ b/test/cc_config.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/log_flags.xml b/test/log_flags.xml
deleted file mode 100644
index 8fbec299e7..0000000000
--- a/test/log_flags.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/test/testbase.py b/test/testbase.py
index c56562eb2a..b152ade98c 100644
--- a/test/testbase.py
+++ b/test/testbase.py
@@ -507,7 +507,7 @@ class Host:
self.users = []
self.projects = []
self.global_prefs = None
- self.log_flags = 'log_flags.xml'
+ self.cc_config = 'cc_config.xml'
self.host_dir = os.path.join(options.hosts_dir, self.name)
self.defargs = "-exit_when_idle -skip_cpu_benchmarks -return_results_immediately"
# self.defargs = "-exit_when_idle -skip_cpu_benchmarks -sched_retry_delay_bin 1"
@@ -538,8 +538,8 @@ class Host:
f.close()
# copy log flags and global prefs, if any
- if self.log_flags:
- shutil.copy(self.log_flags, self.dir('log_flags.xml'))
+ if self.cc_config:
+ shutil.copy(self.cc_config, self.dir('cc_config.xml'))
# if self.global_prefs:
# shell_call("cp %s %s" % (self.global_prefs, self.dir('global_prefs.xml')))
# # shutil.copy(self.global_prefs, self.dir('global_prefs.xml'))