diff options
| author | Vishwanath S Bhat <vishwanath@gluster.com> | 2011-07-21 15:19:14 +0530 |
|---|---|---|
| committer | Anand Avati <avati@gluster.com> | 2011-07-24 11:44:42 -0700 |
| commit | b06ba047f48e92323d8dc8af7ed485d35fbbccf2 (patch) | |
| tree | d0fecbf395f0cb4d873e60830ffd8cdf7f41a29d /xlators/mgmt/glusterd/src/glusterd-op-sm.c | |
| parent | 2c068a98e4b0bf54e7553ed7411fa8c7fe3173ba (diff) | |
glusterd - Removed hardcoding of transport type in replace-brick.
Replace-brick didn't support transport types other than tcp.
Test case: replace-brick should work with tcp and rdma.
Change-Id: If33f108b70247d81791d25a1a05247f49847b4d7
BUG: 3092
Reviewed-on: http://review.gluster.com/72
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Krishnan Parthasarathi <kp@gluster.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-op-sm.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-op-sm.c | 33 |
1 files changed, 9 insertions, 24 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c index e5aa156e1..230c29c47 100644 --- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c +++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c @@ -3156,19 +3156,12 @@ rb_generate_client_volfile (glusterd_volinfo_t *volinfo, } GF_ASSERT (src_brickinfo->port); - switch (volinfo->transport_type) { - case GF_TRANSPORT_RDMA: - ret = gf_asprintf (&ttype, "rdma"); - break; - case GF_TRANSPORT_TCP: - case GF_TRANSPORT_BOTH_TCP_RDMA: - ret = gf_asprintf (&ttype, "tcp"); - default: - gf_log (THIS->name, GF_LOG_ERROR, "Unknown " - "transport type"); - ret = -1; - goto out; - } + + ttype = glusterd_get_trans_type_rb (volinfo->transport_type); + if (NULL == ttype){ + ret = -1; + goto out; + } fprintf (file, client_volfile_str, src_brickinfo->hostname, src_brickinfo->path, src_brickinfo->port, ttype); @@ -3224,17 +3217,8 @@ rb_generate_dst_brick_volfile (glusterd_volinfo_t *volinfo, goto out; } - switch (volinfo->transport_type) { - case GF_TRANSPORT_TCP: - case GF_TRANSPORT_BOTH_TCP_RDMA: - ret = gf_asprintf (&trans_type, "tcp"); - break; - case GF_TRANSPORT_RDMA: - ret = gf_asprintf (&trans_type, "rdma"); - break; - default: - gf_log (THIS->name, GF_LOG_ERROR, "Unknown " - "transport type"); + trans_type = glusterd_get_trans_type_rb (volinfo->transport_type); + if (NULL == trans_type){ ret = -1; goto out; } @@ -3253,6 +3237,7 @@ out: return ret; } + static int rb_mountpoint_mkdir (glusterd_volinfo_t *volinfo, glusterd_brickinfo_t *src_brickinfo) |