Rework the loader model

[ganeti-local] / Ganeti / HTools / Cluster.hs

diff --git a/Ganeti/HTools/Cluster.hs b/Ganeti/HTools/Cluster.hs
index 77237f7..cba2ad0 100644 (file)
--- a/Ganeti/HTools/Cluster.hs
+++ b/Ganeti/HTools/Cluster.hs
@@ -475,8 +475,10 @@ checkMove nodes_idx ini_tbl victims =
         -- iterate over all instances, computing the best move
         best_tbl =
             foldl'
-            (\ step_tbl elem -> compareTables step_tbl $
-                                checkInstanceMove nodes_idx ini_tbl elem)
+            (\ step_tbl elem ->
+                 if Instance.snode elem == Node.noSecondary then step_tbl
+                    else compareTables step_tbl $
+                         checkInstanceMove nodes_idx ini_tbl elem)
             ini_tbl victims
         Table _ _ _ best_plc = best_tbl
     in
@@ -688,23 +690,6 @@ printStats nl =
 
 -- Loading functions
 
-{- | Convert newline and delimiter-separated text.
-
-This function converts a text in tabular format as generated by
-@gnt-instance list@ and @gnt-node list@ to a list of objects using a
-supplied conversion function.
-
--}
-loadTabular :: (Monad m) => String -> ([String] -> m (String, a))
-            -> (a -> Int -> a) -> m ([(String, Int)], [(Int, a)])
-loadTabular text_data convert_fn set_fn = do
-  let lines_data = lines text_data
-      rows = map (sepSplit '|') lines_data
-  kerows <- mapM convert_fn rows
-  let idxrows = map (\ (idx, (k, v)) -> ((k, idx), (idx, set_fn v idx)))
-                (zip [0..] kerows)
-  return $ unzip idxrows
-
 -- | For each instance, add its index to its primary and secondary nodes
 fixNodes :: [(Int, Node.Node)]
          -> [(Int, Instance.Instance)]
@@ -716,13 +701,20 @@ fixNodes nl il =
                     pdx = Instance.pnode inst
                     sdx = Instance.snode inst
                     pold = fromJust $ lookup pdx accu
-                    sold = fromJust $ lookup sdx accu
                     pnew = Node.setPri pold idx
-                    snew = Node.setSec sold idx
                     ac1 = deleteBy assocEqual (pdx, pold) accu
-                    ac2 = deleteBy assocEqual (sdx, sold) ac1
-                    ac3 = (pdx, pnew):(sdx, snew):ac2
-                in ac3) nl il
+                    ac2 = (pdx, pnew):ac1
+                in
+                  if sdx /= Node.noSecondary then
+                      let
+                          sold = fromJust $ lookup sdx accu
+                          snew = Node.setSec sold idx
+                          ac3 = deleteBy assocEqual (sdx, sold) ac2
+                          ac4 = (sdx, snew):ac3
+                      in ac4
+                  else
+                      ac2
+           ) nl il
 
 -- | Compute the longest common suffix of a NameList list that
 -- | starts with a dot
@@ -743,42 +735,15 @@ stripSuffix suffix lst =
     let sflen = length suffix in
     map (\ (key, name) -> (key, take ((length name) - sflen) name)) lst
 
--- | Lookups a node into an assoc list
-lookupNode :: (Monad m) => String -> String -> [(String, Int)] -> m Int
-lookupNode node inst ktn =
-    case lookup node ktn of
-      Nothing -> fail $ "Unknown node " ++ node ++ " for instance " ++ inst
-      Just idx -> return idx
 
 {-| Initializer function that loads the data from a node and list file
     and massages it into the correct format. -}
-loadData :: String -- ^ Node data in text format
-         -> String -- ^ Instance data in text format
-         -> Result (Container.Container Node.Node,
-                    Container.Container Instance.Instance,
-                    String, NameList, NameList)
-loadData ndata idata = do
-  {- node file: name t_mem n_mem f_mem t_disk f_disk -}
-  (ktn, nl) <- loadTabular ndata
-               (\ (name:tm:nm:fm:td:fd:fo:[]) ->
-                    return (name,
-                            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
-                  (\ (name:mem:dsk:status:pnode:snode:[]) -> do
-                     pidx <- lookupNode pnode name ktn
-                     sidx <- lookupNode snode name ktn
-                     let newinst = Instance.create (read mem) (read dsk)
-                                   status pidx sidx
-                     return (name, newinst)
-                  )
-                  Instance.setIdx
+loadData :: ([(String, Int)], Node.AssocList,
+             [(String, Int)], Instance.AssocList) -- ^ Data from either
+                                                  -- Text.loadData
+                                                  -- or Rapi.loadData
+         -> Result (NodeList, InstanceList, String, NameList, NameList)
+loadData (ktn, nl, kti, il) = do
   let
       nl2 = fixNodes nl il
       il3 = Container.fromAssocList il
@@ -806,7 +771,6 @@ nodeIdsk node il =
     in sum . map Instance.dsk .
        map rfind $ (Node.plist node) ++ (Node.slist node)
 
-
 -- | Check cluster data for consistency
 checkData :: NodeList -> InstanceList -> NameList -> NameList
           -> ([String], NodeList)