Okay, LGTM then. On Mon, 1 Jun 2015 at 11:35 Klaus Aehlig <[email protected]> wrote:
> > > diff --cc src/Ganeti/HTools/Cluster.hs > > > index d5367f6,f76a05b..2e8f0ca > > > --- a/src/Ganeti/HTools/Cluster.hs > > > +++ b/src/Ganeti/HTools/Cluster.hs > > > @@@ -468,10 -458,10 +468,11 @@@ applyMoveEx force nl inst Failover > > > let (old_pdx, old_sdx, old_p, old_s) = instanceNodes nl inst > > > int_p = Node.removePri old_p inst > > > int_s = Node.removeSec old_s inst > > > - new_nl = do -- Maybe monad > > > - new_p <- Node.addPriEx (Node.offline old_p) int_s inst > > > + new_nl = do -- OpResult > > > + Node.checkMigration old_p old_s > > > + new_p <- Node.addPriEx (Node.offline old_p || force) int_s > inst > > > - new_s <- Node.addSec int_p inst old_sdx > > > + new_s <- Node.addSecExEx (Node.offline old_p) (Node.offline > > > old_p) > > > > > > > Is it correct that this is "ExEx" instead of just one "Ex"? > > I think it is correct to merge change 4ca31587 up without changing it; > see > http://git.ganeti.org/?p=ganeti.git;a=commitdiff;h=4ca31587850b8d60b12f3be379cc0186387f2895 > > > > > > + int_p inst old_sdx > > > let new_inst = Instance.setBoth inst old_sdx old_pdx > > > return (Container.addTwo old_pdx new_s old_sdx new_p nl, > > > new_inst, old_sdx, old_pdx) > > -- > Klaus Aehlig > Google Germany GmbH, Dienerstr. 12, 80331 Muenchen > Registergericht und -nummer: Hamburg, HRB 86891 > Sitz der Gesellschaft: Hamburg > Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores >
