sim: fixed returning message on job sumbit (and bug with adding activ…

…e job for tracking), added calling sim_job_requested_kill_timelimit on REQUEST_TERMINATE_JOB
ubccr-slurm-simulator · May 30, 2023 · c4f77f2 · c4f77f2
1 parent cf55c83
commit c4f77f2
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 2 deletions.
diff --git a/contribs/sim/sim_sbatch.c b/contribs/sim/sim_sbatch.c
@@ -277,6 +277,15 @@ extern void submit_job(sim_event_submit_batch_job_t* event_submit_batch_job)
 //			slurmctld_req(&req_msg);
 			rc = slurm_submit_batch_job(desc, &resp);
 		}
+		if(resp != NULL) {
+			// insert job to active simulated job list
+			if (active_job->job_id == 0) {
+				pthread_mutex_lock(&events_mutex);
+				active_job->job_id = resp->job_id;
+				event_submit_batch_job->job_id = resp->job_id;
+				pthread_mutex_unlock(&events_mutex);
+			}
+		}
 		if (rc >= 0)
 			break;
 		if (errno == ESLURM_ERROR_ON_DESC_TO_RECORD_COPY) {

diff --git a/contribs/sim/slurmctld_agent.c b/contribs/sim/slurmctld_agent.c
@@ -57,6 +57,9 @@ void agent_queue_request(agent_arg_t *agent_arg_ptr)
 		break;
 	case REQUEST_TERMINATE_JOB:
 		// this initiated from job_compleate by jobs finishing by themselves
+		// can be called again if there are problems
+		kill_job = (kill_job_msg_t*)agent_arg_ptr->msg_args;
+		sim_job_requested_kill_timelimit(kill_job->step_id.job_id);
 		call_slurmctld_agent_queue_request=false;
 		break;
 	case REQUEST_NODE_REGISTRATION_STATUS:

diff --git a/src/common/slurm_protocol_api.c b/src/common/slurm_protocol_api.c
@@ -1996,18 +1996,22 @@ extern int slurm_send_node_msg(int fd, slurm_msg_t *msg)
 {
 	msg_bufs_t buffers = { 0 };
 	int rc;
+	slurm_node_reg_resp_msg_t *node_reg_resp_msg;
 #ifdef SLURM_SIMULATOR
 	if(sim_slurmctld_req_ref!=NULL && sim_request_msg !=NULL && sim_response_msg !=NULL) {
 		switch(sim_request_msg->msg_type) {
 			case  MESSAGE_NODE_REGISTRATION_STATUS:
 				sim_response_msg->msg_type  = msg->msg_type;
-				memcpy(sim_response_msg->data, msg->data, msg->data_size);
+				node_reg_resp_msg = (slurm_node_reg_resp_msg_t*)msg->data;
+				sim_response_msg->data = xmalloc(sizeof(slurm_node_reg_resp_msg_t));
+				memcpy(sim_response_msg->data, node_reg_resp_msg, sizeof(slurm_node_reg_resp_msg_t));
 				sim_response_msg->data_size = msg->data_size;
 				return SLURM_SUCCESS;
 				break;
 			case  REQUEST_SUBMIT_BATCH_JOB:
 				sim_response_msg->msg_type  = msg->msg_type;
-				memcpy(sim_response_msg->data, msg->data, msg->data_size);
+				sim_response_msg->data = xmalloc(sizeof(submit_response_msg_t));
+				memcpy(sim_response_msg->data, msg->data, sizeof(submit_response_msg_t));
 				sim_response_msg->data_size = msg->data_size;
 				return SLURM_SUCCESS;
 				break;

diff --git a/src/slurmd/slurmd/slurmd.c b/src/slurmd/slurmd/slurmd.c
@@ -777,7 +777,12 @@ extern int send_registration_msg(uint32_t status)
 		goto fail;
 	}
 
+#ifdef SLURM_SIMULATOR
+	// @todo properly handle responce
+	resp_msg.data = NULL;
+#endif
 	_handle_node_reg_resp(&resp_msg);
+
 	slurm_free_msg_data(resp_msg.msg_type, resp_msg.data);
 
 	if (errno) {