From 08c87ae4208b73f4f183f7b54ebcb373e8bc0ede Mon Sep 17 00:00:00 2001
From: Vishal Pandey <vpandey@redhat.com>
Date: Wed, 24 Apr 2019 13:37:16 +0530
Subject: glusterd/thin-arbiter: Thin-arbiter integration with GD1

gluster volume create <VOLNAME> replica 2 thin-arbiter 1 <host1>:<brick1> <host2>:<brick2>
<thin-arbiter-host>:<path-to-store-replica-id-file> [force]

The changes have been made in a way that the last brick in the bricks list
will be treated as the thin-arbiter.
GD1 will be manipulated to consider replica count to be as 2 and continue creating the
volume like any other replica 2 volume but since thin-arbiter volumes need ta-brick
client xlator entries for each subvolume in fuse volfile, volfile generation is
modified in a way to inject these entries seperately in the volfile for every subvolume.

Few more additions -
1- Save the volinfo with new fields ta_bricks list and thin_arbiter_count.
2- Introduce a new option client.ta-brick-port to add remote-port to ta-brick xlator entry
   in fuse volfiles. The option can be set using the following CLI syntax -
   gluster volume set <VOLNAME> client.ta-brick-port <PORTNO.>
3- Volume Info will contain a Thin-Arbiter-path entry to distinguish
   from other replicate volumes.

Change-Id: Ib434e2313b29716f32476c6c211d282c4ef39406
Updates #687
Signed-off-by: Vishal Pandey <vpandey@redhat.com>
(cherry picked from commit 9b223b15ab69fce4076de036ee162f36a058bcd2)
---
 cli/src/cli-cmd-volume.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'cli/src/cli-cmd-volume.c')

diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c
index 713a047dd0b..f454b097aa7 100644
--- a/cli/src/cli-cmd-volume.c
+++ b/cli/src/cli-cmd-volume.c
@@ -2999,9 +2999,9 @@ struct cli_cmd volume_cmds[] = {
      "list information of all volumes"},
 
     {"volume create <NEW-VOLNAME> [stripe <COUNT>] "
-     "[replica <COUNT> [arbiter <COUNT>]] "
+     "[[replica <COUNT> [arbiter <COUNT>]]|[replica 2 thin-arbiter 1]] "
      "[disperse [<COUNT>]] [disperse-data <COUNT>] [redundancy <COUNT>] "
-     "[transport <tcp|rdma|tcp,rdma>] <NEW-BRICK>"
+     "[transport <tcp|rdma|tcp,rdma>] <NEW-BRICK> <TA-BRICK>"
      "... [force]",
 
      cli_cmd_volume_create_cbk,
-- 
cgit