examples: Ensure ADM_remove_job is called (c5de2913) · Commits · eu / ADMIRE / scord

examples/c/ADM_cancel_transfer.c

+19 −9

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@ main(int argc, char* argv[]) {
		int exit_status = EXIT_SUCCESS;
		ADM_server_t server = ADM_server_create("tcp", argv[1]);

		ADM_job_t job;
		ADM_job_t job = NULL;
		ADM_node_t* job_nodes = prepare_nodes(NJOB_NODES);
		assert(job_nodes);
		ADM_node_t* adhoc_nodes = prepare_nodes(NADHOC_NODES);
		@@ -75,8 +75,10 @@ main(int argc, char* argv[]) {
		server, name, ADM_STORAGE_GEKKOFS, ctx, &adhoc_storage);

		if(ret != ADM_SUCCESS) {
		fprintf(stdout, "ADM_register_adhoc_storage() remote procedure not "
		"completed successfully\n");
		fprintf(stderr,
		"ADM_register_adhoc_storage() remote procedure not "
		"completed successfully: %s\n",
		ADM_strerror(ret));
		exit_status = EXIT_FAILURE;
		goto cleanup;
		}
		@@ -89,9 +91,12 @@ main(int argc, char* argv[]) {
		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 "
		"successfully\n");
		fprintf(stderr,
		"ADM_register_job() remote procedure not completed "
		"successfully: %s\n",
		ADM_strerror(ret));
		exit_status = EXIT_FAILURE;
		goto cleanup;
		}

		ADM_dataset_t* sources = NULL;
		@@ -107,8 +112,10 @@ main(int argc, char* argv[]) {
		targets_len, limits, limits_len, mapping, &tx);

		if(ret != ADM_SUCCESS) {
		fprintf(stdout, "ADM_transfer_datasets() remote procedure not "
		"completed successfully\n");
		fprintf(stderr,
		"ADM_transfer_datasets() remote procedure not "
		"completed successfully: %s\n",
		ADM_strerror(ret));
		exit_status = EXIT_FAILURE;
		goto cleanup;
		}
		@@ -116,8 +123,10 @@ main(int argc, char* argv[]) {
		ret = ADM_cancel_transfer(server, job, tx);

		if(ret != ADM_SUCCESS) {
		fprintf(stdout, "ADM_cancel_transfer() remote procedure not completed "
		"successfully\n");
		fprintf(stderr,
		"ADM_cancel_transfer() remote procedure not completed "
		"successfully\n, %s",
		ADM_strerror(ret));
		exit_status = EXIT_FAILURE;
		goto cleanup;
		}
		@@ -126,6 +135,7 @@ main(int argc, char* argv[]) {
		"successfully\n");

		cleanup:
		ADM_remove_job(server, job);
		ADM_server_destroy(server);
		destroy_datasets(inputs, NINPUTS);
		destroy_datasets(outputs, NOUTPUTS);

examples/c/ADM_connect_data_operation.c

+12 −6

Original line number	Diff line number	Diff line
		@@ -71,9 +71,10 @@ main(int argc, char* argv[]) {
		server, name, ADM_STORAGE_GEKKOFS, ctx, &adhoc_storage);

		if(ret != ADM_SUCCESS) {
		fprintf(stdout,
		fprintf(stderr,
		"ADM_register_adhoc_storage() remote procedure not completed "
		"successfully\n");
		"successfully: %s\n",
		ADM_strerror(ret));
		exit_status = EXIT_FAILURE;
		goto cleanup;
		}
		@@ -90,9 +91,12 @@ main(int argc, char* argv[]) {
		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 "
		"successfully\n");
		fprintf(stderr,
		"ADM_register_job() remote procedure not completed "
		"successfully: %s\n",
		ADM_strerror(ret));
		exit_status = EXIT_FAILURE;
		goto cleanup;
		}

		exit_status = EXIT_SUCCESS;
		@@ -103,9 +107,10 @@ main(int argc, char* argv[]) {


		if(ret != ADM_SUCCESS) {
		fprintf(stdout,
		fprintf(stderr,
		"ADM_connect_data_operation() remote procedure not completed "
		"successfully\n");
		"successfully: %s\n",
		ADM_strerror(ret));
		exit_status = EXIT_FAILURE;
		goto cleanup;
		}
		@@ -122,6 +127,7 @@ cleanup:
		ADM_dataset_destroy(outputs[i]);
		}

		ADM_remove_job(server, job);
		ADM_server_destroy(server);
		exit(exit_status);
		}

examples/c/ADM_define_data_operation.c

