Add REQUEST_SBCAST_CRED_NO_JOB message

Issue #2

Author: benglines

slurm/slurm.h

@@ -3234,6 +3234,10 @@ typedef struct job_sbcast_cred_msg {
 	void *sbcast_cred;		/* opaque data structure */
 } job_sbcast_cred_msg_t;
 
+typedef struct sbcast_cred_req_msg {
+	char *node_list;
+} sbcast_cred_req_msg_t;
+
 typedef struct {
 	uint32_t lifespan;
 	char *username;

src/common/msg_type.c

@@ -160,6 +160,7 @@ const static entry_t msg_types[] = {
 	ENTRY(REQUEST_JOB_END_TIME),
 	ENTRY(REQUEST_JOB_NOTIFY),
 	ENTRY(REQUEST_JOB_SBCAST_CRED),
+	ENTRY(REQUEST_SBCAST_CRED_NO_JOB),
 	ENTRY(RESPONSE_JOB_SBCAST_CRED),
 	ENTRY(REQUEST_HET_JOB_ALLOCATION),
 	ENTRY(RESPONSE_HET_JOB_ALLOCATION),

src/common/msg_type.h

@@ -190,6 +190,7 @@ typedef enum {
 	RESPONSE_HET_JOB_ALLOCATION,
 	REQUEST_HET_JOB_ALLOC_INFO,
 	REQUEST_SUBMIT_BATCH_HET_JOB,
+	REQUEST_SBCAST_CRED_NO_JOB,
 
 	REQUEST_CTLD_MULT_MSG = 4500,
 	RESPONSE_CTLD_MULT_MSG,

src/common/slurm_protocol_defs.c

@@ -1917,6 +1917,15 @@ extern void slurm_free_node_registration_status_msg(
 	}
 }
 
+extern void slurm_free_sbcast_cred_req_msg(sbcast_cred_req_msg_t *msg)
+{
+	if (!msg)
+		return;
+
+	xfree(msg->node_list);
+	xfree(msg);
+}
+
 extern void slurm_free_node_reg_resp_msg(
 	slurm_node_reg_resp_msg_t *msg)
 {
@@ -4933,6 +4942,9 @@ extern int slurm_free_msg_data(slurm_msg_type_t type, void *data)
 	case REQUEST_JOB_SBCAST_CRED:
 		slurm_destroy_selected_step(data);
 		break;
+	case REQUEST_SBCAST_CRED_NO_JOB:
+		slurm_free_sbcast_cred_req_msg(data);
+		break;
 	case REQUEST_SHUTDOWN:
 		slurm_free_shutdown_msg(data);
 		break;

src/common/slurm_protocol_defs.h

@@ -1629,6 +1629,7 @@ extern void slurm_free_crontab_update_request_msg(
 extern void slurm_free_crontab_update_response_msg(
 	crontab_update_response_msg_t *msg);
 extern void slurm_free_suspend_exc_update_msg(suspend_exc_update_msg_t *msg);
+extern void slurm_free_sbcast_cred_req_msg(sbcast_cred_req_msg_t *msg);
 
 extern const char *preempt_mode_string(uint16_t preempt_mode);
 extern uint16_t preempt_mode_num(const char *preempt_mode);

src/common/slurm_protocol_pack.c

@@ -7330,6 +7330,41 @@ _unpack_step_alloc_info_msg(step_alloc_info_msg_t **
 	return SLURM_SUCCESS;
 }
 
+static void _pack_sbcast_cred_no_job_msg(sbcast_cred_req_msg_t *msg,
+					 buf_t *buffer,
+					 uint16_t protocol_version)
+{
+	xassert(msg);
+
+	if (protocol_version >= SLURM_24_11_PROTOCOL_VERSION) {
+		packstr(msg->node_list, buffer);
+	}
+}
+
+static int _unpack_sbcast_cred_no_job_msg(sbcast_cred_req_msg_t **msg,
+					  buf_t *buffer,
+					  uint16_t protocol_version)
+{
+	sbcast_cred_req_msg_t *cred_msg;
+
+	xassert(buffer);
+	xassert(msg);
+
+	if (protocol_version >= SLURM_24_11_PROTOCOL_VERSION) {
+		cred_msg = xmalloc(sizeof(*cred_msg));
+		*msg = cred_msg;
+
+		safe_unpackstr(&cred_msg->node_list, buffer);
+	}
+
+	return SLURM_SUCCESS;
+
+unpack_error:
+	slurm_free_sbcast_cred_req_msg(cred_msg);
+	*msg = NULL;
+	return SLURM_ERROR;
+}
+
 static void _pack_node_reg_resp(
 	slurm_node_reg_resp_msg_t *msg,
 	buf_t *buffer, uint16_t protocol_version)
@@ -13184,6 +13219,11 @@ pack_msg(slurm_msg_t const *msg, buf_t *buffer)
 		_pack_step_alloc_info_msg((step_alloc_info_msg_t *) msg->data,
 					  buffer, msg->protocol_version);
 		break;
+	case REQUEST_SBCAST_CRED_NO_JOB:
+		_pack_sbcast_cred_no_job_msg(
+			(sbcast_cred_req_msg_t *) msg->data, buffer,
+			msg->protocol_version);
+		break;
 	case RESPONSE_NODE_REGISTRATION:
 		_pack_node_reg_resp(
 			(slurm_node_reg_resp_msg_t *)msg->data,
@@ -13837,6 +13877,11 @@ unpack_msg(slurm_msg_t * msg, buf_t *buffer)
 						 (msg->data), buffer,
 						 msg->protocol_version);
 		break;
+	case REQUEST_SBCAST_CRED_NO_JOB:
+		rc = _unpack_sbcast_cred_no_job_msg(
+			(sbcast_cred_req_msg_t **) &(msg->data), buffer,
+			msg->protocol_version);
+		break;
 	case RESPONSE_NODE_REGISTRATION:
 		rc = _unpack_node_reg_resp(
 			(slurm_node_reg_resp_msg_t **)&msg->data,

src/slurmctld/proc_req.c

@@ -3058,6 +3058,79 @@ static void _slurm_rpc_job_sbcast_cred(slurm_msg_t *msg)
 #endif
 }
 
+static void _slurm_rpc_sbcast_cred_no_job(slurm_msg_t *msg)
+{
+#ifdef HAVE_FRONT_END
+	slurm_send_rc_msg(msg, ESLURM_NOT_SUPPORTED);
+	return;
+#endif
+	job_sbcast_cred_msg_t *cred_resp_msg = NULL;
+	sbcast_cred_req_msg_t *cred_req_msg = msg->data;
+	sbcast_cred_arg_t sbcast_arg = { 0 };
+	sbcast_cred_t *sbcast_cred;
+	hostlist_t *req_node_list;
+	char *node_name;
+	bool node_exists = false;
+	int rc;
+
+	DEF_TIMERS;
+	START_TIMER;
+
+	if (!validate_slurm_user(msg->auth_uid)) {
+		error("%s: sbcast --no-allocation/-Z credential requested from uid '%u' which is not root/SlurmUser",
+		      __func__, msg->auth_uid);
+		rc = ESLURM_USER_ID_MISSING;
+		goto fail;
+	}
+
+	req_node_list = hostlist_create(cred_req_msg->node_list);
+	while ((node_name = hostlist_shift(req_node_list))) {
+		node_exists = find_node_record(node_name);
+
+		if (!node_exists) {
+			debug("%s: sbcast --nodelist contains at least one invalid node '%s'",
+			      __func__, node_name);
+			free(node_name);
+			break;
+		}
+		free(node_name);
+	}
+	FREE_NULL_HOSTLIST(req_node_list);
+
+	if (!node_exists) {
+		(void) slurm_send_rc_msg(msg, ESLURM_INVALID_NODE_NAME);
+		return;
+	}
+
+	sbcast_arg.nodes = cred_req_msg->node_list;
+	sbcast_arg.expiration = time(NULL) + HOUR_SECONDS;
+
+	if (!(sbcast_cred = create_sbcast_cred(&sbcast_arg, msg->auth_uid,
+					       msg->auth_gid,
+					       msg->protocol_version))) {
+		error("%s: Could not create sbcast cred for --no-allocate/-Z request",
+		      __func__);
+		rc = SLURM_ERROR;
+		goto fail;
+	}
+	END_TIMER2(__func__);
+
+	cred_resp_msg = xmalloc(sizeof(*cred_resp_msg));
+	cred_resp_msg->job_id = NO_VAL;
+	cred_resp_msg->node_list = xstrdup(cred_req_msg->node_list);
+	cred_resp_msg->sbcast_cred = sbcast_cred;
+
+	(void) send_msg_response(msg, RESPONSE_JOB_SBCAST_CRED, cred_resp_msg);
+
+	slurm_free_sbcast_cred_msg(cred_resp_msg);
+
+	return;
+
+fail:
+	END_TIMER2(__func__);
+	(void) slurm_send_rc_msg(msg, rc);
+}
+
 /* _slurm_rpc_ping - process ping RPC */
 static void _slurm_rpc_ping(slurm_msg_t *msg)
 {
@@ -6622,6 +6695,9 @@ slurmctld_rpc_t slurmctld_rpcs[] =
 	},{
 		.msg_type = REQUEST_JOB_SBCAST_CRED,
 		.func = _slurm_rpc_job_sbcast_cred,
+	},{
+		.msg_type = REQUEST_SBCAST_CRED_NO_JOB,
+		.func = _slurm_rpc_sbcast_cred_no_job,
 	},{
 		.msg_type = REQUEST_PING,
 		.func = _slurm_rpc_ping,