Skip to content

Commit

Permalink
[BACKPORT 2.18][#17531] DocDB: Disable wait-on-conflict behavior for …
Browse files Browse the repository at this point in the history
…YCQL traffic

Summary:
Original commit: 16d028a / D25691
See title
Jira: DB-6682

Test Plan: Jenkins

Reviewers: pjain, bkolagani

Reviewed By: bkolagani

Subscribers: ybase, rthallam

Differential Revision: https://phorge.dev.yugabyte.com/D26227
  • Loading branch information
robertsami committed Jun 16, 2023
1 parent 1deaebb commit 8327449
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion src/yb/tablet/write_query.cc
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,16 @@ Status WriteQuery::DoExecute() {
auto* transaction_participant = tablet->transaction_participant();
docdb::WaitQueue* wait_queue = nullptr;

if (transaction_participant) {
if (transaction_participant && execute_mode_ != ExecuteMode::kCql) {
// TODO(wait-queues): https://github.com/yugabyte/yugabyte-db/issues/17557
// For now, we disable this behavior in YCQL, both because many tests depend on FAIL_ON_CONFLICT
// behavior and because we do not want to change the behavior of existing CQL clusters. We may
// revisit this in the future in case there are performance benefits to enabling
// WAIT_ON_CONFLICT in YCQL as well.
//
// Note that we do not check execute_mode_ == ExecuteMode::kPgsql, since this condition is not
// sufficient to include all YSQL traffic -- some YSQL traffic may have ExecuteMode::kSimple,
// such as writes performed as part of an explicit lock read.
wait_queue = transaction_participant->wait_queue();
}

Expand Down

0 comments on commit 8327449

Please sign in to comment.