Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Merge pull request #2462 from BOINC/dpa_submit5 

remote job submission: fix bug that caused spurious errors to be returned
This commit is contained in:
Kevin Reed 2018-04-10 09:29:06 -05:00 committed by GitHub
parent f43e2971fa c5f0b4a88d
commit 5fc7c364dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
html/user/submit_rpc_handler.php
View File

@ -543,22 +543,22 @@ function n_outfiles($wu) {
// error: // error:
function show_job_details($wu) { function show_job_details($wu) {
if ($wu->error_mask && WU_ERROR_COULDNT_SEND_RESULT) { if ($wu->error_mask & WU_ERROR_COULDNT_SEND_RESULT) {
echo " <error>couldnt_send_result</error>\n"; echo " <error>couldnt_send_result</error>\n";
} }
if ($wu->error_mask && WU_ERROR_TOO_MANY_ERROR_RESULTS) { if ($wu->error_mask & WU_ERROR_TOO_MANY_ERROR_RESULTS) {
echo " <error>too_many_error_results</error>\n"; echo " <error>too_many_error_results</error>\n";
} }
if ($wu->error_mask && WU_ERROR_TOO_MANY_SUCCESS_RESULTS) { if ($wu->error_mask & WU_ERROR_TOO_MANY_SUCCESS_RESULTS) {
echo " <error>too_many_success_results</error>\n"; echo " <error>too_many_success_results</error>\n";
} }
if ($wu->error_mask && WU_ERROR_TOO_MANY_TOTAL_RESULTS) { if ($wu->error_mask & WU_ERROR_TOO_MANY_TOTAL_RESULTS) {
echo " <error>too_many_total_results</error>\n"; echo " <error>too_many_total_results</error>\n";
} }
if ($wu->error_mask && WU_ERROR_CANCELLED) { if ($wu->error_mask & WU_ERROR_CANCELLED) {
echo " <error>cancelled</error>\n"; echo " <error>cancelled</error>\n";
} }
if ($wu->error_mask && WU_ERROR_NO_CANONICAL_RESULT) { if ($wu->error_mask & WU_ERROR_NO_CANONICAL_RESULT) {
echo " <error>no_canonical_result</error>\n"; echo " <error>no_canonical_result</error>\n";
} }
$results = BoincResult::enum("workunitid=$wu->id"); $results = BoincResult::enum("workunitid=$wu->id");
@ -569,7 +569,7 @@ function show_job_details($wu) {
$in_progress++; $in_progress++;
break; break;
} }
if ($wu->error_mask && $r->outcome == RESULT_OUTCOME_CLIENT_ERROR) { if ($wu->error_mask && ($r->outcome == RESULT_OUTCOME_CLIENT_ERROR)) {
echo " <exit_status>$r->exit_status</exit_status>\n"; echo " <exit_status>$r->exit_status</exit_status>\n";
} }
if ($r->id == $wu->canonical_resultid) { if ($r->id == $wu->canonical_resultid) {