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

remote job submission: specify all fields on batch creation. 

Newer versions of MySQL error out if you don't.
This commit is contained in:
David Anderson 2020-09-24 22:06:53 -07:00
parent f948f3f7c3
commit dd332d61ed
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
html/user/submit_rpc_handler.php
View File

@ -496,8 +496,9 @@ function submit_batch($r) {
} else {
$batch_name = (string)($r->batch->batch_name);
$batch_name = BoincDb::escape_string($batch_name);
$state = BATCH_STATE_INIT;
$batch_id = BoincBatch::insert(
"(user_id, create_time, njobs, name, app_id, logical_end_time, state) values ($user->id, $now, $njobs, '$batch_name', $app->id, $let, ".BATCH_STATE_INIT.")"
"(user_id, create_time, logical_start_time, logical_end_time, est_completion_time, njobs, fraction_done, nerror_jobs, state, completion_time, credit_estimate, credit_canonical, credit_total, name, app_id, project_state, description, expire_time) values ($user->id, $now, 0, $let, 0, $njobs, 0, 0, $state, 0, 0, 0, 0, '$batch_name', $app->id, 0, '', 0)"
);
if (!$batch_id) {
log_write("can't create batch");
@ -550,8 +551,9 @@ function create_batch($r) {
$batch_name = (string)($r->batch_name);
$batch_name = BoincDb::escape_string($batch_name);
$expire_time = (double)($r->expire_time);
$state = BATCH_STATE_INIT;
$batch_id = BoincBatch::insert(
"(user_id, create_time, name, app_id, state, expire_time) values ($user->id, $now, '$batch_name', $app->id, ".BATCH_STATE_INIT.", $expire_time)"
"(user_id, create_time, logical_start_time, logical_end_time, est_completion_time, njobs, fraction_done, nerror_jobs, state, completion_time, credit_estimate, credit_canonical, credit_total, name, app_id, project_state, description, expire_time) values ($user->id, $now, 0, 0, 0, 0, 0, 0, $state, 0, 0, 0, 0, '$batch_name', $app->id, 0, '', $expire_time)"
);
if (!$batch_id) {
log_write("Can't create batch: ".BoincDb::error());

2
lib/submit_api.py
View File

@ -24,7 +24,7 @@ import urllib2
import copy
import xml.etree.ElementTree as ET
import requests
# you'll need to "yip install requests"
# you'll need to "pip install requests"
import hashlib
# describes an input file

4
tools/submit_api_test.py
View File

@ -192,11 +192,11 @@ def test_get_output_files():
def test_get_job_counts():
req = REQUEST()
req.project = 'http://isaac.ssl.berkeley.edu/test/'
[req.project, req.authenticator] = get_auth()
x = get_job_counts(req)
print x.find('results_ready_to_send').text
#test_query_batch(328)
#test_submit_batch('batch_39')
set_timeout(10)
test_create_batch('batch_138')
test_create_batch('batch_140')