diff options
| author | Sanju Rakonde <srakonde@redhat.com> | 2019-07-12 16:28:04 +0530 |
|---|---|---|
| committer | Atin Mukherjee <amukherj@redhat.com> | 2019-07-14 10:08:50 +0000 |
| commit | b917974ee922d7a2e079692ad7d6f61f900b37b2 (patch) | |
| tree | cbf02cfc74094c486a6988b290233736cb86ad25 | |
| parent | 6d94a332ebafbda598d50efcd64429af563dae30 (diff) | |
glusterd: do not mark skip_locking as true for geo-rep operations
We need to send the commit req to peers in case of geo-rep
operations even though it is a no volname operation. In commit
phase peers try to set the txn_opinfo which will fail because
it is a no volname operation where we don't require a commit
phase. We mark skip_locking as true for no volname operations,
but we have to give an exception to geo-rep operations, so that
they can set txn_opinfo in commit phase.
Please refer to detailed RCA at the bug: 1729463
fixes: bz#1729463
Change-Id: I9f2478b12a281f6e052035c0563c40543493a3fc
Signed-off-by: Sanju Rakonde <srakonde@redhat.com>
| -rw-r--r-- | tests/00-geo-rep/01-georep-glusterd-tests.t | 3 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-handler.c | 9 |
2 files changed, 10 insertions, 2 deletions
diff --git a/tests/00-geo-rep/01-georep-glusterd-tests.t b/tests/00-geo-rep/01-georep-glusterd-tests.t index 2960a55c587..47d5116af26 100644 --- a/tests/00-geo-rep/01-georep-glusterd-tests.t +++ b/tests/00-geo-rep/01-georep-glusterd-tests.t @@ -107,6 +107,9 @@ EXPECT_WITHIN $GEO_REP_TIMEOUT 0 check_keys_distributed #Start_georep TEST $GEOREP_CLI $master $slave start +#check geo-rep status without specifying master and slave volumes +TEST $GEOREP_CLI status + #Start_georep force TEST $GEOREP_CLI $master $slave1 start force diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c index cf8b7bf1d65..462991776a1 100644 --- a/xlators/mgmt/glusterd/src/glusterd-handler.c +++ b/xlators/mgmt/glusterd/src/glusterd-handler.c @@ -901,7 +901,11 @@ __glusterd_handle_stage_op(rpcsvc_request_t *req) /* In cases where there is no volname, the receivers won't have a * transaction opinfo created, as for those operations, the locking - * phase where the transaction opinfos are created, won't be called. */ + * phase where the transaction opinfos are created, won't be called. + * skip_locking will be true for all such transaction and we clear + * the txn_opinfo after the staging phase, except for geo-replication + * operations where we need to access txn_opinfo in the later phases also. + */ ret = glusterd_get_txn_opinfo(txn_id, &txn_op_info); if (ret) { gf_msg_debug(this->name, 0, "No transaction's opinfo set"); @@ -910,7 +914,8 @@ __glusterd_handle_stage_op(rpcsvc_request_t *req) glusterd_txn_opinfo_init(&txn_op_info, &state, &op_req.op, req_ctx->dict, req); - txn_op_info.skip_locking = _gf_true; + if (req_ctx->op != GD_OP_GSYNC_SET) + txn_op_info.skip_locking = _gf_true; ret = glusterd_set_txn_opinfo(txn_id, &txn_op_info); if (ret) { gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_TRANS_OPINFO_SET_FAIL, |