Revision 6d0bc5ca Ganeti/HTools/QC.hs

b/Ganeti/HTools/QC.hs
684 684 
    let nl = makeSmallCluster node count
685 685 
        il = Container.empty
686 686 
        inst' = setInstanceSmallerThanNode node inst
687 
    in case Cluster.genAllocNodes nl 2 >>= Cluster.tryAlloc nl il inst' of
687 
    in case Cluster.genAllocNodes defGroupList nl 2 True >>=
688 
       Cluster.tryAlloc nl il inst' of
688 689 
         Types.Bad _ -> False
689 690 
         Types.Ok as ->
690 691 
             case Cluster.asSolutions as of
......
707 708 
            ==>
708 709 
    let nl = makeSmallCluster node count
709 710 
        il = Container.empty
710 
        allocnodes = Cluster.genAllocNodes nl rqnodes
711 
        allocnodes = Cluster.genAllocNodes defGroupList nl rqnodes True
711 712 
    in case allocnodes >>= \allocnodes' ->
712 713 
        Cluster.tieredAlloc nl il inst allocnodes' [] [] of
713 714 
         Types.Bad _ -> False
......
726 727 
    let nl = makeSmallCluster node count
727 728 
        il = Container.empty
728 729 
        inst' = setInstanceSmallerThanNode node inst
729 
    in case Cluster.genAllocNodes nl 2 >>= Cluster.tryAlloc nl il inst' of
730 
    in case Cluster.genAllocNodes defGroupList nl 2 True >>=
731 
       Cluster.tryAlloc nl il inst' of
730 732 
         Types.Bad _ -> False
731 733 
         Types.Ok as ->
732 734 
             case Cluster.asSolutions as of
......
751 753 
    let nl = makeSmallCluster node count
752 754 
        (hnode, nl') = IntMap.deleteFindMax nl
753 755 
        il = Container.empty
754 
        allocnodes = Cluster.genAllocNodes nl' 2
756 
        allocnodes = Cluster.genAllocNodes defGroupList nl' 2 True
755 757 
        i_templ = createInstance Types.unitMem Types.unitDsk Types.unitCpu
756 758 
    in case allocnodes >>= \allocnodes' ->
757 759 
        Cluster.iterateAlloc nl' il i_templ allocnodes' [] [] of

Also available in: Unified diff