|
 |
50dc83 |
From 5a35a996257d6aaa7fa55ff1e1aac407dd4824fe Mon Sep 17 00:00:00 2001
|
|
|
50dc83 |
From: Sanju Rakonde <srakonde@redhat.com>
|
|
|
50dc83 |
Date: Fri, 12 Jul 2019 16:28:04 +0530
|
|
|
50dc83 |
Subject: [PATCH 252/255] glusterd: do not mark skip_locking as true for
|
|
|
50dc83 |
geo-rep operations
|
|
|
50dc83 |
|
|
|
50dc83 |
We need to send the commit req to peers in case of geo-rep
|
|
|
50dc83 |
operations even though it is a no volname operation. In commit
|
|
|
50dc83 |
phase peers try to set the txn_opinfo which will fail because
|
|
|
50dc83 |
it is a no volname operation where we don't require a commit
|
|
|
50dc83 |
phase. We mark skip_locking as true for no volname operations,
|
|
|
50dc83 |
but we have to give an exception to geo-rep operations, so that
|
|
|
50dc83 |
they can set txn_opinfo in commit phase.
|
|
|
50dc83 |
|
|
|
50dc83 |
Please refer to detailed RCA at the bug: 1729463
|
|
|
50dc83 |
|
|
|
50dc83 |
> upstream patch : https://review.gluster.org/#/c/glusterfs/+/23034/
|
|
|
50dc83 |
|
|
|
50dc83 |
>fixes: bz#1729463
|
|
|
50dc83 |
>Change-Id: I9f2478b12a281f6e052035c0563c40543493a3fc
|
|
|
50dc83 |
>Signed-off-by: Sanju Rakonde <srakonde@redhat.com>
|
|
|
50dc83 |
|
|
|
50dc83 |
Change-Id: I9f2478b12a281f6e052035c0563c40543493a3fc
|
|
|
50dc83 |
BUG: 1727785
|
|
|
50dc83 |
Signed-off-by: Sanju Rakonde <srakonde@redhat.com>
|
|
|
50dc83 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/176032
|
|
|
50dc83 |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
50dc83 |
Reviewed-by: Shwetha Acharya <sacharya@redhat.com>
|
|
|
50dc83 |
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
|
|
|
50dc83 |
---
|
|
|
50dc83 |
xlators/mgmt/glusterd/src/glusterd-handler.c | 9 +++++++--
|
|
|
50dc83 |
1 file changed, 7 insertions(+), 2 deletions(-)
|
|
|
50dc83 |
|
|
|
50dc83 |
diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c
|
|
|
50dc83 |
index cb2666b..2e73c98 100644
|
|
|
50dc83 |
--- a/xlators/mgmt/glusterd/src/glusterd-handler.c
|
|
|
50dc83 |
+++ b/xlators/mgmt/glusterd/src/glusterd-handler.c
|
|
|
50dc83 |
@@ -1078,7 +1078,11 @@ __glusterd_handle_stage_op(rpcsvc_request_t *req)
|
|
|
50dc83 |
|
|
|
50dc83 |
/* In cases where there is no volname, the receivers won't have a
|
|
|
50dc83 |
* transaction opinfo created, as for those operations, the locking
|
|
|
50dc83 |
- * phase where the transaction opinfos are created, won't be called. */
|
|
|
50dc83 |
+ * phase where the transaction opinfos are created, won't be called.
|
|
|
50dc83 |
+ * skip_locking will be true for all such transaction and we clear
|
|
|
50dc83 |
+ * the txn_opinfo after the staging phase, except for geo-replication
|
|
|
50dc83 |
+ * operations where we need to access txn_opinfo in the later phases also.
|
|
|
50dc83 |
+ */
|
|
|
50dc83 |
ret = glusterd_get_txn_opinfo(txn_id, &txn_op_info);
|
|
|
50dc83 |
if (ret) {
|
|
|
50dc83 |
gf_msg_debug(this->name, 0, "No transaction's opinfo set");
|
|
|
50dc83 |
@@ -1087,7 +1091,8 @@ __glusterd_handle_stage_op(rpcsvc_request_t *req)
|
|
|
50dc83 |
glusterd_txn_opinfo_init(&txn_op_info, &state, &op_req.op,
|
|
|
50dc83 |
req_ctx->dict, req);
|
|
|
50dc83 |
|
|
|
50dc83 |
- txn_op_info.skip_locking = _gf_true;
|
|
|
50dc83 |
+ if (req_ctx->op != GD_OP_GSYNC_SET)
|
|
|
50dc83 |
+ txn_op_info.skip_locking = _gf_true;
|
|
|
50dc83 |
ret = glusterd_set_txn_opinfo(txn_id, &txn_op_info);
|
|
|
50dc83 |
if (ret) {
|
|
|
50dc83 |
gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_TRANS_OPINFO_SET_FAIL,
|
|
|
50dc83 |
--
|
|
|
50dc83 |
1.8.3.1
|
|
|
50dc83 |
|