From a0a907a7d6e52f6a842b9b5491eda7a210eecdb8 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Fri, 13 Oct 2017 08:19:55 -0400 Subject: [PATCH] 3.12.2 GA --- 0001-cli_src_cli-cmd-parser.c.patch | 71 ----------------------------- 1 file changed, 71 deletions(-) delete mode 100644 0001-cli_src_cli-cmd-parser.c.patch diff --git a/0001-cli_src_cli-cmd-parser.c.patch b/0001-cli_src_cli-cmd-parser.c.patch deleted file mode 100644 index 868e56f..0000000 --- a/0001-cli_src_cli-cmd-parser.c.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 2562b1c40d790da00d218f8df30bf190f00dd41c Mon Sep 17 00:00:00 2001 -From: Niels de Vos -Date: Tue, 26 Sep 2017 14:51:27 +0200 -Subject: [PATCH] cli: Bypass the confirmation question creating replica 2 - volume with force - -When a replica 2 volume is created with the force option, -remove the warning message with the confirmation question, -whether they want to continue or not and Succeed the -volume creation. - -Cherry picked from commit f449e53df7c07301b495b4ff688d165026dfd2d0: -> Change-Id: I4f3306659fa4cbf53dd8d45269a32d19ce86ac88 -> BUG: 1493893 -> Signed-off-by: karthik-us - -While backporting the URL for the documentation has been adjusted as -well. This comes from commit eb2f1ab4cd which also corrects other URLs -(those are not included in this backport). - -Change-Id: I4f3306659fa4cbf53dd8d45269a32d19ce86ac88 -BUG: 1495858 -Signed-off-by: Niels de Vos ---- - cli/src/cli-cmd-parser.c | 30 +++++++++++++++++------------- - 1 file changed, 17 insertions(+), 13 deletions(-) - -diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c -index 984ce5bba..a7ebd5ce3 100644 ---- a/cli/src/cli-cmd-parser.c -+++ b/cli/src/cli-cmd-parser.c -@@ -529,19 +529,23 @@ cli_cmd_volume_create_parse (struct cli_state *state, const char **words, - goto out; - } - if (replica_count == 2) { -- question = "Replica 2 volumes are prone to " -- "split-brain. Use Arbiter or Replica" -- " 3 to avoid this. See: " -- " https://gluster.readthedocs.io/en/latest/Administrator%20Guide/Split%20brain%20and%20ways%20to%20deal%20with%20it/." -- "\nDo you still want to continue?\n"; -- answer = cli_cmd_get_confirmation (state, -- question); -- if (GF_ANSWER_NO == answer) { -- gf_log ("cli", GF_LOG_ERROR, -- "Volume create cancelled, " -- "exiting"); -- ret = -1; -- goto out; -+ if (strcmp (words[wordcount - 1], "force")) { -+ question = "Replica 2 volumes are prone" -+ " to split-brain. Use " -+ "Arbiter or Replica 3 to " -+ "avoid this. See: " -+ "http://docs.gluster.org/en/latest/Administrator%20Guide/Split%20brain%20and%20ways%20to%20deal%20with%20it/." -+ "\nDo you still want to " -+ "continue?\n"; -+ answer = cli_cmd_get_confirmation (state, -+ question); -+ if (GF_ANSWER_NO == answer) { -+ gf_log ("cli", GF_LOG_ERROR, -+ "Volume create " -+ "cancelled, exiting"); -+ ret = -1; -+ goto out; -+ } - } - } - ret = dict_set_int32 (dict, "replica-count", replica_count); --- -2.13.5 -