diff --git a/NEWS b/NEWS index c2fa902c978e3f02e10bee9cdccd67971819bd13..12c00b53bcc293aada6b5e304dd64fff49ae9d20 100644 --- a/NEWS +++ b/NEWS @@ -20,6 +20,8 @@ documents those changes that are of interest to users and admins. for a job step. -- Require SchedulerTimeSlice configuration parameter to be at least 5 seconds to avoid thrashing slurmd daemon. + -- Cray - fix to make nodes come back up in accounting if they were + previously marked down by alps. * Changes in SLURM 2.3.0.rc1 ============================ diff --git a/src/plugins/select/cray/select_cray.c b/src/plugins/select/cray/select_cray.c index a328dfbd9ae61dac24ec1c3a5e48893df1bc64b8..e9ae01d4e5330cd084ddd23e6b5180223b75e19d 100644 --- a/src/plugins/select/cray/select_cray.c +++ b/src/plugins/select/cray/select_cray.c @@ -72,6 +72,7 @@ time_t last_node_update __attribute__((weak_import)); struct switch_record *switch_record_table __attribute__((weak_import)); int switch_record_cnt __attribute__((weak_import)); slurmdb_cluster_rec_t *working_cluster_rec __attribute__((weak_import)) = NULL; +void *acct_db_conn __attribute__((weak_import)) = NULL; #else slurm_ctl_conf_t slurmctld_conf; struct node_record *node_record_table_ptr; @@ -82,6 +83,7 @@ time_t last_node_update; struct switch_record *switch_record_table; int switch_record_cnt; slurmdb_cluster_rec_t *working_cluster_rec = NULL; +void *acct_db_conn = NULL; #endif /*