chk
/
AppFlowy-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: enable lock timeout feature (#771)

This commit is contained in:
Nathan.fooo 2024-08-30 14:24:34 +08:00 committed by GitHub
parent 3e701a1f8b
commit 1f9a03a83d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Cargo.lock generated
View File

@ -2086,7 +2086,7 @@ dependencies = [
[[package]] [[package]]
name = "collab" name = "collab"
version = "0.2.0" version = "0.2.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=5a1e94d60eea2c8612b2895dbbbdd6e5d5f03d97#5a1e94d60eea2c8612b2895dbbbdd6e5d5f03d97" source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac#47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"arc-swap", "arc-swap",
@ -2111,7 +2111,7 @@ dependencies = [
[[package]] [[package]]
name = "collab-database" name = "collab-database"
version = "0.2.0" version = "0.2.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=5a1e94d60eea2c8612b2895dbbbdd6e5d5f03d97#5a1e94d60eea2c8612b2895dbbbdd6e5d5f03d97" source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac#47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
@ -2140,7 +2140,7 @@ dependencies = [
[[package]] [[package]]
name = "collab-document" name = "collab-document"
version = "0.2.0" version = "0.2.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=5a1e94d60eea2c8612b2895dbbbdd6e5d5f03d97#5a1e94d60eea2c8612b2895dbbbdd6e5d5f03d97" source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac#47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"arc-swap", "arc-swap",
@ -2160,7 +2160,7 @@ dependencies = [
[[package]] [[package]]
name = "collab-entity" name = "collab-entity"
version = "0.2.0" version = "0.2.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=5a1e94d60eea2c8612b2895dbbbdd6e5d5f03d97#5a1e94d60eea2c8612b2895dbbbdd6e5d5f03d97" source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac#47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bytes", "bytes",
@ -2179,7 +2179,7 @@ dependencies = [
[[package]] [[package]]
name = "collab-folder" name = "collab-folder"
version = "0.2.0" version = "0.2.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=5a1e94d60eea2c8612b2895dbbbdd6e5d5f03d97#5a1e94d60eea2c8612b2895dbbbdd6e5d5f03d97" source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac#47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"arc-swap", "arc-swap",
@ -2264,7 +2264,7 @@ dependencies = [
[[package]] [[package]]
name = "collab-user" name = "collab-user"
version = "0.2.0" version = "0.2.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=5a1e94d60eea2c8612b2895dbbbdd6e5d5f03d97#5a1e94d60eea2c8612b2895dbbbdd6e5d5f03d97" source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac#47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"collab", "collab",

14
Cargo.toml
View File

@ -111,7 +111,7 @@ percent-encoding = "2.3.1"
appflowy-ai-client = { workspace = true, features = ["dto", "client-api"] } appflowy-ai-client = { workspace = true, features = ["dto", "client-api"] }
pgvector = { workspace = true, features = ["sqlx"] } pgvector = { workspace = true, features = ["sqlx"] }
collab = { workspace = true } collab = { workspace = true, features = ["lock_timeout"] }
collab-document = { workspace = true } collab-document = { workspace = true }
collab-entity = { workspace = true } collab-entity = { workspace = true }
collab-folder = { workspace = true } collab-folder = { workspace = true }
@ -285,12 +285,12 @@ debug = true
[patch.crates-io] [patch.crates-io]
# It's diffcult to resovle different version with the same crate used in AppFlowy Frontend and the Client-API crate. # It's diffcult to resovle different version with the same crate used in AppFlowy Frontend and the Client-API crate.
# So using patch to workaround this issue. # So using patch to workaround this issue.
collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5a1e94d60eea2c8612b2895dbbbdd6e5d5f03d97" } collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac" }
collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5a1e94d60eea2c8612b2895dbbbdd6e5d5f03d97" } collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac" }
collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5a1e94d60eea2c8612b2895dbbbdd6e5d5f03d97" } collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac" }
collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5a1e94d60eea2c8612b2895dbbbdd6e5d5f03d97" } collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac" }
collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5a1e94d60eea2c8612b2895dbbbdd6e5d5f03d97" } collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac" }
collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5a1e94d60eea2c8612b2895dbbbdd6e5d5f03d97" } collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac" }
[features] [features]
history = [] history = []

5
services/appflowy-collaborate/src/group/state.rs
View File

@ -6,7 +6,7 @@ use dashmap::mapref::one::RefMut;
use dashmap::try_result::TryResult; use dashmap::try_result::TryResult;
use dashmap::DashMap; use dashmap::DashMap;
use tokio::time::sleep; use tokio::time::sleep;
use tracing::{error, event, warn}; use tracing::{error, event, info, warn};
use collab_rt_entity::user::RealtimeUser; use collab_rt_entity::user::RealtimeUser;
@ -39,12 +39,13 @@ impl GroupManagementState {
let (object_id, group) = (entry.key(), entry.value()); let (object_id, group) = (entry.key(), entry.value());
if group.is_inactive().await { if group.is_inactive().await {
inactive_group_ids.push(object_id.clone()); inactive_group_ids.push(object_id.clone());
if inactive_group_ids.len() > 5 { if inactive_group_ids.len() > 10 {
break; break;
} }
} }
} }
info!("Remove inactive group ids: {:?}", inactive_group_ids);
for object_id in &inactive_group_ids { for object_id in &inactive_group_ids {
self.remove_group(object_id).await; self.remove_group(object_id).await;
} }