mirrors/dragonfly
1
0
Fork 0
mirror of https://github.com/dragonflydb/dragonfly.git synced 2025-05-11 02:15:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

fix: allow SELECT in multi/exec if it's a noop (#4146)

Browse source 
Fixes #4120

Signed-off-by: Roman Gershman <roman@dragonflydb.io>
This commit is contained in:
Roman Gershman 2024-11-18 22:27:34 +02:00 • committed by GitHub
parent e16ef838e4
commit d467a348ac
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/server/db_slice.cc
View file

@ -1000,6 +1000,7 @@ bool DbSlice::Acquire(IntentLock::Mode mode, const KeyLockArgs& lock_args) {
if (lock_args.fps.empty()) { // Can be empty for NO_KEY_TRANSACTIONAL commands. if (lock_args.fps.empty()) { // Can be empty for NO_KEY_TRANSACTIONAL commands.
return true; return true;
} }
DCHECK_LT(lock_args.db_index, db_array_size());
auto& lt = db_arr_[lock_args.db_index]->trans_locks; auto& lt = db_arr_[lock_args.db_index]->trans_locks;
bool lock_acquired = true; bool lock_acquired = true;

10
src/server/generic_family.cc
View file

@ -1607,6 +1607,16 @@ void GenericFamily::Select(CmdArgList args, Transaction*, SinkReplyBuilder* buil
if (index < 0 || index >= absl::GetFlag(FLAGS_dbnum)) { if (index < 0 || index >= absl::GetFlag(FLAGS_dbnum)) {
return builder->SendError(kDbIndOutOfRangeErr); return builder->SendError(kDbIndOutOfRangeErr);
} }
if (cntx->conn_state.db_index == index) {
// accept a noop.
return builder->SendOk();
}
if (cntx->conn_state.exec_info.IsRunning()) {
return builder->SendError("SELECT is not allowed in a transaction");
}
cntx->conn_state.db_index = index; cntx->conn_state.db_index = index;
auto cb = [ns = cntx->ns, index](EngineShard* shard) { auto cb = [ns = cntx->ns, index](EngineShard* shard) {
auto& db_slice = ns->GetDbSlice(shard->shard_id()); auto& db_slice = ns->GetDbSlice(shard->shard_id());

4
src/server/journal/executor.cc
View file

@ -76,8 +76,6 @@ void JournalExecutor::Execute(journal::ParsedEntry::CmdData& cmd) {
} }
void JournalExecutor::SelectDb(DbIndex dbid) { void JournalExecutor::SelectDb(DbIndex dbid) {
conn_context_.conn_state.db_index = dbid;
if (ensured_dbs_.size() <= dbid) if (ensured_dbs_.size() <= dbid)
ensured_dbs_.resize(dbid + 1); ensured_dbs_.resize(dbid + 1);
@ -85,6 +83,8 @@ void JournalExecutor::SelectDb(DbIndex dbid) {
auto cmd = BuildFromParts("SELECT", dbid); auto cmd = BuildFromParts("SELECT", dbid);
Execute(cmd); Execute(cmd);
ensured_dbs_[dbid] = true; ensured_dbs_[dbid] = true;
} else {
conn_context_.conn_state.db_index = dbid;
} }
} }

2
src/server/main_service.cc
View file

@ -1084,7 +1084,7 @@ std::optional<ErrorReply> Service::VerifyCommandState(const CommandId* cid, CmdA
return ErrorReply{"-READONLY You can't write against a read only replica."}; return ErrorReply{"-READONLY You can't write against a read only replica."};
if (multi_active) { if (multi_active) {
if (cmd_name == "SELECT" || absl::EndsWith(cmd_name, "SUBSCRIBE")) if (absl::EndsWith(cmd_name, "SUBSCRIBE"))
return ErrorReply{absl::StrCat("Can not call ", cmd_name, " within a transaction")}; return ErrorReply{absl::StrCat("Can not call ", cmd_name, " within a transaction")};
if (cmd_name == "WATCH" || cmd_name == "FLUSHALL" || cmd_name == "FLUSHDB") if (cmd_name == "WATCH" || cmd_name == "FLUSHALL" || cmd_name == "FLUSHDB")

6
tests/dragonfly/replication_test.py
View file

@ -1067,7 +1067,7 @@ async def assert_replica_reconnections(replica_inst, initial_reconnects_count):
@pytest.mark.asyncio @pytest.mark.asyncio
async def test_replication_info(df_factory: DflyInstanceFactory, df_seeder_factory, n_keys=2000): async def test_replication_info(df_factory: DflyInstanceFactory, df_seeder_factory, n_keys=2000):
master = df_factory.create() master = df_factory.create()
replica = df_factory.create(logtostdout=True, replication_acks_interval=100) replica = df_factory.create(replication_acks_interval=100)
df_factory.start_all([master, replica]) df_factory.start_all([master, replica])
c_master = master.client() c_master = master.client()
c_replica = replica.client() c_replica = replica.client()
@ -1157,8 +1157,8 @@ redis.call('SET', 'A', 'ErrroR')
@pytest.mark.asyncio @pytest.mark.asyncio
async def test_readonly_script(df_factory): async def test_readonly_script(df_factory):
master = df_factory.create(proactor_threads=2, logtostdout=True) master = df_factory.create(proactor_threads=2)
replica = df_factory.create(proactor_threads=2, logtostdout=True) replica = df_factory.create(proactor_threads=2)
df_factory.start_all([master, replica]) df_factory.start_all([master, replica])