Attachment 936590 Details for Bug 1108538 – proposed patch for gui

[patch] proposed patch for gui

0001-Add-corosync-totem-options-to-Create-Cluster-dialog.patch (text/plain), 6.08 KB, created by Tomas Jelinek on 2014-09-11 15:15:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomas Jelinek

Created: 2014-09-11 15:15:16 UTC

Size: 6.08 KB

patch

obsolete

>From 70a367f4e14a1a68b22c14c14810b7db4c8d9b16 Mon Sep 17 00:00:00 2001
>From: Tomas Jelinek <tojeline@redhat.com>
>Date: Thu, 11 Sep 2014 17:05:18 +0200
>Subject: [PATCH] Add corosync totem options to 'Create Cluster' dialog
>
>---
> pcs/pcs.8             |  2 +-
> pcs/usage.py          |  2 +-
> pcsd/remote.rb        |  5 +++++
> pcsd/views/manage.erb | 44 +++++++++++++++++++++++++++++++++++++++++++-
> 4 files changed, 50 insertions(+), 3 deletions(-)
>
>diff --git a/pcs/pcs.8 b/pcs/pcs.8
>index 2a1f99b..ac880e1 100644
>--- a/pcs/pcs.8
>+++ b/pcs/pcs.8
>@@ -156,7 +156,7 @@ Configure corosync and sync configuration out to listed nodes. \fB\-\-local\fR w
> 
> \fB\-\-token_coefficient\fR <timeout> sets time in milliseconds used for clusters with at least 3 nodes as a coefficient for real token timeout calculation (token + (number_of_nodes - 2) * token_coefficient) (default 650 ms)
> 
>-\fB\-\-join\fR <timeout> sets time in milliseconds to wait for join mesages (default 50 ms)
>+\fB\-\-join\fR <timeout> sets time in milliseconds to wait for join messages (default 50 ms)
> 
> \fB\-\-consensus\fR <timeout> sets time in milliseconds to wait for consensus to be achieved before starting a new round of membership configuration (default 1200 ms)
> 
>diff --git a/pcs/usage.py b/pcs/usage.py
>index 558b185..c6b8318 100644
>--- a/pcs/usage.py
>+++ b/pcs/usage.py
>@@ -473,7 +473,7 @@ Commands:
>         --token_coefficient <timeout> sets time in milliseconds used for clusters
>             with at least 3 nodes as a coefficient for real token timeout calculation
>             (token + (number_of_nodes - 2) * token_coefficient) (default 650 ms)
>-        --join <timeout> sets time in milliseconds to wait for join mesages
>+        --join <timeout> sets time in milliseconds to wait for join messages
>             (default 50 ms)
>         --consensus <timeout> sets time in milliseconds to wait for consensus
>             to be achieved before starting a new round of membership configuration
>diff --git a/pcsd/remote.rb b/pcsd/remote.rb
>index 4ebdc80..081bf4b 100644
>--- a/pcsd/remote.rb
>+++ b/pcsd/remote.rb
>@@ -392,6 +392,11 @@ def setup_cluster(params)
>       options << "--" + o + "=" + v
>     end
> 
>+    options << "--" + o + "=" + v if [
>+        "token", "token_coefficient", "join", "consensus", "miss_count_const",
>+        "fail_recv_const",
>+      ].include?(o)
>+
>     if o == "transport" and v == "udp"
>       options << "--transport=udp"
>       transport_udp = true
>diff --git a/pcsd/views/manage.erb b/pcsd/views/manage.erb
>index 5089732..9793043 100644
>--- a/pcsd/views/manage.erb
>+++ b/pcsd/views/manage.erb
>@@ -162,6 +162,24 @@ The window of time between when a node (or group of nodes die) and quorum \
> is recalculated if the 'Last Man Standing' option is enabled." %>
> 	<% use_ipv6_desc = "\
> Enables IPv6 for cluster communication (default: off)" %>
>+        <% token_timeout = "\
>+Sets time in milliseconds until a token loss is declared after not receiving \
>+a token." %>
>+        <% token_coefficient = "\
>+Sets time in milliseconds used for clusters with at least 3 nodes \
>+as a coefficient for real token timeout calculation \
>+(token + (number_of_nodes - 2) * token_coefficient)" %>
>+        <% join_timeout = "\
>+Sets time in milliseconds to wait for join messages." %>
>+        <% consensus_timeout = "\
>+Sets time in milliseconds to wait for consensus to be achieved before starting \
>+a new round of membership configuration." %>
>+        <% miss_count_const = "\
>+Sets the maximum number of times on receipt of a token a message is checked \
>+for retransmission before a retransmission occurs." %>
>+        <% fail_recv_const = "\
>+Specifies how many rotations of the token without receiving any messages when \
>+messages should be received may occur before a new configuration is formed." %>
>         <% rrp_addr_0_1_desc = "\
> Enables Redundant Ring Protocol (RRP) (default: off)
> 
>@@ -190,8 +208,32 @@ Specify ring 1 address for each node if you want to use RRP." %>
> 	<tr title="<%= h(wait_for_all_desc) %>"><td align=right>Wait for All:</td><td><input type=checkbox name="config-wait_for_all"></td></tr>
> 	<tr title="<%= h(auto_tie_desc) %>"><td align=right>Auto Tie Breaker:</td><td><input type=checkbox name="config-auto_tie_breaker"></td></tr>
> 	<tr title="<%= h(last_man_desc) %>"><td align=right>Last Man Standing:</td><td><input type=checkbox name="config-last_man_standing"></td></tr>
>-	<tr title="<%= h(last_man_window_desc) %>"><td align=right>Last Man Standing Window:</td><td><input type=input size=5 name="config-last_man_standing_window" value=10000>ms</td></tr>
>+	<tr title="<%= h(last_man_window_desc) %>"><td align=right>Last Man Standing Window:</td><td><input type=text size=5 name="config-last_man_standing_window" value=10000>ms</td></tr>
> 	<tr title="<%= h(use_ipv6_desc) %>"><td align=right>Use IPv6</td><td><input type=checkbox name="config-ipv6"></td></tr>
>+        <tr title="<%= h(token_timeout) %>">
>+          <td align="right">Token Timeout:</td>
>+          <td><input type="text" size="5" name="config-token" value="1000">ms</td>
>+        </tr>
>+        <tr title="<%= h(token_coefficient) %>">
>+          <td align="right">Token Timeout Coefficient:</td>
>+          <td><input type="text" size="5" name="config-token_coefficient" value="650">ms</td>
>+        </tr>
>+        <tr title="<%= h(join_timeout) %>">
>+          <td align="right">Join Timeout:</td>
>+          <td><input type="text" size="5" name="config-join" value="50">ms</td>
>+        </tr>
>+        <tr title="<%= h(consensus_timeout) %>">
>+          <td align="right">Consensus Timeout:</td>
>+          <td><input type="text" size="5" name="config-consensus" value="1200">ms</td>
>+        </tr>
>+        <tr title="<%= h(miss_count_const) %>">
>+          <td align="right">Missed Messages Count:</td>
>+          <td><input type="text" size="5" name="config-miss_count_const" value="5"></td>
>+        </tr>
>+        <tr title="<%= h(fail_recv_const) %>">
>+          <td align="right">Failures Count:</td>
>+          <td><input type="text" size="5" name="config-fail_recv_const" value="2500"></td>
>+        </tr>
>       </table>
>       <div id="rrp_udp_transport" style="display: none;">
>         <br>
>-- 
>1.9.1
>

Actions: View | Diff

Attachments on bug 1108538: 909155 | 936590