From b8b2a9d2f49686d5056fb0ce6150cf9c54180b12 Mon Sep 17 00:00:00 2001 From: Amar Tumballi Date: Wed, 23 Jun 2010 04:01:24 +0000 Subject: change volume file options back to 'transport' from 'rpc-transport' This helps to keep the backword compatibility with old volume files. Signed-off-by: Amar Tumballi Signed-off-by: Anand V. Avati BUG: 875 (Implement a new protocol to provide proper backward/forward compatibility) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=875 --- xlators/protocol/rpc/rpc-lib/src/rpc-transport.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'xlators/protocol/rpc/rpc-lib/src') diff --git a/xlators/protocol/rpc/rpc-lib/src/rpc-transport.c b/xlators/protocol/rpc/rpc-lib/src/rpc-transport.c index da3ba3521..577158904 100644 --- a/xlators/protocol/rpc/rpc-lib/src/rpc-transport.c +++ b/xlators/protocol/rpc/rpc-lib/src/rpc-transport.c @@ -856,14 +856,14 @@ rpc_transport_load (glusterfs_ctx_t *ctx, dict_t *options, char *trans_name) type = str; /* Backward compatibility */ - ret = dict_get_str (options, "rpc-transport-type", &type); + ret = dict_get_str (options, "transport-type", &type); if (ret < 0) { - ret = dict_set_str (options, "rpc-transport-type", "socket"); + ret = dict_set_str (options, "transport-type", "socket"); if (ret < 0) gf_log ("dict", GF_LOG_DEBUG, - "setting rpc-transport-type failed"); + "setting transport-type failed"); gf_log ("rpc-transport", GF_LOG_WARNING, - "missing 'option rpc-transport-type'. defaulting to " + "missing 'option transport-type'. defaulting to " "\"socket\""); } else { { @@ -883,11 +883,11 @@ rpc_transport_load (glusterfs_ctx_t *ctx, dict_t *options, char *trans_name) (is_ibsdp == 0)) { if (is_unix == 0) ret = dict_set_str (options, - "rpc-transport.address-family", + "transport.address-family", "unix"); if (is_ibsdp == 0) ret = dict_set_str (options, - "rpc-transport.address-family", + "transport.address-family", "inet-sdp"); if (ret < 0) @@ -895,17 +895,17 @@ rpc_transport_load (glusterfs_ctx_t *ctx, dict_t *options, char *trans_name) "setting address-family failed"); ret = dict_set_str (options, - "rpc-transport-type", "socket"); + "transport-type", "socket"); if (ret < 0) gf_log ("dict", GF_LOG_DEBUG, - "setting rpc-transport-type failed"); + "setting transport-type failed"); } } - ret = dict_get_str (options, "rpc-transport-type", &type); + ret = dict_get_str (options, "transport-type", &type); if (ret < 0) { gf_log ("rpc-transport", GF_LOG_ERROR, - "'option rpc-transport-type ' missing in volume '%s'", + "'option transport-type ' missing in volume '%s'", trans_name); goto fail; } @@ -922,7 +922,7 @@ rpc_transport_load (glusterfs_ctx_t *ctx, dict_t *options, char *trans_name) if (handle == NULL) { gf_log ("rpc-transport", GF_LOG_ERROR, "%s", dlerror ()); gf_log ("rpc-transport", GF_LOG_ERROR, - "volume '%s': rpc-transport-type '%s' is not valid or " + "volume '%s': transport-type '%s' is not valid or " "not found on this machine", trans_name, type); goto fail; -- cgit