+13 −8

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@ main(int argc, char* argv[]) {

		ADM_server_t server = ADM_server_create("tcp", argv[1]);

		ADM_job_t job;
		ADM_job_t job = NULL;
		ADM_node_t* job_nodes = prepare_nodes(NJOB_NODES);
		assert(job_nodes);
		ADM_node_t* adhoc_nodes = prepare_nodes(NADHOC_NODES);
		@@ -76,9 +76,10 @@ main(int argc, char* argv[]) {
		server, name, ADM_STORAGE_GEKKOFS, ctx, &adhoc_storage);

		if(ret != ADM_SUCCESS) {
		fprintf(stdout,
		fprintf(stderr,
		"ADM_register_adhoc_storage() remote procedure not completed "
		"successfully\n");
		"successfully: %s\n",
		ADM_strerror(ret));
		exit_status = EXIT_FAILURE;
		goto cleanup;
		}
		@@ -91,9 +92,12 @@ main(int argc, char* argv[]) {
		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 "
		"successfully\n");
		fprintf(stderr,
		"ADM_register_job() remote procedure not completed "
		"successfully: %s\n",
		ADM_strerror(ret));
		exit_status = EXIT_FAILURE;
		goto cleanup;
		}

		ADM_data_operation_t op;
		@@ -103,9 +107,10 @@ main(int argc, char* argv[]) {
		ret = ADM_define_data_operation(server, job, path, &op);

		if(ret != ADM_SUCCESS) {
		fprintf(stdout,
		fprintf(stderr,
		"ADM_define_data_operation() remote procedure not completed "
		"successfully\n");
		"successfully: %s\n",
		ADM_strerror(ret));
		exit_status = EXIT_FAILURE;
		goto cleanup;
		}
		@@ -114,7 +119,7 @@ main(int argc, char* argv[]) {
		"successfully\n");

		cleanup:

		ADM_remove_job(server, job);
		ADM_server_destroy(server);
		exit(exit_status);
		}

examples/c/ADM_deploy_adhoc_storage.c

+6 −5

Original line number	Diff line number	Diff line
		@@ -67,9 +67,10 @@ main(int argc, char* argv[]) {
		server, name, ADM_STORAGE_GEKKOFS, ctx, &adhoc_storage);

		if(ret != ADM_SUCCESS) {
		fprintf(stdout,
		fprintf(stderr,
		"ADM_register_adhoc_storage() remote procedure not completed "
		"successfully\n");
		"successfully: %s\n",
		ADM_strerror(ret));
		exit_status = EXIT_FAILURE;
		goto cleanup;
		}
		@@ -80,9 +81,10 @@ main(int argc, char* argv[]) {
		ret = ADM_deploy_adhoc_storage(server, adhoc_storage);

		if(ret != ADM_SUCCESS) {
		fprintf(stdout,
		fprintf(stderr,
		"ADM_deploy_adhoc_storage() remote procedure not completed "
		"successfully\n");
		"successfully: %s\n",
		ADM_strerror(ret));
		exit_status = EXIT_FAILURE;
		goto cleanup;
		}
		@@ -91,7 +93,6 @@ main(int argc, char* argv[]) {
		"successfully\n");

		cleanup:

		ADM_server_destroy(server);
		exit(exit_status);
		}

examples/c/ADM_finalize_data_operation.c

+14 −8

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@ main(int argc, char* argv[]) {
		int exit_status = EXIT_SUCCESS;
		ADM_server_t server = ADM_server_create("tcp", argv[1]);

		ADM_job_t job;
		ADM_job_t job = NULL;
		ADM_node_t* job_nodes = prepare_nodes(NJOB_NODES);
		assert(job_nodes);
		ADM_node_t* adhoc_nodes = prepare_nodes(NADHOC_NODES);
		@@ -72,9 +72,10 @@ main(int argc, char* argv[]) {
		server, name, ADM_STORAGE_GEKKOFS, ctx, &adhoc_storage);

		if(ret != ADM_SUCCESS) {
		fprintf(stdout,
		fprintf(stderr,
		"ADM_register_adhoc_storage() remote procedure not completed "
		"successfully\n");
		"successfully: %s\n",
		ADM_strerror(ret));
		exit_status = EXIT_FAILURE;
		goto cleanup;
		}
		@@ -91,10 +92,14 @@ main(int argc, char* argv[]) {
		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 "
		"successfully\n");
		fprintf(stderr,
		"ADM_register_job() remote procedure not completed "
		"successfully: %s\n",
		ADM_strerror(ret));
		exit_status = EXIT_FAILURE;
		goto cleanup;
		}

		ADM_data_operation_t op;
		const char* path = "/tmpxxxxx";

		@@ -104,9 +109,10 @@ main(int argc, char* argv[]) {
		ret = ADM_finalize_data_operation(server, job, op, &status);

		if(ret != ADM_SUCCESS) {
		fprintf(stdout,
		fprintf(stderr,
		"ADM_finalize_data_operation() remote procedure not completed "
		"successfully\n");
		"successfully: %s\n",
		ADM_strerror(ret));
		exit_status = EXIT_FAILURE;
		goto cleanup;
		}
		@@ -115,7 +121,7 @@ main(int argc, char* argv[]) {
		"successfully\n");

		cleanup:

		ADM_remove_job(server, job);
		ADM_server_destroy(server);
		exit(exit_status);
		}