Retry deleting dst a number of times

Author: ChrisDenton

src/bootstrap/src/lib.rs

@@ -34,7 +34,7 @@ use filetime::FileTime;
 use sha2::digest::Digest;
 use termcolor::{ColorChoice, StandardStream, WriteColor};
 use utils::channel::GitInfo;
-use utils::helpers::hex_encode;
+use utils::helpers::{hex_encode, retry};
 
 use crate::core::builder;
 use crate::core::builder::Kind;
@@ -1676,7 +1676,7 @@ impl Build {
         if src == dst {
             return;
         }
-        let _ = fs::remove_file(dst);
+        let _ = retry(60, || fs::remove_file(dst));
         let metadata = t!(src.symlink_metadata(), format!("src = {}", src.display()));
         let mut src = src.to_path_buf();
         if metadata.file_type().is_symlink() {

src/bootstrap/src/utils/helpers.rs

@@ -517,3 +517,19 @@ pub fn git(source_dir: Option<&Path>) -> Command {
 
     git
 }
+
+/// Retry a function up to n times, returning the last call to fun.
+/// Stops early if the function returns `Ok`.
+pub fn retry<T, E>(n: usize, mut fun: impl FnMut() -> Result<T, E>) -> Result<T, E> {
+    let mut retries = 0;
+    loop {
+        retries += 1;
+
+        let result = fun();
+        if result.is_ok() || retries == n {
+            return result;
+        }
+        // wait an arbitrary length of time.
+        std::thread::sleep(std::time::Duration::from_secs(1));
+    }
+}