Commit 41e22baf authored by Ramon Nou's avatar Ramon Nou
Browse files

Merge branch 'amiranda/83-job-id-needed-in-register_job-register_adhoc_storage' into 'main' 

Resolve "JOB ID needed in register_job / register_adhoc_storage"

This MR adds an extra argument `slurm_id` for `ADM_register_job()` since
it is required by !40 in order to deploy an adhoc storage instance.

Closes #83

See merge request !56
parents 3ab17b88 9a02cba3

examples/c/ADM_cancel_transfer.c

+2 −1
Original line number Diff line number Diff line
@@ -85,7 +85,8 @@ main(int argc, char* argv[]) { 
            inputs, NINPUTS, outputs, NOUTPUTS, adhoc_storage);

    assert(reqs);



    ret = ADM_register_job(server, job_resources, reqs, &job);

    uint64_t slurm_job_id = 42;

    ret = ADM_register_job(server, job_resources, reqs, slurm_job_id, &job);



    if(ret != ADM_SUCCESS) {

        fprintf(stdout, "ADM_register_job() remote procedure not completed "

examples/c/ADM_connect_data_operation.c

+2 −1
Original line number Diff line number Diff line
@@ -86,7 +86,8 @@ main(int argc, char* argv[]) { 
            inputs, NINPUTS, outputs, NOUTPUTS, adhoc_storage);

    assert(reqs);



    ret = ADM_register_job(server, job_resources, reqs, &job);

    uint64_t slurm_job_id = 42;

    ret = ADM_register_job(server, job_resources, reqs, slurm_job_id, &job);



    if(ret != ADM_SUCCESS) {

        fprintf(stdout, "ADM_register_job() remote procedure not completed "

examples/c/ADM_define_data_operation.c

+2 −1
Original line number Diff line number Diff line
@@ -87,7 +87,8 @@ main(int argc, char* argv[]) { 
            inputs, NINPUTS, outputs, NOUTPUTS, adhoc_storage);

    assert(reqs);



    ret = ADM_register_job(server, job_resources, reqs, &job);

    uint64_t slurm_job_id = 42;

    ret = ADM_register_job(server, job_resources, reqs, slurm_job_id, &job);



    if(ret != ADM_SUCCESS) {

        fprintf(stdout, "ADM_register_job() remote procedure not completed "

examples/c/ADM_finalize_data_operation.c

+2 −1
Original line number Diff line number Diff line
@@ -87,7 +87,8 @@ main(int argc, char* argv[]) { 
            inputs, NINPUTS, outputs, NOUTPUTS, adhoc_storage);

    assert(reqs);



    ret = ADM_register_job(server, job_resources, reqs, &job);

    uint64_t slurm_job_id = 42;

    ret = ADM_register_job(server, job_resources, reqs, slurm_job_id, &job);



    if(ret != ADM_SUCCESS) {

        fprintf(stdout, "ADM_register_job() remote procedure not completed "

examples/c/ADM_get_pending_transfers.c

+2 −1
Original line number Diff line number Diff line
@@ -86,7 +86,8 @@ main(int argc, char* argv[]) { 
            inputs, NINPUTS, outputs, NOUTPUTS, adhoc_storage);

    assert(reqs);



    ret = ADM_register_job(server, job_resources, reqs, &job);

    uint64_t slurm_job_id = 42;

    ret = ADM_register_job(server, job_resources, reqs, slurm_job_id, &job);



    if(ret != ADM_SUCCESS) {

        fprintf(stdout, "ADM_register_job() remote procedure not completed "