summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiels de Vos <ndevos@redhat.com>2016-09-16 17:29:21 +0200
committerRaghavendra G <rgowdapp@redhat.com>2016-10-16 22:50:47 -0700
commitab3eef6fe34e71dcc453cb5757f061e3ea875c64 (patch)
tree514cbfb258b5cce6b3bd14500b16a85c511a4340
parent7f8916364ff2092e0391b294051dc76764ff02fc (diff)
rpc: increase RPC/XID with each callback
The RPC/XID for callbacks has been hardcoded to GF_UNIVERSAL_ANSWER. In Wireshark these RPC-calls are marked as "RPC retransmissions" because of the repeating RPC/XID. This is most confusing when verifying the callbacks that the upcall framework sends. There is no way to see the difference between real retransmissions and new callbacks. This change was verified by create and removal of files through different Gluster clients. The RPC/XID is increased on a per connection (or client) base. The expectations of the RPC protocol are met this way. > Change-Id: I2116bec0e294df4046d168d8bcbba011284cd0b2 > BUG: 1377097 > Signed-off-by: Niels de Vos <ndevos@redhat.com> > Reviewed-on: http://review.gluster.org/15524 > Smoke: Gluster Build System <jenkins@build.gluster.org> > NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> > CentOS-regression: Gluster Build System <jenkins@build.gluster.org> > Reviewed-by: Raghavendra G <rgowdapp@redhat.com> > (cherry picked from commit e9b39527d5dcfba95c4c52a522c8ce1f4512ac21) Change-Id: I2116bec0e294df4046d168d8bcbba011284cd0b2 BUG: 1377291 Signed-off-by: Niels de Vos <ndevos@redhat.com> Reviewed-on: http://review.gluster.org/15529 Smoke: Gluster Build System <jenkins@build.gluster.org> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.org> Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
-rw-r--r--rpc/rpc-lib/src/rpc-transport.h1
-rw-r--r--rpc/rpc-lib/src/rpcsvc.c21
2 files changed, 19 insertions, 3 deletions
diff --git a/rpc/rpc-lib/src/rpc-transport.h b/rpc/rpc-lib/src/rpc-transport.h
index 97eeff2..8888b5e 100644
--- a/rpc/rpc-lib/src/rpc-transport.h
+++ b/rpc/rpc-lib/src/rpc-transport.h
@@ -210,6 +210,7 @@ struct rpc_transport {
uint64_t total_bytes_read;
uint64_t total_bytes_write;
+ uint32_t xid; /* RPC/XID used for callbacks */
struct list_head list;
int bind_insecure;
diff --git a/rpc/rpc-lib/src/rpcsvc.c b/rpc/rpc-lib/src/rpcsvc.c
index 7d5cc93..8d15eb9 100644
--- a/rpc/rpc-lib/src/rpcsvc.c
+++ b/rpc/rpc-lib/src/rpcsvc.c
@@ -874,6 +874,20 @@ err:
return txrecord;
}
+static uint32_t
+rpc_callback_new_callid (struct rpc_transport *trans)
+{
+ uint32_t callid = 0;
+
+ pthread_mutex_lock (&trans->lock);
+ {
+ callid = ++trans->xid;
+ }
+ pthread_mutex_unlock (&trans->lock);
+
+ return callid;
+}
+
int
rpcsvc_fill_callback (int prognum, int progver, int procnum, int payload,
uint32_t xid, struct rpc_msg *request)
@@ -1052,6 +1066,7 @@ rpcsvc_callback_submit (rpcsvc_t *rpc, rpc_transport_t *trans,
rpc_transport_req_t req;
int ret = -1;
int proglen = 0;
+ uint32_t xid = 0;
if (!rpc) {
goto out;
@@ -1063,11 +1078,11 @@ rpcsvc_callback_submit (rpcsvc_t *rpc, rpc_transport_t *trans,
proglen += iov_length (proghdr, proghdrcount);
}
+ xid = rpc_callback_new_callid (trans);
+
request_iob = rpcsvc_callback_build_record (rpc, prog->prognum,
prog->progver, procnum,
- proglen,
- GF_UNIVERSAL_ANSWER,
- &rpchdr);
+ proglen, xid, &rpchdr);
if (!request_iob) {
gf_log ("rpcsvc", GF_LOG_WARNING,
"cannot build rpc-record");