Skip to content
Snippets Groups Projects
Commit 69680c29 authored by Mark Grondona's avatar Mark Grondona
Browse files

o fixed previous fix for elan thread hanging slurmd

parent a1b9b0ec
No related branches found
No related tags found
No related merge requests found
...@@ -142,7 +142,6 @@ static void *neterr_thr(void *arg) ...@@ -142,7 +142,6 @@ static void *neterr_thr(void *arg)
goto fail; goto fail;
} }
info("Warning: Elan error resolver thread already running"); info("Warning: Elan error resolver thread already running");
return NULL;
} }
/* /*
...@@ -160,6 +159,8 @@ static void *neterr_thr(void *arg) ...@@ -160,6 +159,8 @@ static void *neterr_thr(void *arg)
*/ */
elan3_run_neterr_svc(); elan3_run_neterr_svc();
return NULL;
fail: fail:
slurm_mutex_lock(&neterr_mutex); slurm_mutex_lock(&neterr_mutex);
neterr_retval = SLURM_FAILURE; neterr_retval = SLURM_FAILURE;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment