LGTM, thanks On Thu, Jan 7, 2016 at 3:05 PM, 'Helga Velroyen' via ganeti-devel < [email protected]> wrote:
> This patch increases the timeout for the RPC calls that > add and remove SSH keys to the cluster. This is necessary, > because in big clusters the distribution/removal of a > key takes too long as Ganeti has to contact every node in > the cluster. > > This patch increases the timeout from URGENT to FAST > (the next higher option). > > The alternatives to this include splitting up the > RPC call to several calls, which will add addiional > overall runtime and RPC overhead as well as security > implications. Since the higher timeout was tested > in a big cluster, we go with this for now. > > Signed-off-by: Helga Velroyen <[email protected]> > --- > lib/rpc_defs.py | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/lib/rpc_defs.py b/lib/rpc_defs.py > index 09b2fa8..74b74d1 100644 > --- a/lib/rpc_defs.py > +++ b/lib/rpc_defs.py > @@ -537,7 +537,7 @@ _NODE_CALLS = [ > ("daemon", None, "Daemon name"), > ("run", None, "Whether the daemon should be running or stopped"), > ], None, None, "Ensure daemon is running on the node."), > - ("node_ssh_key_add", MULTI, None, constants.RPC_TMO_URGENT, [ > + ("node_ssh_key_add", MULTI, None, constants.RPC_TMO_FAST, [ > ("node_uuid", None, "UUID of the node whose key is distributed"), > ("node_name", None, "Name of the node whose key is distributed"), > ("potential_master_candidates", None, "Potential master candidates"), > @@ -548,7 +548,7 @@ _NODE_CALLS = [ > ("get_public_keys", None, "Whether the node should get the other > nodes'" > " public keys")], > None, None, "Distribute a new node's public SSH key on the cluster."), > - ("node_ssh_key_remove", MULTI, None, constants.RPC_TMO_URGENT, [ > + ("node_ssh_key_remove", MULTI, None, constants.RPC_TMO_FAST, [ > ("node_uuid", None, "UUID of the node whose key is removed"), > ("node_name", None, "Name of the node whose key is removed"), > ("master_candidate_uuids", None, "List of UUIDs of master > candidates."), > -- > 2.6.0.rc2.230.g3dd15c0 > > Hrvoje Ribicic Ganeti Engineering Google Germany GmbH Dienerstr. 12, 80331, München Geschäftsführer: Matthew Scott Sucherman, Paul Terence Manicle Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Diese E-Mail ist vertraulich. Wenn Sie nicht der richtige Adressat sind, leiten Sie diese bitte nicht weiter, informieren Sie den Absender und löschen Sie die E-Mail und alle Anhänge. Vielen Dank. This e-mail is confidential. If you are not the right addressee please do not forward it, please inform the sender, and please erase this e-mail including any attachments. Thanks.
