X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/7847a037e74df6735aae8335d5d152580039d51c..8c5b0a0d39e4df15883d568e0b84c61bc2230c71:/Ganeti/HTools/Node.hs

diff --git a/Ganeti/HTools/Node.hs b/Ganeti/HTools/Node.hs
index e667ce3..3ecf685 100644
--- a/Ganeti/HTools/Node.hs
+++ b/Ganeti/HTools/Node.hs
@@ -6,7 +6,8 @@
 
 module Ganeti.HTools.Node
     (
-      Node(failN1, idx, t_mem, f_mem, t_dsk, f_dsk, p_mem, p_dsk, p_rem,
+      Node(failN1, idx, t_mem, n_mem, f_mem, t_dsk, f_dsk,
+           p_mem, p_dsk, p_rem,
            plist, slist, offline)
     -- * Constructor
     , create
@@ -14,6 +15,7 @@ module Ganeti.HTools.Node
     , buildPeers
     , setIdx
     , setOffline
+    , setXmem
     -- * Instance (re)location
     , removePri
     , removeSec
@@ -34,8 +36,10 @@ import qualified Ganeti.HTools.PeerMap as PeerMap
 
 import Ganeti.HTools.Utils
 
-data Node = Node { t_mem :: Double -- ^ total memory (Mib)
+data Node = Node { t_mem :: Double -- ^ total memory (MiB)
+                 , n_mem :: Int    -- ^ node memory (MiB)
                  , f_mem :: Int    -- ^ free memory (MiB)
+                 , x_mem :: Int    -- ^ unaccounted memory (MiB)
                  , t_dsk :: Double -- ^ total disk space (MiB)
                  , f_dsk :: Int    -- ^ free disk space (MiB)
                  , plist :: [Int]  -- ^ list of primary instance indices
@@ -59,30 +63,27 @@ The index and the peers maps are empty, and will be need to be update
 later via the 'setIdx' and 'buildPeers' functions.
 
 -}
-create :: String -> String -> String -> String -> Node
-create mem_t_init mem_f_init dsk_t_init dsk_f_init =
-    let mem_t = read mem_t_init
-        mem_f = read mem_f_init
-        dsk_t = read dsk_t_init
-        dsk_f = read dsk_f_init
-    in
-      Node
-      {
-       t_mem = read mem_t_init,
-       f_mem = read mem_f_init,
-       t_dsk = read dsk_t_init,
-       f_dsk = read dsk_f_init,
-       plist = [],
-       slist = [],
-       failN1 = True,
-       idx = -1,
-       peers = PeerMap.empty,
-       r_mem = 0,
-       p_mem = (fromIntegral mem_f) / (fromIntegral mem_t),
-       p_dsk = (fromIntegral dsk_f) / (fromIntegral dsk_t),
-       p_rem = 0,
-       offline = False
-      }
+create :: Double -> Int -> Int -> Double -> Int -> Node
+create mem_t_init mem_n_init mem_f_init dsk_t_init dsk_f_init =
+    Node
+    {
+      t_mem = mem_t_init,
+      n_mem = mem_n_init,
+      f_mem = mem_f_init,
+      t_dsk = dsk_t_init,
+      f_dsk = dsk_f_init,
+      plist = [],
+      slist = [],
+      failN1 = True,
+      idx = -1,
+      peers = PeerMap.empty,
+      r_mem = 0,
+      p_mem = (fromIntegral mem_f_init) / mem_t_init,
+      p_dsk = (fromIntegral dsk_f_init) / dsk_t_init,
+      p_rem = 0,
+      offline = False,
+      x_mem = 0
+    }
 
 -- | Changes the index.
 -- This is used only during the building of the data structures.
@@ -93,6 +94,10 @@ setIdx t i = t {idx = i}
 setOffline :: Node -> Bool -> Node
 setOffline t val = t { offline = val }
 
+-- | Sets the unnaccounted memory
+setXmem :: Node -> Int -> Node
+setXmem t val = t { x_mem = val }
+
 -- | Given the rmem, free memory and disk, computes the failn1 status.
 computeFailN1 :: Int -> Int -> Int -> Bool
 computeFailN1 new_rmem new_mem new_dsk =
@@ -203,15 +208,6 @@ setPri t idx = t { plist = idx:(plist t) }
 setSec :: Node -> Int -> Node
 setSec t idx = t { slist = idx:(slist t) }
 
--- | Simple converter to string.
-str :: Node -> String
-str t =
-    printf ("Node %d (mem=%5d MiB, disk=%5.2f GiB)\n  Primaries:" ++
-            " %s\nSecondaries: %s")
-      (idx t) (f_mem t) ((f_dsk t) `div` 1024)
-      (commaJoin (map show (plist t)))
-      (commaJoin (map show (slist t)))
-
 -- | String converter for the node list functionality.
 list :: Int -> String -> Node -> String
 list mname n t =
@@ -222,9 +218,9 @@ list mname n t =
         off = offline t
         fn = failN1 t
     in
-      printf " %c %-*s %5.0f %5d %5d %5.0f %5d %3d %3d %.5f %.5f"
+      printf " %c %-*s %5.0f %5d %5d %5d %5.0f %5d %3d %3d %.5f %.5f"
                  (if off then '-' else if fn then '*' else ' ')
-                 mname n (t_mem t) (f_mem t) (r_mem t)
+                 mname n (t_mem t) (n_mem t) (f_mem t) (r_mem t)
                  ((t_dsk t) / 1024) ((f_dsk t) `div` 1024)
                  (length pl) (length sl)
                  mp dp