diff options
| author | Amar Tumballi <amar@gluster.com> | 2011-04-12 10:30:24 +0000 |
|---|---|---|
| committer | Anand Avati <avati@gluster.com> | 2011-04-13 00:38:47 -0700 |
| commit | ba365f725a91bcd3dcfae1d8311f9f148ce69055 (patch) | |
| tree | 9179bd2f6bbb0f0d0ce3ba54a7cfe7edaa70c46f /xlators/protocol/client/src | |
| parent | d7cba3b0bb4867e02a5999f830e5315cd7022520 (diff) | |
remove excessive logs due to log enhancement
Signed-off-by: Amar Tumballi <amar@gluster.com>
Signed-off-by: Anand Avati <avati@gluster.com>
BUG: 2346 (Log message enhancements in GlusterFS - phase 1)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2346
Diffstat (limited to 'xlators/protocol/client/src')
| -rw-r--r-- | xlators/protocol/client/src/client-handshake.c | 12 | ||||
| -rw-r--r-- | xlators/protocol/client/src/client.c | 9 | ||||
| -rw-r--r-- | xlators/protocol/client/src/client.h | 2 |
3 files changed, 16 insertions, 7 deletions
diff --git a/xlators/protocol/client/src/client-handshake.c b/xlators/protocol/client/src/client-handshake.c index 1ba128b94..5af149d56 100644 --- a/xlators/protocol/client/src/client-handshake.c +++ b/xlators/protocol/client/src/client-handshake.c @@ -536,7 +536,7 @@ client3_1_reopendir_cbk (struct rpc_req *req, struct iovec *iov, int count, local->loc.path, rsp.fd); } - if (-1 == rsp.op_ret) { + if (-1 == rsp.op_ret) { ret = -1; goto out; } @@ -1156,11 +1156,15 @@ client_query_portmap_cbk (struct rpc_req *req, struct iovec *iov, int count, voi if (-1 == rsp.op_ret) { ret = -1; - gf_log (this->name, GF_LOG_ERROR, + gf_log (this->name, ((!conf->portmap_err_logged) ? + GF_LOG_ERROR : GF_LOG_DEBUG), "failed to get the port number for remote subvolume"); + conf->portmap_err_logged = 1; goto out; } + conf->portmap_err_logged = 0; + config.remote_port = rsp.port; rpc_clnt_reconfig (conf->rpc, &config); conf->skip_notify = 1; @@ -1170,9 +1174,9 @@ out: STACK_DESTROY (frame->root); if (conf) { - + /* Need this to connect the same transport on different port */ + /* ie, glusterd to glusterfsd */ rpc_transport_disconnect (conf->rpc->conn.trans); - rpc_clnt_reconnect (conf->rpc->conn.trans); } diff --git a/xlators/protocol/client/src/client.c b/xlators/protocol/client/src/client.c index e58f95db0..ff766844d 100644 --- a/xlators/protocol/client/src/client.c +++ b/xlators/protocol/client/src/client.c @@ -69,11 +69,14 @@ client_submit_request (xlator_t *this, void *req, call_frame_t *frame, if (!(conf->connected || ((prog->prognum == GLUSTER_DUMP_PROGRAM) || (prog->prognum == GLUSTER_PMAP_PROGRAM) || - ((prog->prognum == GLUSTER_HNDSK_PROGRAM) && (procnum == GF_HNDSK_SETVOLUME))))) { - gf_log (this->name, GF_LOG_WARNING, + ((prog->prognum == GLUSTER_HNDSK_PROGRAM) && + (procnum == GF_HNDSK_SETVOLUME))))) { + /* This particular error captured/logged in + functions calling this */ + gf_log (this->name, GF_LOG_DEBUG, "connection in disconnected state"); goto out; - } + } iobuf = iobuf_get (this->ctx->iobuf_pool); if (!iobuf) { diff --git a/xlators/protocol/client/src/client.h b/xlators/protocol/client/src/client.h index 21451b37e..40a3d5d3d 100644 --- a/xlators/protocol/client/src/client.h +++ b/xlators/protocol/client/src/client.h @@ -64,6 +64,8 @@ typedef struct clnt_conf { int last_sent_event; /* Flag used to make sure we are not repeating the same event which was sent earlier */ + char portmap_err_logged; /* flag used to prevent + excessive logging */ } clnt_conf_t; typedef struct _client_fd_ctx { |