On Thu, Oct 31, 2013 at 2:58 PM, Klaus Aehlig <[email protected]> wrote:
> With standby nodes, simply ignoring the specification of > an offline node is not sufficient any more. > > Signed-off-by: Klaus Aehlig <[email protected]> > --- > src/Ganeti/HTools/Backend/Text.hs | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/src/Ganeti/HTools/Backend/Text.hs > b/src/Ganeti/HTools/Backend/Text.hs > index c53b488..d771ba8 100644 > --- a/src/Ganeti/HTools/Backend/Text.hs > +++ b/src/Ganeti/HTools/Backend/Text.hs > @@ -210,7 +210,7 @@ loadNode ktg [name, tm, nm, fm, td, fd, tc, fo, gu, > spindles, tags, > excl_stor, free_spindles, nos_cpu] = do > gdx <- lookupGroup ktg name gu > new_node <- > - if "?" `elem` [tm,nm,fm,td,fd,tc] || fo == "Y" then > + if "?" `elem` [tm,nm,fm,td,fd,tc] then > return $ Node.create name 0 0 0 0 0 0 0 True 0 0 gdx False > else do > let vtags = commaSplit tags > @@ -230,7 +230,7 @@ loadNode ktg [name, tm, nm, fm, td, fd, tc, fo, gu, > spindles, tags, > "Invalid exclusive_storage value for node '" > ++ > name ++ "': " ++ excl_stor > return . flip Node.setMaster (fo == "M") . flip Node.setNodeTags > vtags $ > - Node.create name vtm vnm vfm vtd vfd vtc vnc False vspindles > + Node.create name vtm vnm vfm vtd vfd vtc vnc (fo == "Y") > vspindles vfree_spindles gdx vexcl_stor > return (name, new_node) > I generally find the naming of the variables in this functions rather unreadable, but I see that it was like that before, so nevertheless LGTM. Cheers, Helga > > -- > 1.8.4.1 > > -- -- Helga Velroyen | Software Engineer | [email protected] | Google Germany GmbH Dienerstr. 12 80331 München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores
