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

fix: improve consistency around brpop flow

Browse source 
1. Added a test that was breaking earlier.
2. Made sure that multiple waked brpop transaction would not
   snatch items from one another.
3. Fixed watched-queues clean-up logic inside blocking_controller that caused deadlocks.

Signed-off-by: Roman Gershman <roman@dragonflydb.io>
This commit is contained in:
Roman Gershman 2023-03-17 09:07:10 +02:00 • committed by Roman Gershman
parent c96f637f73
commit f4081f3979
7 changed files with 214 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/server/transaction.cc
View file

@ -505,7 +505,10 @@ bool Transaction::RunInShard(EngineShard* shard) {
// of the queue and notify the next one.
// RunStep is also called for global transactions because of commands like MOVE.
if (shard->blocking_controller()) {
shard->blocking_controller()->RunStep(awaked_prerun ? this : nullptr);
if (awaked_prerun || was_suspended) {
shard->blocking_controller()->FinalizeWatched(largs, this);
}
shard->blocking_controller()->NotifyPending();
}
}
@ -1114,9 +1117,11 @@ void Transaction::UnwatchShardCb(ArgSlice wkeys, bool should_expire, EngineShard
auto& sd = shard_data_[sd_idx];
sd.local_mask |= EXPIRED_Q;
sd.local_mask &= ~KEYLOCK_ACQUIRED;
}
shard->blocking_controller()->FinalizeWatched(wkeys, this);
DCHECK(!shard->blocking_controller()->awakened_transactions().contains(this));
shard->blocking_controller()->RemoveWatched(wkeys, this);
shard->blocking_controller()->NotifyPending();
}
// Need to see why I decided to call this.
// My guess - probably to trigger the run of stalled transactions in case
@ -1168,9 +1173,10 @@ void Transaction::UnlockMultiShardCb(const std::vector<KeyList>& sharded_keys, E
shard->ShutdownMulti(this);
// notify awakened transactions.
// notify awakened transactions, not sure we need it here because it's done after
// each operation
if (shard->blocking_controller())
shard->blocking_controller()->RunStep(nullptr);
shard->blocking_controller()->NotifyPending();
shard->PollExecution("unlockmulti", nullptr);
this->DecreaseRunCnt();