Closed xk42 closed 3 years ago
It looks like this is an easy fix
/opt/slurm/20.11.0-1/share/doc/slurm-20.11.0/html/news.html: -- slurm_ctl_conf_t has been renamed to slurm_conf_t.
The following patch should help
diff --git a/drmaa_utils b/drmaa_utils
--- a/drmaa_utils
+++ b/drmaa_utils
@@ -1 +1 @@
-Subproject commit 588f69d387322a4f53ce072a6c9acf7ad19b5002
+Subproject commit 588f69d387322a4f53ce072a6c9acf7ad19b5002-dirty
diff --git a/slurm_drmaa/drmaa.c b/slurm_drmaa/drmaa.c
index e84d00b..3d0db66 100644
--- a/slurm_drmaa/drmaa.c
+++ b/slurm_drmaa/drmaa.c
@@ -62,7 +62,7 @@ slurmdrmaa_get_DRM_system( fsd_drmaa_singletone_t *self )
{
if(slurmdrmaa_version[0] == '\0') /*no locks as drmaa_get_drm_system is usually called only once */
{
- slurm_ctl_conf_t * conf_info_msg_ptr = NULL;
+ slurm_conf_t * conf_info_msg_ptr = NULL;
if ( slurm_load_ctl_conf ((time_t) NULL, &conf_info_msg_ptr ) == -1 )
{
fsd_log_error(("slurm_load_ctl_conf error: %s",slurm_strerror(slurm_get_errno())));
diff --git a/test/slurm_ping.c b/test/slurm_ping.c
index 92a32c1..9a0c720 100644
--- a/test/slurm_ping.c
+++ b/test/slurm_ping.c
@@ -3,13 +3,13 @@
/* Slurm doesn't provide a public method to just use the local config, which we need in order to set a timeout without
* having to contact slurmctld first... */
extern int slurm_conf_destroy(void);
-extern slurm_ctl_conf_t *slurm_conf_lock(void);
+extern slurm_conf_t *slurm_conf_lock(void);
extern void slurm_conf_unlock(void);
int main(int argc, char **argv) {
int status = 1;
- slurm_ctl_conf_t *slurm_ctl_conf_ptr = slurm_conf_lock();
+ slurm_conf_t *slurm_ctl_conf_ptr = slurm_conf_lock();
slurm_ctl_conf_ptr->msg_timeout = 3;
slurm_conf_unlock();
FWIW included in #39
Fixed in #47, will be released in 1.1.2, thanks!