Revision a7667ba6
b/htools/Ganeti/HTools/Loader.hs | ||
---|---|---|
241 | 241 |
-> Instance.Instance -- ^ Target Instance |
242 | 242 |
-> Instance.Instance -- ^ Target Instance with updated attribute |
243 | 243 |
updateMovable selinsts exinsts inst = |
244 |
if Instance.sNode inst == Node.noSecondary || |
|
245 |
Instance.name inst `elem` exinsts || |
|
244 |
if Instance.name inst `elem` exinsts || |
|
246 | 245 |
not (null selinsts || Instance.name inst `elem` selinsts) |
247 | 246 |
then Instance.setMovable inst False |
248 | 247 |
else inst |
b/htools/Ganeti/HTools/QC.hs | ||
---|---|---|
853 | 853 |
forAll (choose (2, 10)) $ \count -> |
854 | 854 |
forAll genOnlineNode $ \node -> |
855 | 855 |
forAll (genInstanceSmallerThanNode node) $ \inst -> |
856 |
let inst' = Instance.setMovable inst (reqnodes == 2) |
|
857 |
nl = makeSmallCluster node count |
|
856 |
let nl = makeSmallCluster node count |
|
858 | 857 |
in case Cluster.genAllocNodes defGroupList nl reqnodes True >>= \allocn -> |
859 |
Cluster.iterateAlloc nl Container.empty (Just maxiter) inst' allocn [] []
|
|
858 |
Cluster.iterateAlloc nl Container.empty (Just maxiter) inst allocn [] [] |
|
860 | 859 |
of |
861 | 860 |
Types.Bad msg -> failTest $ "Failed to allocate: " ++ msg |
862 | 861 |
Types.Ok (_, _, _, [], _) -> printTestCase |
Also available in: Unified diff