Merge pull request ClickHouse#79965 from ClickHouse/fix-chcache-rust-sequential-runs

chcache: fix rebuilding Rust projects on sequential CMake runs

Author: thevar1able

rust/chcache/src/compilers/clang.rs

@@ -169,6 +169,9 @@ impl ClangLike {
         preprocess_args.remove(output_flag_index);
         preprocess_args.remove(output_flag_index);
 
+        let input_flag_index = preprocess_args.iter().position(|x| x == "-c").unwrap();
+        preprocess_args.remove(input_flag_index);
+
         let output = std::process::Command::new(self.compiler_path.clone())
             .args(preprocess_args)
             .output()

rust/chcache/src/compilers/rustc.rs

@@ -1,11 +1,14 @@
 use blake3::Hasher;
 use log::trace;
 use std::error::Error;
-use std::fs;
+use std::fs::{self};
 use std::io::Cursor;
 use std::path::Path;
 
-use crate::{compilers::clang::ClangLike, traits::compiler::{Compiler, CompilerMeta}};
+use crate::{
+    compilers::clang::ClangLike,
+    traits::compiler::{Compiler, CompilerMeta},
+};
 
 pub struct RustC {
     compiler_path: String,
@@ -32,10 +35,6 @@ impl CompilerMeta for RustC {
     }
 }
 
-// [thevar1able@homebox memchr-2.7.4]$ /home/thevar1able/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/bin/rustc --crate-name memchr --edition=2021 /home/thevar1able/.cargo/registry/src/-6df83624996e3d27/memchr-2.7.4/src/lib.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --diagnostic-width=117 --crate-type lib --emit=dep-info,metadata,link -C embed-bitcode=no -C debuginfo=2 --cfg feature=\"alloc\" --cfg feature=\"std\" --check-cfg "cfg(docsrs,test)" --check-cfg "cfg(feature, values(\"alloc\", \"compiler_builtins\", \"core\", \"default\", \"libc\", \"logging\", \"rustc-dep-of-std\", \"std\", \"use_std\"))" -C metadata=f0ff90587188d79c -C extra-filename=-5282d705ff339125 --out-dir /home/thevar1able/nvmemount/clickhouse/cmake-build-debug/./cargo/build/x86_64-unknown-linux-gnu/debug/deps --target x86_64-unknown-linux-gnu -C linker=/usr/bin/clang -L dependency=/home/thevar1able/nvmemount/clickhouse/cmake-build-debug/./cargo/build/x86_64-unknown-linux-gnu/debug/deps -L dependency=/home/thevar1able/nvmemount/clickhouse/cmake-build-debug/./cargo/build/debug/deps --cap-lints allow -C link-arg=-fuse-ld=lld | head -n1
-// {"$message_type":"artifact","artifact":"/home/thevar1able/nvmemount/clickhouse/cmake-build-debug/./cargo/build/x86_64-unknown-linux-gnu/debug/deps/memchr-5282d705ff339125.d","emit":"dep-info"}
-// {"$message_type":"artifact","artifact":"/home/thevar1able/nvmemount/clickhouse/cmake-build-debug/./cargo/build/x86_64-unknown-linux-gnu/debug/deps/libmemchr-5282d705ff339125.rmeta","emit":"metadata"}
-// {"$message_type":"artifact","artifact":"/home/thevar1able/nvmemount/clickhouse/cmake-build-debug/./cargo/build/x86_64-unknown-linux-gnu/debug/deps/libmemchr-5282d705ff339125.rlib","emit":"link"}
 impl Compiler for RustC {
     fn cache_key(&self) -> String {
         let mut maybe_basepath: Vec<String> = vec![];
@@ -130,18 +129,18 @@ impl Compiler for RustC {
             stripped_args.remove(index);
         }
 
-        if let Some(index) = stripped_args.iter().position(|x| x.starts_with("--diagnostic-width")) {
+        if let Some(index) = stripped_args
+            .iter()
+            .position(|x| x.starts_with("--diagnostic-width"))
+        {
             stripped_args.remove(index);
         }
 
         // May have different linkers between developers.
         // - "-C", "linker=/src/llvm/llvm-project/.cmake/bin/clang",
         // + "-C", "linker=/usr/bin/clang",
         let mut clang_linker_version: Option<String> = None;
-        if let Some(index) = stripped_args
-            .iter()
-            .position(|x| x.contains("linker="))
-        {
+        if let Some(index) = stripped_args.iter().position(|x| x.contains("linker=")) {
             let linker = stripped_args[index].replace("linker=", "");
             assert!(!linker.is_empty());
             assert!(linker.ends_with("clang"));
@@ -208,6 +207,7 @@ impl Compiler for RustC {
 
         let cursor = Cursor::new(bytes);
         let mut archive = tar::Archive::new(cursor);
+        archive.set_preserve_mtime(false);
         archive.unpack(&self.out_dir)?;
 
         Ok(())
@@ -226,15 +226,9 @@ impl Compiler for RustC {
         }
 
         let files_to_pack = String::from_utf8_lossy(&output.stderr);
-        // eprintln!("{}", String::from_utf8_lossy(&output.stdout));
-
         let files_to_pack = files_to_pack
             .lines()
             .filter(|line| line.starts_with("{\"$message_type\":\"artifact\""))
-            .collect::<Vec<&str>>();
-
-        let files_to_pack = files_to_pack
-            .iter()
             .map(|x| {
                 let json: serde_json::Value = serde_json::from_str(x).unwrap();
                 let artifact = json["artifact"].as_str().unwrap();
@@ -244,24 +238,19 @@ impl Compiler for RustC {
             .collect::<Vec<String>>();
 
         trace!("Files to pack: {:?}", files_to_pack);
-        for (key, value) in std::env::vars() {
-            // trace!("Env var: {}: {}", key, value);
-            if key.starts_with("CARGO_") || key == "RUSTFLAGS" || key == "TARGET" {
-                trace!("Maybe interesting env var {}: {}", key, value);
-            }
-        }
 
         let mut buffer = Vec::new();
         let cursor = Cursor::new(&mut buffer);
         let mut archive = tar::Builder::new(cursor);
-        for file in files_to_pack {
+        for file in &files_to_pack {
             let file = Path::new(&file);
             let filename = file.strip_prefix(&self.out_dir).unwrap();
             let filename = filename.to_str().unwrap();
             trace!("Packing file: {}", file.display());
             let mut packed_file = fs::File::open(file).unwrap();
             archive.append_file(filename, &mut packed_file).unwrap();
         }
+
         archive.finish().unwrap();
         drop(archive);
 

rust/chcache/src/main.rs

@@ -81,7 +81,7 @@ async fn compiler_cache_entrypoint(config: &Config) -> Result<(), Box<dyn Error>
     let total_hash = compiler.cache_key();
     let compiler_version = compiler.version();
 
-    let mut did_load_from_cache = false;
+    let mut did_load_from_local_cache = false;
     let mut did_load_from_clickhouse = false;
 
     let compiled_bytes: Vec<u8> = match local_disk.read(&total_hash).await {
@@ -90,8 +90,8 @@ async fn compiler_cache_entrypoint(config: &Config) -> Result<(), Box<dyn Error>
 
             compiler
                 .apply_cache(&bytes)
-                .expect("Unable to apply local cache");
-            did_load_from_cache = true;
+                .expect(&("Unable to apply local cache for hash ".to_owned() + &total_hash));
+            did_load_from_local_cache = true;
 
             bytes
         }
@@ -107,7 +107,6 @@ async fn compiler_cache_entrypoint(config: &Config) -> Result<(), Box<dyn Error>
                         .apply_cache(&bytes)
                         .expect("Unable to apply cache from ClickHouse");
 
-                    did_load_from_cache = true;
                     did_load_from_clickhouse = true;
 
                     bytes
@@ -122,7 +121,7 @@ async fn compiler_cache_entrypoint(config: &Config) -> Result<(), Box<dyn Error>
         }
     };
 
-    if !did_load_from_clickhouse {
+    if !did_load_from_local_cache {
         local_disk
             .write(&total_hash, &compiled_bytes)
             .await
@@ -132,7 +131,7 @@ async fn compiler_cache_entrypoint(config: &Config) -> Result<(), Box<dyn Error>
     let should_upload = {
         let default_config = Config::default();
 
-        !did_load_from_cache && config.user != default_config.user
+        !did_load_from_local_cache && !did_load_from_clickhouse && config.user != default_config.user
     };
 
     if should_upload {