From a40ca1fe65a6aeed08c8105b031d678f49b8d22b Mon Sep 17 00:00:00 2001 From: aquaratixc Date: Mon, 1 Sep 2025 09:21:17 +0300 Subject: [PATCH 1/5] Update main.rs fix std and advisory_lock collision in try_lock method in core-dump-agent Signed-off-by: aquaratixc --- core-dump-agent/src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core-dump-agent/src/main.rs b/core-dump-agent/src/main.rs index 8394edb..79cec58 100644 --- a/core-dump-agent/src/main.rs +++ b/core-dump-agent/src/main.rs @@ -292,7 +292,7 @@ async fn process_file(zip_path: &Path, bucket: &Bucket) { let f = File::open(zip_path).expect("no file found"); - match f.try_lock(FileLockMode::Shared) { + match AdvisoryFileLock.try_lock(&f, FileLockMode::Shared) { Ok(_) => { /* If we can lock then we are ok */ } Err(e) => { let l_inotify = env::var("USE_INOTIFY") From 0f28f0082471553ee174ed80f8fb19b627596e48 Mon Sep 17 00:00:00 2001 From: aquaratixc Date: Mon, 1 Sep 2025 09:30:36 +0300 Subject: [PATCH 2/5] Update main.rs fix std and advisory_lock collision in lock method in core-dump-composer Signed-off-by: aquaratixc --- core-dump-composer/src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core-dump-composer/src/main.rs b/core-dump-composer/src/main.rs index d1bfb2d..377c8b7 100644 --- a/core-dump-composer/src/main.rs +++ b/core-dump-composer/src/main.rs @@ -131,7 +131,7 @@ fn handle(mut cc: config::CoreConfig) -> Result<(), anyhow::Error> { process::exit(1); } }; - file.lock(FileLockMode::Exclusive)?; + AdvisoryFileLock.lock(FileLockMode::Exclusive)?; let mut zip = ZipWriter::new(&file); debug!( From ba4a7a2d47ecdbbb059ddf8059ab7b56d938f356 Mon Sep 17 00:00:00 2001 From: aquaratixc Date: Mon, 1 Sep 2025 09:52:39 +0300 Subject: [PATCH 3/5] Update main.rs fix missing file argument Signed-off-by: aquaratixc --- core-dump-composer/src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core-dump-composer/src/main.rs b/core-dump-composer/src/main.rs index 377c8b7..83cdbc2 100644 --- a/core-dump-composer/src/main.rs +++ b/core-dump-composer/src/main.rs @@ -131,7 +131,7 @@ fn handle(mut cc: config::CoreConfig) -> Result<(), anyhow::Error> { process::exit(1); } }; - AdvisoryFileLock.lock(FileLockMode::Exclusive)?; + AdvisoryFileLock.lock(&file, FileLockMode::Exclusive)?; let mut zip = ZipWriter::new(&file); debug!( From 318dd4eda5c2e1f21eeb1098fce7bfdaa8a28f57 Mon Sep 17 00:00:00 2001 From: aquaratixc Date: Mon, 1 Sep 2025 09:53:38 +0300 Subject: [PATCH 4/5] Update events.rs fix lock method Signed-off-by: aquaratixc --- core-dump-composer/src/events.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core-dump-composer/src/events.rs b/core-dump-composer/src/events.rs index 82bae9c..e5d1872 100644 --- a/core-dump-composer/src/events.rs +++ b/core-dump-composer/src/events.rs @@ -87,7 +87,7 @@ impl CoreEvent { pub fn write_event(&self, eventlocation: &str) -> Result<(), anyhow::Error> { let full_path = format!("{}/{}-event.json", eventlocation, self.uuid); let file = File::create(full_path)?; - file.lock(FileLockMode::Exclusive)?; + AdvisoryFileLock.lock(&file, FileLockMode::Exclusive)?; serde_json::to_writer(&file, &self)?; file.unlock()?; Ok(()) From 14a0677780a76933c62ea1d6ec7a83099e0fbdb5 Mon Sep 17 00:00:00 2001 From: "ou.baharev" Date: Mon, 1 Sep 2025 14:45:22 +0300 Subject: [PATCH 5/5] fix typo in metod calling Signed-off-by: ou.baharev --- core-dump-agent/src/main.rs | 2 +- core-dump-composer/src/events.rs | 2 +- core-dump-composer/src/main.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core-dump-agent/src/main.rs b/core-dump-agent/src/main.rs index 79cec58..3bea535 100644 --- a/core-dump-agent/src/main.rs +++ b/core-dump-agent/src/main.rs @@ -292,7 +292,7 @@ async fn process_file(zip_path: &Path, bucket: &Bucket) { let f = File::open(zip_path).expect("no file found"); - match AdvisoryFileLock.try_lock(&f, FileLockMode::Shared) { + match AdvisoryFileLock::try_lock(&f, FileLockMode::Shared) { Ok(_) => { /* If we can lock then we are ok */ } Err(e) => { let l_inotify = env::var("USE_INOTIFY") diff --git a/core-dump-composer/src/events.rs b/core-dump-composer/src/events.rs index e5d1872..6d1a501 100644 --- a/core-dump-composer/src/events.rs +++ b/core-dump-composer/src/events.rs @@ -87,7 +87,7 @@ impl CoreEvent { pub fn write_event(&self, eventlocation: &str) -> Result<(), anyhow::Error> { let full_path = format!("{}/{}-event.json", eventlocation, self.uuid); let file = File::create(full_path)?; - AdvisoryFileLock.lock(&file, FileLockMode::Exclusive)?; + AdvisoryFileLock::lock(&file, FileLockMode::Exclusive)?; serde_json::to_writer(&file, &self)?; file.unlock()?; Ok(()) diff --git a/core-dump-composer/src/main.rs b/core-dump-composer/src/main.rs index 83cdbc2..8ea2fc6 100644 --- a/core-dump-composer/src/main.rs +++ b/core-dump-composer/src/main.rs @@ -131,7 +131,7 @@ fn handle(mut cc: config::CoreConfig) -> Result<(), anyhow::Error> { process::exit(1); } }; - AdvisoryFileLock.lock(&file, FileLockMode::Exclusive)?; + AdvisoryFileLock::lock(&file, FileLockMode::Exclusive)?; let mut zip = ZipWriter::new(&file); debug!(