andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Probe on localhost not needed

Browse Source 
Signed-off-by: shishir gowda <shishirng@gluster.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>

BUG: 1216 ()
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1216
This commit is contained in:
shishir gowda 2010-08-19 07:21:42 +00:00 committed by Anand V. Avati
parent 84bc269be4
commit 074f03afb2
3 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cli/src/cli3_1-cops.c
View File

@ -68,9 +68,25 @@ gf_cli3_1_probe_cbk (struct rpc_req *req, struct iovec *iov,
}
gf_log ("cli", GF_LOG_NORMAL, "Received resp to probe");
cli_out ("Probe %s", (rsp.op_ret) ? "unsuccessful": "successful");
if (!rsp.op_ret) {
switch (rsp.op_errno) {
case GF_PROBE_SUCCESS:
cli_out ("Probe successful");
break;
case GF_PROBE_LOCALHOST:
cli_out ("Probe on localhost not needed");
break;
default:
cli_out ("Probe returned with unknown errno %d",
rsp.op_errno);
break;
}
}
if (rsp.op_ret) {
cli_out ("Probe unsuccessfull");
gf_log ("glusterd",GF_LOG_ERROR,"Probe failed with op_ret %d"
" and op_errno %d", rsp.op_ret, rsp.op_errno);
}
ret = rsp.op_ret;
out:

5
rpc/rpc-lib/src/protocol-common.h
View File

@ -134,6 +134,11 @@ enum gf_pmap_procnum {
GF_PMAP_MAXVALUE,
};
enum gf_probe_resp {
GF_PROBE_SUCCESS,
GF_PROBE_LOCALHOST,
GF_PROBE_FRIEND,
};
#define GLUSTER3_1_FOP_PROGRAM 1298437 /* Completely random */
#define GLUSTER3_1_FOP_VERSION 310 /* 3.1.0 */

6
xlators/mgmt/glusterd/src/glusterd-handler.c
View File

@ -519,7 +519,11 @@ glusterd_handle_cli_probe (rpcsvc_request_t *req)
gf_log ("glusterd", GF_LOG_NORMAL, "Received CLI probe req %s %d",
cli_req.hostname, cli_req.port);
if (!(ret = glusterd_is_local_addr(cli_req.hostname))) {
glusterd_xfer_cli_probe_resp (req, 0, GF_PROBE_LOCALHOST,
cli_req.hostname, cli_req.port);
goto out;
}
ret = glusterd_probe_begin (req, cli_req.hostname, cli_req.port);
out: