Skip to content

Commit 66e0ba8

Browse files
scheduler: update parsing of host info.
The client sends docker_type, not docker_available.
1 parent f90a2ed commit 66e0ba8

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

db/boinc_db_types.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -379,11 +379,10 @@ struct HOST {
379379
WSL_DISTROS wsl_distros;
380380

381381
// Docker info (non-Win only)
382-
bool docker_available;
383-
// present and allowed by config
384-
bool docker_compose_available;
385382
char docker_version[256];
383+
int docker_type;
386384
char docker_compose_version[256];
385+
int docker_compose_type;
387386

388387
// stuff from time_stats
389388
double cpu_and_network_available_frac;

sched/sched_types.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1405,10 +1405,10 @@ int HOST::parse(XML_PARSER& xp) {
14051405
if (xp.parse_double("n_bwup", n_bwup)) continue;
14061406
if (xp.parse_double("n_bwdown", n_bwdown)) continue;
14071407
if (xp.parse_str("p_features", p_features, sizeof(p_features))) continue;
1408-
if (xp.parse_bool("docker_available", docker_available)) continue;
1409-
if (xp.parse_bool("docker_compose_available", docker_compose_available)) continue;
14101408
if (xp.parse_str("docker_version", docker_version, sizeof(docker_version))) continue;
1409+
if (xp.parse_int("docker_type", docker_type)) continue;
14111410
if (xp.parse_str("docker_compose_version", docker_compose_version, sizeof(docker_compose_version))) continue;
1411+
if (xp.parse_int("docker_compose_type", docker_compose_type)) continue;
14121412
if (xp.parse_str("virtualbox_version", virtualbox_version, sizeof(virtualbox_version))) continue;
14131413
if (xp.parse_bool("p_vm_extensions_disabled", p_vm_extensions_disabled)) continue;
14141414
if (xp.match_tag("opencl_cpu_prop")) {

0 commit comments

Comments
 (0)