sbcast - Add --no-allocation/-Z option

Issue #2

Author: benglines

src/bcast/file_bcast.c

@@ -97,6 +97,7 @@ static list_t *_fill_in_excluded_paths(struct bcast_parameters *params);
 static int _find_subpath(void *x, void *key);
 static int _foreach_shared_object(void *x, void *y);
 static int _get_cred_for_job(struct bcast_parameters *params);
+static int _get_cred_no_job(struct bcast_parameters *params);
 static list_t *_get_lib_paths(char *filename);
 
 static int _file_state(struct bcast_parameters *params)
@@ -179,6 +180,48 @@ static int _get_cred_for_job(struct bcast_parameters *params)
 	return rc;
 }
 
+static int _get_cred_no_job(struct bcast_parameters *params)
+{
+	slurm_msg_t req_msg;
+	slurm_msg_t resp_msg;
+	sbcast_cred_req_msg_t cred_req_msg = {0};
+	int *resp_rc;
+
+	slurm_msg_t_init(&req_msg);
+	slurm_msg_t_init(&resp_msg);
+
+	cred_req_msg.node_list = params->node_list;
+
+	req_msg.msg_type = REQUEST_SBCAST_CRED_NO_JOB;
+	req_msg.data = &cred_req_msg;
+
+	if (slurm_send_recv_controller_msg(&req_msg, &resp_msg,
+					   working_cluster_rec) < 0) {
+		error("Unable to send/recv sbcast credentional request to slurmctld");
+		return SLURM_ERROR;
+	}
+
+	switch (resp_msg.msg_type) {
+	case RESPONSE_JOB_SBCAST_CRED:
+		sbcast_cred = (job_sbcast_cred_msg_t *) resp_msg.data;
+		break;
+	case RESPONSE_SLURM_RC:
+		resp_rc = resp_msg.data;
+		error("Received error in response to sbcast credential request: %s",
+		      slurm_strerror(*resp_rc));
+		return SLURM_ERROR;
+	default:
+		error("Received unexpected message type %d in response to sbcast credential request.",
+		      resp_msg.msg_type);
+		return SLURM_ERROR;
+	}
+
+	if (params->verbose)
+		print_sbcast_cred(sbcast_cred->sbcast_cred);
+
+	return SLURM_SUCCESS;
+}
+
 /* Issue the RPC to transfer the file's data */
 static int _file_bcast(struct bcast_parameters *params,
 		       file_bcast_msg_t *bcast_msg,
@@ -644,7 +687,13 @@ extern int bcast_file(struct bcast_parameters *params)
 
 	if ((rc = _file_state(params)) != SLURM_SUCCESS)
 		return rc;
-	if ((rc = _get_cred_for_job(params)) != SLURM_SUCCESS)
+
+	if (params->flags & BCAST_FLAG_NO_JOB)
+		rc = _get_cred_no_job(params);
+	else
+		rc = _get_cred_for_job(params);
+
+	if (rc != SLURM_SUCCESS)
 		return rc;
 
 	/*

src/bcast/file_bcast.h

@@ -44,6 +44,7 @@
 #define BCAST_FLAG_PRESERVE SLURM_BIT(1)
 #define BCAST_FLAG_SEND_LIBS SLURM_BIT(2)
 #define BCAST_FLAG_SHARED_OBJECT SLURM_BIT(3)
+#define BCAST_FLAG_NO_JOB SLURM_BIT(4)
 
 struct bcast_parameters {
 	uint32_t block_size;

src/sbcast/opts.c

@@ -87,6 +87,7 @@ extern void parse_command_line(int argc, char **argv)
 		{"treewidth",    required_argument, 0, OPT_LONG_TREE_WIDTH},
 		{"force",     no_argument,       0, 'f'},
 		{"jobid",     required_argument, 0, 'j'},
+		{"no-allocation", optional_argument, 0, 'Z'},
 		{"nodelist",  optional_argument, 0, 'w'},
 		{"send-libs", optional_argument, 0, OPT_LONG_SEND_LIBS},
 		{"preserve",  no_argument,       0, 'p'},
@@ -149,7 +150,7 @@ extern void parse_command_line(int argc, char **argv)
 		params.timeout = (atoi(env_val) * 1000);
 
 	optind = 0;
-	while ((opt_char = getopt_long(argc, argv, "C::fF:j:ps:t:vVw:",
+	while ((opt_char = getopt_long(argc, argv, "C::fF:j:ps:t:vVw:Z",
 			long_options, &option_index)) != -1) {
 		switch (opt_char) {
 		case (int)'?':
@@ -205,6 +206,9 @@ extern void parse_command_line(int argc, char **argv)
 		case (int) 'w':
 			params.node_list = xstrdup(optarg);
 			break;
+		case (int) 'Z':
+			params.flags |= BCAST_FLAG_NO_JOB;
+			break;
 		case (int) OPT_LONG_HELP:
 			_help();
 			exit(0);
@@ -225,8 +229,9 @@ extern void parse_command_line(int argc, char **argv)
 		exit(1);
 	}
 
-	if (!params.selected_step ||
-	    (params.selected_step->step_id.job_id == NO_VAL)) {
+	if ((!params.selected_step ||
+	     (params.selected_step->step_id.job_id == NO_VAL)) &&
+	    !(params.flags & BCAST_FLAG_NO_JOB)) {
 		if (!(env_val = getenv("SLURM_JOB_ID"))) {
 			error("Need a job id to run this command.  "
 			      "Run from within a Slurm job or use the "
@@ -261,6 +266,16 @@ extern void parse_command_line(int argc, char **argv)
 		exit(1);
 	}
 
+	if ((params.flags & BCAST_FLAG_NO_JOB) && (params.selected_step)) {
+		error("--no-allocation/-Z and --jobid/-j options are mutually exclusive");
+		exit(1);
+	}
+
+	if ((params.flags & BCAST_FLAG_NO_JOB) && (!params.node_list)) {
+		error("--nodelist/-w is required with --no-allocation/-Z.");
+		exit(1);
+	}
+
 	if (params.verbose)
 		_print_options();
 }