On Thu, Jul 30, 2015 at 03:42:23PM +0200, 'Klaus Aehlig' via ganeti-devel wrote:
This keeps the code slightly more readable. Also, while there,
also remove the hack of avoiding the dangerous "head" function
by using the (equally incomplete, but not checked for) "last"
function.
Signed-off-by: Klaus Aehlig <[email protected]>
---
src/Ganeti/HTools/Cluster.hs | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/Ganeti/HTools/Cluster.hs b/src/Ganeti/HTools/Cluster.hs
index 3fc75e7..891e3f9 100644
--- a/src/Ganeti/HTools/Cluster.hs
+++ b/src/Ganeti/HTools/Cluster.hs
@@ -877,21 +877,20 @@ tieredAlloc opts nl il limit newinst allocnodes ixes
cstats =
Nothing -> (False, Nothing)
Just n -> (n <= ixes_cnt,
Just (n - ixes_cnt))
- sortedErrs = map fst $ sortBy (comparing snd) errs
+ sortedErrs = map fst $ sortBy (flip $ comparing snd) errs
suffShrink = sufficesShrinking
(fromMaybe emptyAllocSolution
. flip (tryAlloc opts nl' il') allocnodes)
newinst
- bigSteps = filter isJust . map suffShrink . reverse $ sortedErrs
+ bigSteps = filter isJust . map suffShrink $ sortedErrs
progress (Ok (_, _, _, newil', _)) (Ok (_, _, _, newil, _)) =
length newil' > length newil
progress _ _ = False
in if stop then newsol else
- let newsol' = case Instance.shrinkByType newinst . last
- $ sortedErrs of
- Bad _ -> newsol
- Ok newinst' -> tieredAlloc opts nl' il' newlimit
- newinst' allocnodes ixes' cstats'
+ let newsol' = case map (Instance.shrinkByType newinst) sortedErrs of
+ Ok newinst' : _ -> tieredAlloc opts nl' il' newlimit
+ newinst' allocnodes ixes' cstats'
+ _ -> newsol
in if progress newsol' newsol then newsol' else
case bigSteps of
Just newinst':_ -> tieredAlloc opts nl' il' newlimit
--
2.5.0.rc2.392.g76e840b
LGTM
