facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-06 14:58:03 +03:00
Code Issues Projects Releases Wiki Activity

cli_rs: add a --clean-orphaned option

Browse Source 
Summary:
This will only clean the orphaned redirections. This will be used in a nightly
script to clean all the orphaned redirections on a periodic manner
automatically instead of having users run `eden du --clean` manually.

Reviewed By: MichaelCuevas

Differential Revision: D39488493

fbshipit-source-id: 2146aa1aea6b7a4fda129f7676dba577eb14050e
This commit is contained in:
Xavier Deguillard 2022-09-14 10:27:48 -07:00 committed by Facebook GitHub Bot
parent 99d7a3c7d3
commit c16653cd76
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
eden/fs/cli/main.py
View File

@ -193,6 +193,13 @@ class DiskUsageCmd(Subcmd):
"Unlike --clean this will destroy unrecoverable data. If you have any local changes you "
"hope to recover, recover them before you run this command.",
)
group.add_argument(
"--clean-orphaned",
action="store_true",
help="Performs automated cleanup of the orphaned redirections. "
"This is a subset of --clean that is safe to run without affecting "
"running tools relying on redirections.",
)
group.add_argument(
"--json",
action="store_true",

25
eden/fs/cli_rs/edenfs-commands/src/du.rs
View File

@ -68,6 +68,17 @@ pub struct DiskUsageCmd {
)]
deep_clean: bool,
#[clap(
long,
help = "Performs automated cleanup of the orphaned redirections. \
This is a subset of --clean that is safe to run without affecting \
running tools relying on redirections.",
conflicts_with = "deep-clean",
conflicts_with = "clean",
conflicts_with = "json"
)]
clean_orphaned: bool,
#[clap(long, help = "Print the output in JSON format")]
json: bool,
}
@ -138,7 +149,7 @@ impl fmt::Display for AggregatedUsageCounts {
let mut row = Row::new();
row.add_cell(Cell::new("Orphaned redirections:").set_alignment(CellAlignment::Right));
row.add_cell(Cell::new(format_size(self.orphaned_redirections)));
if f.alternate() {
if f.alternate() || f.sign_minus() {
row.add_cell(Cell::new("Cleaned").fg(Color::Green));
}
table.add_row(row);
@ -782,9 +793,6 @@ impl crate::Subcommand for DiskUsageCmd {
let shared_failed_file_checks = shared_failed_file_checks;
let aggregated_usage_counts = aggregated_usage_counts;
// GET HGCACHE PATH
let hg_cache_path = get_hg_cache_path().context("Failed to get hgcache path")?;
// PRINT OUTPUT
if self.json {
println!(
@ -851,7 +859,7 @@ impl crate::Subcommand for DiskUsageCmd {
write_failed_to_check_files_message(&orphaned_redirection_failed_file_checks);
if !orphaned_redirections.is_empty() {
if self.should_clean() {
if self.clean_orphaned || self.should_clean() {
for redir in orphaned_redirections.iter() {
fs::remove_dir_all(&redir).with_context(|| {
format!("Failed to recursively remove {}", redir.display())
@ -877,6 +885,9 @@ impl crate::Subcommand for DiskUsageCmd {
}
write_failed_to_check_files_message(&backing_failed_file_checks);
// GET HGCACHE PATH
let hg_cache_path = get_hg_cache_path().context("Failed to get hgcache path")?;
println!("\nTo reclaim space from the hgcache directory, run:");
if cfg!(windows) {
println!("\n`rmdir {}`", hg_cache_path.display());
@ -921,7 +932,9 @@ impl crate::Subcommand for DiskUsageCmd {
// PRINT SUMMARY
write_title("Summary");
if self.deep_clean {
if self.clean_orphaned {
println!("{:-}", aggregated_usage_counts);
} else if self.deep_clean {
println!("{:+#}", aggregated_usage_counts);
} else if self.clean {
println!("{:#}", aggregated_usage_counts);