From 243fa631718885a60a345cd16eb5e12c1d31c30c Mon Sep 17 00:00:00 2001 From: steve Date: Wed, 9 Feb 2022 13:39:35 -0600 Subject: [PATCH] Adding patches for slurm21 --- Node.hs | 2 +- Slurm/Node.hsc | 4 ++-- slurm-prometheus-exporter.cabal | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Node.hs b/Node.hs index 8875326..82f0408 100644 --- a/Node.hs +++ b/Node.hs @@ -79,7 +79,7 @@ addNode :: Bool -> Node -> ResMap -> ResMap addNode withreason Node{..} = ar ResAlloc nodeAlloc { allocTime = if alloc then allocTime nodeAlloc else 0 } . ar (case nodeInfoState nodeInfo of - s | s == nodeStateDrain && s /= nodeStateReboot -> ResDrain + s | s == nodeStateDrain && s /= nodeStateRebootRequest -> ResDrain | s == nodeStateDown -> ResDown | s == nodeStateRes -> ResResv | otherwise -> ResFree) diff --git a/Slurm/Node.hsc b/Slurm/Node.hsc index 0bf7e9e..44e31b9 100644 --- a/Slurm/Node.hsc +++ b/Slurm/Node.hsc @@ -9,7 +9,7 @@ module Slurm.Node , nodeStateMixed , nodeStateDrain , nodeStateMaint - , nodeStateReboot + , nodeStateRebootRequest , nodeStateRes , NodeInfo(..) , unknownNodeInfo @@ -46,7 +46,7 @@ newtype NodeState = NodeState Word32 NODE_STATE_RES, \ NODE_STATE_DRAIN, \ NODE_STATE_MAINT, \ - NODE_STATE_REBOOT + NODE_STATE_REBOOT_REQUEST -- sort of a hacky, assymetric, broken "equals" instance Eq NodeState where diff --git a/slurm-prometheus-exporter.cabal b/slurm-prometheus-exporter.cabal index 0fb845e..da86c2b 100644 --- a/slurm-prometheus-exporter.cabal +++ b/slurm-prometheus-exporter.cabal @@ -52,4 +52,4 @@ executable slurm-exporter if flag(pkgconfig) pkgconfig-depends: slurm else - extra-libraries: slurmfull slurmdb + extra-libraries: slurmfull