mirrors/relay
1
0
Fork 1
mirror of https://git.asonix.dog/asonix/relay.git synced 2024-11-25 02:51:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Avoid deadlock of iterating over tree while transacting on that tree

Browse source
This commit is contained in:
asonix 2024-05-01 15:43:08 -05:00
parent 13a2653fe8
commit 8a3256f52a
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/db.rs
View file

@ -605,6 +605,8 @@ impl Db {
pub(crate) async fn add_blocks(&self, domains: Vec<String>) -> Result<(), Error> { pub(crate) async fn add_blocks(&self, domains: Vec<String>) -> Result<(), Error> {
self.unblock(move |inner| { self.unblock(move |inner| {
let connected_by_domain = inner.connected_by_domain(&domains).collect::<Vec<_>>();
let res = ( let res = (
&inner.connected_actor_ids, &inner.connected_actor_ids,
&inner.blocked_domains, &inner.blocked_domains,
@ -615,7 +617,7 @@ impl Db {
let mut blocked_batch = Batch::default(); let mut blocked_batch = Batch::default();
let mut allowed_batch = Batch::default(); let mut allowed_batch = Batch::default();
for connected in inner.connected_by_domain(&domains) { for connected in &connected_by_domain {
connected_batch.remove(connected.as_str().as_bytes()); connected_batch.remove(connected.as_str().as_bytes());
} }
@ -687,9 +689,11 @@ impl Db {
pub(crate) async fn remove_allows(&self, domains: Vec<String>) -> Result<(), Error> { pub(crate) async fn remove_allows(&self, domains: Vec<String>) -> Result<(), Error> {
self.unblock(move |inner| { self.unblock(move |inner| {
if inner.restricted_mode { if inner.restricted_mode {
let connected_by_domain = inner.connected_by_domain(&domains).collect::<Vec<_>>();
let mut connected_batch = Batch::default(); let mut connected_batch = Batch::default();
for connected in inner.connected_by_domain(&domains) { for connected in &connected_by_domain {
connected_batch.remove(connected.as_str().as_bytes()); connected_batch.remove(connected.as_str().as_bytes());
} }