summaryrefslogtreecommitdiffstats
path: root/xlators
diff options
context:
space:
mode:
Diffstat (limited to 'xlators')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd.c22
-rw-r--r--xlators/protocol/server/src/server.c21
2 files changed, 43 insertions, 0 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd.c b/xlators/mgmt/glusterd/src/glusterd.c
index ce312066379..d44040eb1b1 100644
--- a/xlators/mgmt/glusterd/src/glusterd.c
+++ b/xlators/mgmt/glusterd/src/glusterd.c
@@ -1198,7 +1198,9 @@ init (xlator_t *this)
int first_time = 0;
char *mountbroker_root = NULL;
int i = 0;
+ int total_transport = 0;
char *valgrind_str = NULL;
+ char *transport_type = NULL;
#ifndef GF_DARWIN_HOST_OS
{
@@ -1403,12 +1405,32 @@ init (xlator_t *this)
* only one (at most a pair - rdma and socket) listener for
* glusterd1_mop_prog, gluster_pmap_prog and gluster_handshake_prog.
*/
+
+ ret = dict_get_str (this->options, "transport-type", &transport_type);
+ if (ret) {
+ gf_log (this->name, GF_LOG_ERROR, "Failed to get transport type");
+ ret = -1;
+ goto out;
+ }
+
+ total_transport = rpc_transport_count (transport_type);
+ if (total_transport <= 0) {
+ gf_log (this->name, GF_LOG_ERROR,
+ "failed to get total number of available tranpsorts");
+ ret = -1;
+ goto out;
+ }
+
ret = rpcsvc_create_listeners (rpc, this->options, this->name);
if (ret < 1) {
gf_log (this->name, GF_LOG_ERROR,
"creation of listener failed");
ret = -1;
goto out;
+ } else if (ret < total_transport) {
+ gf_log (this->name, GF_LOG_ERROR,
+ "creation of %d listeners failed, continuing with "
+ "succeeded transport", (total_transport - ret));
}
for (i = 0; i < gd_inet_programs_count; i++) {
diff --git a/xlators/protocol/server/src/server.c b/xlators/protocol/server/src/server.c
index e132cf33f85..97389116023 100644
--- a/xlators/protocol/server/src/server.c
+++ b/xlators/protocol/server/src/server.c
@@ -848,7 +848,10 @@ init (xlator_t *this)
int32_t ret = -1;
server_conf_t *conf = NULL;
rpcsvc_listener_t *listener = NULL;
+ char *transport_type = NULL;
char *statedump_path = NULL;
+ int total_transport = 0;
+
GF_VALIDATE_OR_GOTO ("init", this, out);
if (this->children == NULL) {
@@ -958,6 +961,20 @@ init (xlator_t *this)
*/
this->ctx->secure_srvr = MGMT_SSL_COPY_IO;
+ ret = dict_get_str (this->options, "transport-type", &transport_type);
+ if (ret) {
+ gf_log (this->name, GF_LOG_ERROR,
+ "option transport-type not set");
+ ret = -1;
+ goto out;
+ }
+ total_transport = rpc_transport_count (transport_type);
+ if (total_transport <= 0) {
+ gf_log (this->name, GF_LOG_ERROR,
+ "failed to get total number of available tranpsorts");
+ ret = -1;
+ goto out;
+ }
ret = rpcsvc_create_listeners (conf->rpc, this->options,
this->name);
if (ret < 1) {
@@ -965,6 +982,10 @@ init (xlator_t *this)
"creation of listener failed");
ret = -1;
goto out;
+ } else if (ret < total_transport) {
+ gf_log (this->name, GF_LOG_ERROR,
+ "creation of %d listeners failed, continuing with "
+ "succeeded transport", (total_transport - ret));
}
ret = rpcsvc_register_notify (conf->rpc, server_rpc_notify, this);