diff options
| author | Pranith K <pranithk@gluster.com> | 2010-10-11 03:26:00 +0000 |
|---|---|---|
| committer | Vijay Bellur <vijay@dev.gluster.com> | 2010-10-11 03:32:46 -0700 |
| commit | 3dc782527482d2c62c9344669ccaa2dc42481a58 (patch) | |
| tree | 2525af86d539725bf93564eb786eeeb0c10d9c38 /rpc | |
| parent | eb99bee0246d5a43bbee7383b3809a360aa70018 (diff) | |
mgmt/glusterd: handle reqs from unknown peers for friend sm
Signed-off-by: Pranith Kumar K <pranithk@gluster.com>
Signed-off-by: Vijay Bellur <vijay@dev.gluster.com>
BUG: 1838 (handle peer detach gracefully in case of lost frames)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1838
Diffstat (limited to 'rpc')
| -rw-r--r-- | rpc/rpc-lib/src/protocol-common.h | 4 | ||||
| -rw-r--r-- | rpc/rpc-lib/src/rpc-clnt.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/rpc/rpc-lib/src/protocol-common.h b/rpc/rpc-lib/src/protocol-common.h index 40283bf427b..bfd043e31d2 100644 --- a/rpc/rpc-lib/src/protocol-common.h +++ b/rpc/rpc-lib/src/protocol-common.h @@ -161,7 +161,9 @@ enum gf_probe_resp { GF_PROBE_LOCALHOST, GF_PROBE_FRIEND, GF_PROBE_ANOTHER_CLUSTER, - GF_PROBE_VOLUME_CONFLICT + GF_PROBE_VOLUME_CONFLICT, + GF_PROBE_UNKNOWN_PEER, + GF_PROBE_ADD_FAILED }; enum gf_deprobe_resp { diff --git a/rpc/rpc-lib/src/rpc-clnt.c b/rpc/rpc-lib/src/rpc-clnt.c index 8cf7f7444b0..a53ac4da95b 100644 --- a/rpc/rpc-lib/src/rpc-clnt.c +++ b/rpc/rpc-lib/src/rpc-clnt.c @@ -328,7 +328,7 @@ saved_frames_unwind (struct saved_frames *saved_frames) if (!trav->rpcreq || !trav->rpcreq->prog) continue; - gf_log ("rpc-clnt", GF_LOG_ERROR, + gf_log_callingfn ("rpc-clnt", GF_LOG_ERROR, "forced unwinding frame type(%s) op(%s(%d)) " "called at %s", trav->rpcreq->prog->progname, |