Fix use of try_lock and lock methods to explicitly use AdvisoryFileLock trait implementation for std::fs::File in core_dump_handler

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")

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(())

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(&file, FileLockMode::Exclusive)?;
     let mut zip = ZipWriter::new(&file);
 
     debug!(