X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/53f00b200bee1102bfa3566670629bd729ccc15d..aff363a42d670f1b3100a98aab6f17b49f644179:/Ganeti/HTools/Cluster.hs diff --git a/Ganeti/HTools/Cluster.hs b/Ganeti/HTools/Cluster.hs index 73c814a..e3753cc 100644 --- a/Ganeti/HTools/Cluster.hs +++ b/Ganeti/HTools/Cluster.hs @@ -15,6 +15,7 @@ module Ganeti.HTools.Cluster , Solution(..) , Table(..) , Removal + , Score -- * Generic functions , totalResources -- * First phase functions @@ -343,11 +344,10 @@ applyMove nl inst Failover = old_s = Container.find old_sdx nl int_p = Node.removePri old_p inst int_s = Node.removeSec old_s inst - new_p = Node.addPri int_s inst - new_s = Node.addSec int_p inst old_sdx - new_nl = if isNothing(new_p) || isNothing(new_s) then Nothing - else Just $ Container.addTwo old_pdx (fromJust new_s) - old_sdx (fromJust new_p) nl + new_nl = do -- Maybe monad + new_p <- Node.addPri int_s inst + new_s <- Node.addSec int_p inst old_sdx + return $ Container.addTwo old_pdx new_s old_sdx new_p nl in (new_nl, Instance.setBoth inst old_sdx old_pdx, old_sdx, old_pdx) -- Replace the primary (f:, r:np, f) @@ -359,12 +359,11 @@ applyMove nl inst (ReplacePrimary new_pdx) = tgt_n = Container.find new_pdx nl int_p = Node.removePri old_p inst int_s = Node.removeSec old_s inst - new_p = Node.addPri tgt_n inst - new_s = Node.addSec int_s inst new_pdx - new_nl = if isNothing(new_p) || isNothing(new_s) then Nothing - else Just $ Container.add new_pdx (fromJust new_p) $ - Container.addTwo old_pdx int_p - old_sdx (fromJust new_s) nl + new_nl = do -- Maybe monad + new_p <- Node.addPri tgt_n inst + new_s <- Node.addSec int_s inst new_pdx + return $ Container.add new_pdx new_p $ + Container.addTwo old_pdx int_p old_sdx new_s nl in (new_nl, Instance.setPri inst new_pdx, new_pdx, old_sdx) -- Replace the secondary (r:ns) @@ -374,10 +373,9 @@ applyMove nl inst (ReplaceSecondary new_sdx) = old_s = Container.find old_sdx nl tgt_n = Container.find new_sdx nl int_s = Node.removeSec old_s inst - new_s = Node.addSec tgt_n inst old_pdx - new_nl = if isNothing(new_s) then Nothing - else Just $ Container.addTwo new_sdx (fromJust new_s) - old_sdx int_s nl + new_nl = Node.addSec tgt_n inst old_pdx >>= + \new_s -> return $ Container.addTwo new_sdx + new_s old_sdx int_s nl in (new_nl, Instance.setSec inst new_sdx, old_pdx, new_sdx) -- Replace the secondary and failover (r:np, f) @@ -389,12 +387,11 @@ applyMove nl inst (ReplaceAndFailover new_pdx) = tgt_n = Container.find new_pdx nl int_p = Node.removePri old_p inst int_s = Node.removeSec old_s inst - new_p = Node.addPri tgt_n inst - new_s = Node.addSec int_p inst new_pdx - new_nl = if isNothing(new_p) || isNothing(new_s) then Nothing - else Just $ Container.add new_pdx (fromJust new_p) $ - Container.addTwo old_pdx (fromJust new_s) - old_sdx int_s nl + new_nl = do -- Maybe monad + new_p <- Node.addPri tgt_n inst + new_s <- Node.addSec int_p inst new_pdx + return $ Container.add new_pdx new_p $ + Container.addTwo old_pdx new_s old_sdx int_s nl in (new_nl, Instance.setBoth inst new_pdx old_pdx, new_pdx, old_pdx) -- Failver and replace the secondary (f, r:ns) @@ -406,12 +403,11 @@ applyMove nl inst (FailoverAndReplace new_sdx) = tgt_n = Container.find new_sdx nl int_p = Node.removePri old_p inst int_s = Node.removeSec old_s inst - new_p = Node.addPri int_s inst - new_s = Node.addSec tgt_n inst old_sdx - new_nl = if isNothing(new_p) || isNothing(new_s) then Nothing - else Just $ Container.add new_sdx (fromJust new_s) $ - Container.addTwo old_sdx (fromJust new_p) - old_pdx int_p nl + new_nl = do -- Maybe monad + new_p <- Node.addPri int_s inst + new_s <- Node.addSec tgt_n inst old_sdx + return $ Container.add new_sdx new_s $ + Container.addTwo old_sdx new_p old_pdx int_p nl in (new_nl, Instance.setBoth inst old_sdx new_sdx, old_sdx, new_sdx) checkSingleStep :: Table -- ^ The original table @@ -563,27 +559,27 @@ computeMoves i a b c d = else if c == b then {- Failover and ... -} if d == a then {- that's all -} - ("f", [printf "migrate %s" i]) + ("f", [printf "migrate -f %s" i]) else (printf "f r:%s" d, - [printf "migrate %s" i, + [printf "migrate -f %s" i, printf "replace-disks -n %s %s" d i]) else if d == a then {- ... and keep primary as secondary -} (printf "r:%s f" c, [printf "replace-disks -n %s %s" c i, - printf "migrate %s" i]) + printf "migrate -f %s" i]) else if d == b then {- ... keep same secondary -} (printf "f r:%s f" c, - [printf "migrate %s" i, + [printf "migrate -f %s" i, printf "replace-disks -n %s %s" c i, - printf "migrate %s" i]) + printf "migrate -f %s" i]) else {- Nothing in common -} (printf "r:%s f r:%s" c d, [printf "replace-disks -n %s %s" c i, - printf "migrate %s" i, + printf "migrate -f %s" i, printf "replace-disks -n %s %s" d i]) {-| Converts a placement to string format -} @@ -616,9 +612,11 @@ printSolutionLine il ktn kti nmlen imlen plc pos = formatCmds :: [[String]] -> String formatCmds cmd_strs = - unlines $ map (" echo " ++) $ + unlines $ concat $ map (\(a, b) -> - (printf "step %d" (a::Int)):(map ("gnt-instance " ++) b)) $ + (printf "echo step %d" (a::Int)): + (printf "check"): + (map ("gnt-instance " ++) b)) $ zip [1..] cmd_strs {-| Converts a solution to string format -} @@ -755,10 +753,14 @@ loadData ndata idata = let {- node file: name t_mem n_mem f_mem t_disk f_disk -} (ktn, nl) = loadTabular ndata - (\ (name:tm:nm:fm:td:fd:[]) -> + (\ (name:tm:nm:fm:td:fd:fo:[]) -> (name, - Node.create (read tm) (read nm) - (read fm) (read td) (read fd))) + if any (== "?") [tm,nm,fm,td,fd] || fo == "Y" then + Node.create 0 0 0 0 0 True + else + Node.create (read tm) (read nm) (read fm) + (read td) (read fd) False + )) Node.setIdx {- instance file: name mem disk status pnode snode -} (kti, il) = loadTabular idata @@ -788,6 +790,14 @@ nodeImem node il = in sum . map Instance.mem . map rfind $ Node.plist node +-- | Compute the amount of disk used by instances on a node (either primary +-- or secondary). +nodeIdsk :: Node.Node -> InstanceList -> Int +nodeIdsk node il = + let rfind = flip Container.find $ il + in sum . map Instance.dsk . + map rfind $ (Node.plist node) ++ (Node.slist node) + -- | Check cluster data for consistency checkData :: NodeList -> InstanceList -> NameList -> NameList @@ -804,12 +814,15 @@ checkData nl il ktn _ = - (Node.f_mem node) - (nodeImem node il) + adj_mem + delta_dsk = (truncate $ Node.t_dsk node) + - (Node.f_dsk node) + - (nodeIdsk node il) newn = Node.setFmem (Node.setXmem node delta_mem) (Node.f_mem node - adj_mem) - umsg = if delta_mem > 16 - then (printf "node %s has %6d MB of unaccounted \ - \memory " - nname delta_mem):msgs - else msgs - in (umsg, newn) + umsg1 = if delta_mem > 512 || delta_dsk > 1024 + then [printf "node %s is missing %d MB ram \ + \and %d GB disk" + nname delta_mem (delta_dsk `div` 1024)] + else [] + in (msgs ++ umsg1, newn) ) [] nl