hbal: change handling of signal

[ganeti-local] / hail.hs

diff --git a/hail.hs b/hail.hs
index dde30a0..d67bd68 100644 (file)
--- a/hail.hs
+++ b/hail.hs
@@ -26,10 +26,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 module Main (main) where
 
 import Data.List
-import Data.Function
 import Data.Maybe (isJust, fromJust)
 import Monad
-import System
+import System (exitWith, ExitCode(..))
 import System.IO
 import qualified System
 
@@ -47,26 +46,37 @@ import Ganeti.HTools.Loader (RqType(..), Request(..))
 options :: [OptType]
 options = [oPrintNodes, oShowVer, oShowHelp]
 
-processResults :: (Monad m) => Cluster.AllocSolution -> m (String, [Node.Node])
-processResults (fstats, successes, sols) =
+processResults :: (Monad m) =>
+                  RqType -> Cluster.AllocSolution
+               -> m (String, Cluster.AllocSolution)
+processResults _ (_, _, []) = fail "No valid allocation solutions"
+processResults (Evacuate _) as@(fstats, successes, sols) =
+    let best = fst $ head sols
+        tfails = length fstats
+        info = printf "for last allocation, successes %d, failures %d,\
+                      \ best score: %.8f" successes tfails best::String
+    in return (info, as)
+
+processResults _ as@(fstats, successes, sols) =
     case sols of
-      Nothing -> fail "No valid allocation solutions"
-      Just (best, (_, _, w)) ->
+      (best, (_, _, w)):[] ->
           let tfails = length fstats
               info = printf "successes %d, failures %d,\
                             \ best score: %.8f for node(s) %s"
                             successes tfails
                             best (intercalate "/" . map Node.name $ w)::String
-          in return (info, w)
+          in return (info, as)
+      _ -> fail "Internal error: multiple allocation solutions"
 
 -- | Process a request and return new node lists
 processRequest :: Request
                -> Result Cluster.AllocSolution
 processRequest request =
-  let Request rqtype nl il _ _ = request
+  let Request rqtype nl il _ = request
   in case rqtype of
        Allocate xi reqn -> Cluster.tryAlloc nl il xi reqn
        Relocate idx reqn exnodes -> Cluster.tryReloc nl il idx reqn exnodes
+       Evacuate exnodes -> Cluster.tryEvac nl il exnodes
 
 -- | Main function.
 main :: IO ()
@@ -88,17 +98,17 @@ main = do
                  exitWith $ ExitFailure 1
                Ok rq -> return rq
 
-  let Request _ nl _ _ csf = request
+  let Request rq nl _ _ = request
 
   when (isJust shownodes) $ do
          hPutStrLn stderr "Initial cluster status:"
          hPutStrLn stderr $ Cluster.printNodes nl (fromJust shownodes)
 
-  let sols = processRequest request >>= processResults
+  let sols = processRequest request >>= processResults rq
   let (ok, info, rn) =
           case sols of
-            Ok (ginfo, sn) -> (True, "Request successful: " ++ ginfo,
-                                   map ((++ csf) . Node.name) sn)
+            Ok (ginfo, (_, _, sn)) -> (True, "Request successful: " ++ ginfo,
+                                       map snd sn)
             Bad s -> (False, "Request failed: " ++ s, [])
-      resp = formatResponse ok info rn
+      resp = formatResponse ok info rq rn
   putStrLn resp