Split housekeeping; use structured tracing for it (#1530)

* Split housekeeping; use structured tracing for it

* small fixes

Author: vlad-ivanov-name

josh-core/src/housekeeping.rs

@@ -1,7 +1,6 @@
 use crate::*;
 use itertools::Itertools;
 use std::collections::{BTreeSet, HashMap};
-use std::path::Path;
 use tracing::{Level, info, span};
 
 pub type KnownViews = HashMap<String, (git2::Oid, BTreeSet<String>)>;
@@ -118,25 +117,6 @@ pub fn memorize_from_to(
     Ok(((from, oid), to_ref))
 }
 
-fn run_command(path: &Path, cmd: &[&str]) -> String {
-    let shell = shell::Shell {
-        cwd: path.to_owned(),
-    };
-
-    let output = "";
-
-    let (stdout, stderr, _) = shell.command(cmd);
-    let output = format!(
-        "{}\n\n{}:\nstdout:\n{}\n\nstderr:{}\n",
-        output,
-        cmd.join(" "),
-        stdout,
-        stderr
-    );
-
-    output
-}
-
 regex_parsed!(UpstreamRef, r"refs/josh/upstream/(?P<ns>.*[.]git)/.*", [ns]);
 
 regex_parsed!(
@@ -321,93 +301,3 @@ pub fn get_known_filters() -> JoshResult<std::collections::BTreeMap<String, BTre
         .map(|(repo, (_, filters))| (repo.clone(), filters.clone()))
         .collect())
 }
-
-pub fn run(repo_path: &std::path::Path, do_gc: bool) -> JoshResult<()> {
-    const CRUFT_PACK_SIZE: usize = 1024 * 1024 * 64;
-
-    let transaction_mirror = cache::Transaction::open(&repo_path.join("mirror"), None)?;
-    let transaction_overlay = cache::Transaction::open(&repo_path.join("overlay"), None)?;
-
-    transaction_overlay
-        .repo()
-        .odb()?
-        .add_disk_alternate(repo_path.join("mirror").join("objects").to_str().unwrap())?;
-
-    info!(
-        "{}",
-        run_command(
-            transaction_mirror.repo().path(),
-            &["git", "count-objects", "-v"]
-        )
-        .replace('\n', "  ")
-    );
-    info!(
-        "{}",
-        run_command(
-            transaction_overlay.repo().path(),
-            &["git", "count-objects", "-v"]
-        )
-        .replace('\n', "  ")
-    );
-    if std::env::var("JOSH_NO_DISCOVER").is_err() {
-        housekeeping::discover_filter_candidates(&transaction_mirror)?;
-    }
-    if std::env::var("JOSH_NO_REFRESH").is_err() {
-        refresh_known_filters(&transaction_mirror, &transaction_overlay)?;
-    }
-    if do_gc {
-        info!(
-            "\n----------\n{}\n----------",
-            run_command(
-                transaction_mirror.repo().path(),
-                &[
-                    "git",
-                    "repack",
-                    "-adn",
-                    "--keep-unreachable",
-                    "--pack-kept-objects",
-                    "--no-write-bitmap-index",
-                    "--threads=4"
-                ]
-            )
-        );
-        info!(
-            "\n----------\n{}\n----------",
-            run_command(
-                transaction_mirror.repo().path(),
-                &["git", "multi-pack-index", "write", "--bitmap"]
-            )
-        );
-        info!(
-            "\n----------\n{}\n----------",
-            run_command(
-                transaction_overlay.repo().path(),
-                &[
-                    "git",
-                    "repack",
-                    "-dn",
-                    "--cruft",
-                    &format!("--max-cruft-size={}", CRUFT_PACK_SIZE),
-                    "--no-write-bitmap-index",
-                    "--window-memory=128m",
-                    "--threads=4",
-                ]
-            )
-        );
-        info!(
-            "\n----------\n{}\n----------",
-            run_command(
-                transaction_overlay.repo().path(),
-                &["git", "multi-pack-index", "write", "--bitmap"]
-            )
-        );
-        info!(
-            "\n----------\n{}\n----------",
-            run_command(
-                transaction_mirror.repo().path(),
-                &["git", "count-objects", "-vH"]
-            )
-        );
-    }
-    Ok(())
-}

josh-proxy/src/bin/josh-proxy.rs

@@ -1755,7 +1755,7 @@ async fn run_housekeeping(local: std::path::PathBuf) -> josh::JoshResult<()> {
     loop {
         let local = local.clone();
         tokio::task::spawn_blocking(move || {
-            josh::housekeeping::run(&local, (i % 60 == 0) && ARGS.gc)
+            josh_proxy::housekeeping::run(&local, (i % 60 == 0) && ARGS.gc)
         })
         .await??;
         tokio::time::sleep(tokio::time::Duration::from_secs(60)).await;