Skip to content

CXXCBC-404: KV_LOCKED status should be exposed as cas_mismatch for unlock #479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
avsej merged 2 commits into from
Nov 16, 2023
Merged

CXXCBC-404: KV_LOCKED status should be exposed as cas_mismatch for unlock #479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71024db
KV_LOCKED status should be exposed as cas_mismatch for unlock
DemetrisChr Nov 16, 2023
8772fad
Update expected errc in pessimistic locking tests
DemetrisChr Nov 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions core/protocol/status.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@ map_status_code(protocol::client_opcode opcode, std::uint16_t status)
return errc::common::bucket_not_found;

case key_value_status_code::locked:
if (opcode == protocol::client_opcode::unlock) {
return errc::common::cas_mismatch;
}
return errc::key_value::document_locked;

case key_value_status_code::auth_stale:
Expand Down
4 changes: 2 additions & 2 deletions test/test_integration_crud.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ TEST_CASE("integration: pessimistic locking", "[integration]")
couchbase::core::operations::unlock_request req{ id };
req.cas = couchbase::cas{ cas.value() - 1 };
auto resp = test::utils::execute(integration.cluster, req);
REQUIRE(resp.ctx.ec() == couchbase::errc::key_value::document_locked);
REQUIRE(resp.ctx.ec() == couchbase::errc::common::cas_mismatch);
REQUIRE_FALSE(resp.ctx.retried_because_of(couchbase::retry_reason::key_value_locked));
}

Expand Down Expand Up @@ -841,7 +841,7 @@ TEST_CASE("integration: pessimistic locking with public API", "[integration]")
{
auto wrong_cas = couchbase::cas{ cas.value() - 1 };
auto ctx = collection.unlock(id, wrong_cas, {}).get();
REQUIRE(ctx.ec() == couchbase::errc::key_value::document_locked);
REQUIRE(ctx.ec() == couchbase::errc::common::cas_mismatch);
REQUIRE_FALSE(ctx.retried_because_of(couchbase::retry_reason::key_value_locked));
}

Expand Down