LGTM
On Mon, May 12, 2014 at 6:08 PM, 'Klaus Aehlig' via ganeti-devel < [email protected]> wrote: > ...instead of replicating the functionality on the fly. > > Signed-off-by: Klaus Aehlig <[email protected]> > --- > src/Ganeti/Query/Server.hs | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/src/Ganeti/Query/Server.hs b/src/Ganeti/Query/Server.hs > index b1e470a..8952d4e 100644 > --- a/src/Ganeti/Query/Server.hs > +++ b/src/Ganeti/Query/Server.hs > @@ -294,11 +294,8 @@ handleCall _ _ cfg (WaitForJobChange jid fields > prev_job prev_log tmout) = do > _ -> liftM (Ok . showJSON) compute_fn > > handleCall _ _ cfg (SetWatcherPause time) = do > - let mcs = Config.getMasterCandidates cfg > - masters = genericResult (const []) return > - . Config.getNode cfg . clusterMasterNode > - $ configCluster cfg > - _ <- executeRpcCall (masters ++ mcs) $ RpcCallSetWatcherPause time > + let mcs = Config.getMasterOrCandidates cfg > + _ <- executeRpcCall mcs $ RpcCallSetWatcherPause time > return . Ok . maybe JSNull showJSON $ fmap TimeAsDoubleJSON time > > handleCall _ _ cfg (SetDrainFlag value) = do > -- > 1.9.1.423.g4596e3a > >
