rpc/rpcsvc: add peername to log messages

This would allow users/developers to associate rpc layer log messages
to the corresponding connection.

Change-Id: I040f79248dced7174a4364d9f995612ed3540dd4
Signed-off-by: Krishnan Parthasarathi <kparthas@redhat.com>
Reviewed-on: http://review.gluster.org/8535
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Rajesh Joseph <rjoseph@redhat.com>
Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
Tested-by: Raghavendra G <rgowdapp@redhat.com>

2 files changed, 22 insertions, 13 deletions

diff --git a/rpc/rpc-lib/src/rpcsvc.c b/rpc/rpc-lib/src/rpcsvc.c
index a8a09048a44..2c8eb777db1 100644
--- a/rpc/rpc-lib/src/rpcsvc.c
+++ b/rpc/rpc-lib/src/rpcsvc.c
@@ -222,11 +222,13 @@ rpcsvc_program_actor (rpcsvc_request_t *req)
         rpcsvc_actor_t          *actor   = NULL;
         rpcsvc_t                *svc     = NULL;
         char                    found    = 0;
+        char                    *peername = NULL;
 
         if (!req)
                 goto err;
 
         svc = req->svc;
+        peername = req->trans->peerinfo.identifier;
         pthread_mutex_lock (&svc->rpclock);
         {
                 list_for_each_entry (program, &svc->programs, program) {
@@ -250,30 +252,34 @@ rpcsvc_program_actor (rpcsvc_request_t *req)
                          */
                         gf_log (GF_RPCSVC, (req->prognum == ACL_PROGRAM) ?
                                 GF_LOG_DEBUG : GF_LOG_WARNING,
-                                "RPC program not available (req %u %u)",
-                                req->prognum, req->progver);
+                                "RPC program not available (req %u %u) for %s",
+                                req->prognum, req->progver,
+                                peername);
                         err = PROG_UNAVAIL;
                         goto err;
                 }
 
                 gf_log (GF_RPCSVC, GF_LOG_WARNING,
-                        "RPC program version not available (req %u %u)",
-                        req->prognum, req->progver);
+                        "RPC program version not available (req %u %u) for %s",
+                        req->prognum, req->progver,
+                        peername);
                 goto err;
         }
         req->prog = program;
         if (!program->actors) {
                 gf_log (GF_RPCSVC, GF_LOG_WARNING,
-                        "RPC Actor not found for program %s %d",
-                        program->progname, program->prognum);
+                        "RPC Actor not found for program %s %d for %s",
+                        program->progname, program->prognum,
+                        peername);
                 err = SYSTEM_ERR;
                 goto err;
         }
 
         if ((req->procnum < 0) || (req->procnum >= program->numactors)) {
                 gf_log (GF_RPCSVC, GF_LOG_ERROR, "RPC Program procedure not"
-                        " available for procedure %d in %s", req->procnum,
-                        program->progname);
+                        " available for procedure %d in %s for  %s",
+                        req->procnum, program->progname,
+                        peername);
                 err = PROC_UNAVAIL;
                 goto err;
         }
@@ -281,8 +287,9 @@ rpcsvc_program_actor (rpcsvc_request_t *req)
         actor = &program->actors[req->procnum];
         if (!actor->actor) {
                 gf_log (GF_RPCSVC, GF_LOG_ERROR, "RPC Program procedure not"
-                        " available for procedure %d in %s", req->procnum,
-                        program->progname);
+                        " available for procedure %d in %s for %s",
+                        req->procnum, program->progname,
+                        peername);
                 err = PROC_UNAVAIL;
                 actor = NULL;
                 goto err;
@@ -291,8 +298,9 @@ rpcsvc_program_actor (rpcsvc_request_t *req)
         req->synctask = program->synctask;
 
         err = SUCCESS;
-        gf_log (GF_RPCSVC, GF_LOG_TRACE, "Actor found: %s - %s",
-                program->progname, actor->procname);
+        gf_log (GF_RPCSVC, GF_LOG_TRACE, "Actor found: %s - %s for %s",
+                program->progname, actor->procname,
+                peername);
 err:
         if (req)
                 req->rpc_err = err;
diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c
index c4b777bca34..2a6586beafd 100644
--- a/rpc/rpc-transport/socket/src/socket.c
+++ b/rpc/rpc-transport/socket/src/socket.c
@@ -1890,7 +1890,8 @@ __socket_read_reply (rpc_transport_t *this)
 
                 if (ret == -1) {
                         gf_log (this->name, GF_LOG_WARNING,
-                                "notify for event MAP_XID failed");
+                                "notify for event MAP_XID failed for %s",
+                                this->peerinfo.identifier);
                         goto out;
                 }
         }