Hi!
On Tue, 30 Jun 2015 at 13:34 Klaus Aehlig <[email protected]> wrote:
> > @@ -2953,6 +2954,8 @@ class _RunWhileClusterStoppedHelper(object):
> > @param online_nodes: List of names of online nodes
> > @type ssh_ports: list
> > @param ssh_ports: List of SSH ports of online nodes
> > + @type exclude_daemons: list of string
> > + @param exclude_daemons: list of daemons to shutdown
>
> The implementation (as well as the name *exclude*_daemons) suggest that
> these are the daemons that are allowed to continue running, not the ones
> to shutdown. Please fix documentation.
>
>
Ack.
>
> > daemons :: FrozenSet String
> > daemons =
> > - ConstantUtils.mkSet [confd,
> > + ConstantUtils.mkSet [noded,
> > + wconfd,
> > + rapi,
> > luxid,
> > - masterd,
> > - mond,
> > - noded,
> > - rapi]
> > + kvmd,
> > + mond]
>
> How is this change related to this patch?
>
Indeed, this is some left-over edit from when I did not want to list the
daemons to exclude, but to include. I realized that some were missing in
this list. However, since I switched to excluding daemons, this is not
needed for this patch series anymore. I will remove this edit and resend a
separate patch for fixing that independent of this patch series.
Interdiff:
diff --git a/lib/cli.py b/lib/cli.py
index 195a77b..657308e 100644
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -2956,6 +2956,8 @@ class _RunWhileDaemonsStoppedHelper(object):
@param ssh_ports: List of SSH ports of online nodes
@type exclude_daemons: list of string
@param exclude_daemons: list of daemons to shutdown
+ @param exclude_daemons: list of daemons that will be restarted after
+ all others are shutdown
"""
self.feedback_fn = feedback_fn
diff --git a/src/Ganeti/Constants.hs b/src/Ganeti/Constants.hs
index 9428780..d1825f4 100644
--- a/src/Ganeti/Constants.hs
+++ b/src/Ganeti/Constants.hs
@@ -382,12 +382,11 @@ daemonsMaster = ConstantUtils.mkSet [wconfd, luxid,
rapi]
daemons :: FrozenSet String
daemons =
- ConstantUtils.mkSet [noded,
- wconfd,
- rapi,
+ ConstantUtils.mkSet [confd,
luxid,
- kvmd,
- mond]
+ mond,
+ noded,
+ rapi]
defaultConfdPort :: Int
defaultConfdPort = 1814
> --
> 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
>
