fix rename temp file to cache file

.github/workflows/release.yml

@@ -21,7 +21,7 @@ jobs:
     steps:
       - uses: actions/checkout@master
       - name: Compile and release
-        uses: rust-build/rust-build.action@v1.4.0
+        uses: rust-build/rust-build.action@v1.75.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lfspull"
-version = "0.3.0"
+version = "0.3.1"
 edition = "2021"
 license = "MIT"
 authors = ["Volume Graphics GmbH"]

README.md

@@ -32,6 +32,10 @@ Please see our docs.rs for example code and the gherkin tests for how to check t
 
 ## Changelog
 
+### 0.3.1
+
+- fix bug when trying to rename temp file to cache file, but cache file is already created and locked by other parallel job
+
 ### 0.3.0
 
 - use stream_bytes to download object directly into a temporary files and avoid 'memory allocation of x bytes failed'

src/repo_tools/mod.rs

@@ -120,14 +120,18 @@ async fn get_file_cached<P: AsRef<Path>>(
 
         let temp_file =
             primitives::download_file(metadata, &repo_url, access_token, randomizer_bytes).await?;
-        fs::rename(&temp_file.path(), cache_file.as_path())
-            .map_err(|e| {
-                LFSError::FatFileIOError(FatIOError::from_std_io_err(
-                    e,
-                    temp_file.path().to_path_buf(),
-                ))
-            })
-            .await?;
+        if cache_file.is_file() {
+            debug!("cache file {:?} is already written from other process", &cache_file);
+        } else {
+            fs::rename(&temp_file.path(), cache_file.as_path())
+                .map_err(|e| {
+                    LFSError::FatFileIOError(FatIOError::from_std_io_err(
+                        e,
+                        temp_file.path().to_path_buf(),
+                    ))
+                })
+                .await?;
+        }
 
         Ok((cache_file, FilePullMode::DownloadedFromRemote))
     }