rpc-clnt: show disconnect messages in log file by default

Signed-off-by: Anand V. Avati <avati@blackhole.gluster.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>

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

2 files changed, 24 insertions, 9 deletions

diff --git a/xlators/protocol/client/src/client-handshake.c b/xlators/protocol/client/src/client-handshake.c
index c56294c83be..8e5236fc164 100644
--- a/xlators/protocol/client/src/client-handshake.c
+++ b/xlators/protocol/client/src/client-handshake.c
@@ -397,9 +397,15 @@ client3_1_reopen_cbk (struct rpc_req *req, struct iovec *iov, int count,
                 goto out;
         }
 
-        gf_log (frame->this->name, GF_LOG_DEBUG,
-                "reopen on %s returned %d (%"PRId64")",
-                local->loc.path, rsp.op_ret, rsp.fd);
+        if (rsp.op_ret < 0) {
+                gf_log (frame->this->name, GF_LOG_NORMAL,
+                        "reopen on %s failed (%s)",
+                        local->loc.path, rsp.op_ret, strerror (rsp.op_errno));
+        } else {
+                gf_log (frame->this->name, GF_LOG_NORMAL,
+                        "reopen on %s succeeded (%"PRId64")",
+                        local->loc.path, rsp.op_ret, rsp.fd);
+        }
 
         if (rsp.op_ret == -1)
                 goto out;
@@ -483,9 +489,15 @@ client3_1_reopendir_cbk (struct rpc_req *req, struct iovec *iov, int count,
                 goto out;
         }
 
-        gf_log (frame->this->name, GF_LOG_DEBUG,
-                "reopendir on %s returned %d (%"PRId64")",
-                local->loc.path, rsp.op_ret, rsp.fd);
+        if (rsp.op_ret < 0) {
+                gf_log (frame->this->name, GF_LOG_NORMAL,
+                        "reopendir on %s failed (%s)",
+                        local->loc.path, rsp.op_ret, strerror (rsp.op_errno));
+        } else {
+                gf_log (frame->this->name, GF_LOG_NORMAL,
+                        "reopendir on %s succeeded (%"PRId64")",
+                        local->loc.path, rsp.op_ret, rsp.fd);
+        }
 
 	if (-1 != rsp.op_ret) {
                 fdctx = local->fdctx;
diff --git a/xlators/protocol/client/src/client.c b/xlators/protocol/client/src/client.c
index 198ba082add..e83badca98a 100644
--- a/xlators/protocol/client/src/client.c
+++ b/xlators/protocol/client/src/client.c
@@ -1583,10 +1583,13 @@ client_rpc_notify (struct rpc_clnt *rpc, void *mydata, rpc_clnt_event_t event,
 
                 client_mark_fd_bad (this);
 
-                gf_log (this->name, GF_LOG_TRACE, "got RPC_CLNT_DISCONNECT");
-
-                if (!conf->skip_notify)
+                if (!conf->skip_notify) {
+                        gf_log (this->name, GF_LOG_NORMAL, "disconnected");
                         default_notify (this, GF_EVENT_CHILD_DOWN, NULL);
+                } else {
+                        gf_log (this->name, GF_LOG_TRACE, "disconnected (skipped notify)");
+                }
+
                 conf->skip_notify = 0;
 
                 break;