summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--rpc/rpc-lib/src/rpcsvc.c5
-rw-r--r--xlators/mgmt/glusterd/src/glusterd.c1
2 files changed, 5 insertions, 1 deletions
diff --git a/rpc/rpc-lib/src/rpcsvc.c b/rpc/rpc-lib/src/rpcsvc.c
index e12403e..c4c9fca 100644
--- a/rpc/rpc-lib/src/rpcsvc.c
+++ b/rpc/rpc-lib/src/rpcsvc.c
@@ -1704,6 +1704,10 @@ rpcsvc_program_register (rpcsvc_t *svc, rpcsvc_program_t program)
}
listener = rpcsvc_get_listener (svc, listen_port, NULL);
+ if ((listener == NULL) && (listen_port == RPCSVC_DEFAULT_LISTEN_PORT)) {
+ listener = rpcsvc_get_listener (svc, 6969, NULL);
+ }
+
if ((listener == NULL) || (listener->trans == NULL)) {
if ((listener != NULL) && (listener->trans == NULL)) {
gf_log (GF_RPCSVC, GF_LOG_DEBUG,
@@ -1741,6 +1745,7 @@ rpcsvc_program_register (rpcsvc_t *svc, rpcsvc_program_t program)
listener = rpcsvc_create_listener (svc, program.options,
program.progname);
if (listener == NULL) {
+ ret = -1;
gf_log (GF_RPCSVC, GF_LOG_DEBUG,
"creation of listener for program (%s) failed",
program.progname);
diff --git a/xlators/mgmt/glusterd/src/glusterd.c b/xlators/mgmt/glusterd/src/glusterd.c
index 1997a31..a9f790b 100644
--- a/xlators/mgmt/glusterd/src/glusterd.c
+++ b/xlators/mgmt/glusterd/src/glusterd.c
@@ -148,7 +148,6 @@ glusterd_rpcsvc_notify (rpcsvc_t *rpc, void *xl, rpcsvc_event_t event,
switch (event) {
case RPCSVC_EVENT_ACCEPT:
{
- xprt->mydata = this;
break;
}
case RPCSVC_EVENT_DISCONNECT: