diff options
| author | shishir gowda <shishirng@gluster.com> | 2010-09-04 01:12:58 +0000 |
|---|---|---|
| committer | Vijay Bellur <vijay@dev.gluster.com> | 2010-09-06 02:21:44 -0700 |
| commit | 386ea89d93497f805c77773515a735a11ef67f29 (patch) | |
| tree | f9b23489dbebf33754645e27dbf5f94745aaf15a /cli/src | |
| parent | 4309c9b0d658185b1b7f07a98240b85870d35204 (diff) | |
Create volume adding transport type option rdma
Adding transport type option to cli volume create command.
This is optional, and defaults to TCP. The other transport
supported is rdma
Signed-off-by: shishir gowda <shishirng@gluster.com>
Signed-off-by: Vijay Bellur <vijay@dev.gluster.com>
BUG: 1507 (need to add 'transport <type>' options to create brick)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1507
Diffstat (limited to 'cli/src')
| -rw-r--r-- | cli/src/cli-cmd-parser.c | 30 | ||||
| -rw-r--r-- | cli/src/cli-cmd-volume.c | 3 |
2 files changed, 32 insertions, 1 deletions
diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c index cc14dfd34..f5b263a63 100644 --- a/cli/src/cli-cmd-parser.c +++ b/cli/src/cli-cmd-parser.c @@ -55,6 +55,8 @@ cli_cmd_volume_create_parse (const char **words, int wordcount, dict_t **options char *host_name = NULL; char *tmp = NULL; char *freeptr = NULL; + char *trans_type = NULL; + int32_t index = 0; GF_ASSERT (words); GF_ASSERT (options); @@ -150,6 +152,32 @@ cli_cmd_volume_create_parse (const char **words, int wordcount, dict_t **options ret = dict_set_int32 (dict, "type", type); if (ret) goto out; + + if (type) + index = 5; + else + index = 3; + + if (strcasecmp(words[index], "transport") == 0) { + brick_index = index+2; + if ((strcasecmp (words[index+1], "tcp") == 0)) { + trans_type = gf_strdup ("tcp"); + } else if ((strcasecmp (words[index+1], "rdma") == 0)) { + trans_type = gf_strdup ("rdma"); + } else { + gf_log ("", GF_LOG_ERROR, "incorrect transport" + " protocol specified"); + ret = -1; + goto out; + } + } else { + trans_type = gf_strdup ("tcp"); + } + + ret = dict_set_str (dict, "transport", trans_type); + if (ret) + goto out; + strcpy (brick_list, " "); while (brick_index < wordcount) { delimiter = strchr (words[brick_index], ':'); @@ -238,6 +266,8 @@ out: if (dict) dict_destroy (dict); } + if (trans_type) + GF_FREE (trans_type); return ret; } diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c index d28207689..09f891374 100644 --- a/cli/src/cli-cmd-volume.c +++ b/cli/src/cli-cmd-volume.c @@ -121,7 +121,8 @@ void cli_cmd_volume_create_usage () { cli_out ("Usage: volume create <NEW-VOLNAME> " - "[stripe <COUNT>] [replica <COUNT>] <NEW-BRICK> ..."); + "[stripe <COUNT>] [replica <COUNT>] [transport <tcp|rdma>] " + "<NEW-BRICK> ..."); } int |