mirror of
https://github.com/facebook/sapling.git
synced 2024-10-06 23:07:18 +03:00
Revert D22992103: hgcommands: add debugfsync
Differential Revision:
D22992103 (f6d086d13b)
Original commit changeset: b5503e498d52
fbshipit-source-id: ad8f0d9c0bba1d07edb0aebca052da10c0f8e59c
This commit is contained in:
Jeremy Sze Wei Teo
Facebook GitHub Bot
parent
5b9d86d6f8
commit
43425f1116
@ -1,11 +0,0 @@
|
||||
[package]
|
||||
name = "fsyncglob"
|
||||
version = "0.1.0"
|
||||
edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
glob = "0.3"
|
||||
tracing = "0.1"
|
||||
|
||||
[dev-dependencies]
|
||||
tempfile = "3"
|
||||
@ -1,138 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) Facebook, Inc. and its affiliates.
|
||||
*
|
||||
* This software may be used and distributed according to the terms of the
|
||||
* GNU General Public License version 2.
|
||||
*/
|
||||
|
||||
//! Simple crate to call fsync on files matching glob patterns.
|
||||
//!
|
||||
//! This is a standalone crate to help reducing compile time of `hgcommands`.
|
||||
|
||||
use glob::Pattern;
|
||||
use std::fs;
|
||||
use std::io;
|
||||
use std::path::Path;
|
||||
use std::path::PathBuf;
|
||||
use std::time::Duration;
|
||||
use std::time::SystemTime;
|
||||
use tracing::debug;
|
||||
use tracing::trace;
|
||||
use tracing::warn;
|
||||
|
||||
/// Call `fsync` on files matching given glob patterns under the given directory.
|
||||
///
|
||||
/// Errors are silenced and logged to tracing framework.
|
||||
/// Files not recently modified (older than `newer_than`) are skipped.
|
||||
///
|
||||
/// Returns paths that are fsync-ed.
|
||||
pub fn fsync_glob(dir: &Path, patterns: &[&str], newer_than: Option<SystemTime>) -> Vec<PathBuf> {
|
||||
let escaped_dir = Pattern::escape(&dir.display().to_string());
|
||||
let mut result = Vec::new();
|
||||
for p in patterns {
|
||||
let full_pattern = format!("{}/{}", &escaped_dir, p);
|
||||
debug!("globing {}", &full_pattern);
|
||||
|
||||
let matches = match glob::glob(&full_pattern) {
|
||||
Err(e) => {
|
||||
warn!("glob failed: {}", e);
|
||||
continue;
|
||||
}
|
||||
Ok(matches) => matches,
|
||||
};
|
||||
|
||||
let newer_than = newer_than.unwrap_or_else(|| {
|
||||
let now = SystemTime::now();
|
||||
now.checked_sub(Duration::from_secs(300)).unwrap_or(now)
|
||||
});
|
||||
|
||||
for path in matches {
|
||||
let path = match path {
|
||||
Ok(path) => path,
|
||||
Err(e) => {
|
||||
warn!("path reading failed: {}", e);
|
||||
continue;
|
||||
}
|
||||
};
|
||||
|
||||
match try_fsync_if_newer_than(&path, newer_than) {
|
||||
Ok(true) => {
|
||||
if let Ok(path) = path.strip_prefix(dir) {
|
||||
result.push(path.to_path_buf());
|
||||
}
|
||||
debug!("fsynced: {}", path.display());
|
||||
}
|
||||
Ok(false) => trace!("skipped: {}", path.display()),
|
||||
Err(e) => warn!("cannot fsync {}: {}", path.display(), e),
|
||||
}
|
||||
}
|
||||
}
|
||||
result.sort_unstable();
|
||||
result
|
||||
}
|
||||
|
||||
/// Attempt to fsync a single file.
|
||||
/// Return false if the file is skipped (not newly modified or not a file).
|
||||
/// Return true if the file is synced.
|
||||
fn try_fsync_if_newer_than(path: &Path, newer_than: SystemTime) -> io::Result<bool> {
|
||||
let metadata = path.symlink_metadata()?;
|
||||
if !metadata.is_file() || metadata.modified()? < newer_than {
|
||||
return Ok(false);
|
||||
}
|
||||
|
||||
let mut open_opts = fs::OpenOptions::new();
|
||||
open_opts.read(true).create(false).truncate(false);
|
||||
|
||||
// Windows requires opening with write permission for fsync.
|
||||
if cfg!(windows) {
|
||||
open_opts.write(true);
|
||||
}
|
||||
|
||||
let file = open_opts.open(path)?;
|
||||
file.sync_all()?;
|
||||
Ok(true)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use std::fs;
|
||||
use tempfile::tempdir;
|
||||
|
||||
#[test]
|
||||
fn test_patterns() {
|
||||
let dir = tempdir().unwrap();
|
||||
let dir = dir.path();
|
||||
|
||||
fs::write(dir.join("a"), b"1").unwrap();
|
||||
fs::write(dir.join("a1"), b"1").unwrap();
|
||||
fs::write(dir.join("b"), b"2").unwrap();
|
||||
fs::write(dir.join("c"), b"3").unwrap();
|
||||
|
||||
assert_eq!(d(fsync_glob(&dir, &[], None)), "[]");
|
||||
assert_eq!(d(fsync_glob(&dir, &["d"], None)), "[]");
|
||||
assert_eq!(d(fsync_glob(&dir, &["?"], None)), "[\"a\", \"b\", \"c\"]");
|
||||
assert_eq!(
|
||||
d(fsync_glob(&dir, &["a*", "c"], None)),
|
||||
"[\"a\", \"a1\", \"c\"]"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_skip_old_files() {
|
||||
let dir = tempdir().unwrap();
|
||||
let dir = dir.path();
|
||||
|
||||
fs::write(dir.join("a"), b"1").unwrap();
|
||||
fs::write(dir.join("b"), b"2").unwrap();
|
||||
|
||||
let newer_than = SystemTime::now()
|
||||
.checked_add(Duration::from_secs(10))
|
||||
.unwrap();
|
||||
assert_eq!(d(fsync_glob(&dir, &["*"], Some(newer_than))), "[]");
|
||||
}
|
||||
|
||||
fn d(value: impl std::fmt::Debug) -> String {
|
||||
format!("{:?}", value)
|
||||
}
|
||||
}
|
||||
@ -24,7 +24,6 @@ encoding = { path = "../encoding" }
|
||||
env_logger = "0.7"
|
||||
filetime = "0.2.9"
|
||||
flate2 = "1"
|
||||
fsyncglob = { path = "../fsyncglob" }
|
||||
hgtime = { path = "../hgtime"}
|
||||
indexedlog = { path = "../indexedlog" }
|
||||
libc = "0.2"
|
||||
|
||||
@ -43,7 +43,6 @@ pub fn table() -> CommandTable {
|
||||
debug::dumpindexedlog,
|
||||
debug::dumptrace,
|
||||
debug::dynamicconfig,
|
||||
debug::fsync,
|
||||
debug::http,
|
||||
debug::python,
|
||||
debug::store,
|
||||
|
||||
@ -16,7 +16,6 @@ pub mod causerusterror;
|
||||
pub mod dumpindexedlog;
|
||||
pub mod dumptrace;
|
||||
pub mod dynamicconfig;
|
||||
pub mod fsync;
|
||||
pub mod http;
|
||||
pub mod python;
|
||||
pub mod store;
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) Facebook, Inc. and its affiliates.
|
||||
*
|
||||
* This software may be used and distributed according to the terms of the
|
||||
* GNU General Public License version 2.
|
||||
*/
|
||||
|
||||
use super::NoOpts;
|
||||
use super::Repo;
|
||||
use super::Result;
|
||||
use super::IO;
|
||||
|
||||
pub fn run(_opts: NoOpts, _io: &mut IO, repo: Repo) -> Result<u8> {
|
||||
let store_path = repo.store_path();
|
||||
let patterns = [
|
||||
"00changelog.*",
|
||||
"hgcommits/**/*",
|
||||
"metalog/**/*",
|
||||
"mutation/**/*",
|
||||
];
|
||||
fsyncglob::fsync_glob(store_path, &patterns, None);
|
||||
Ok(0)
|
||||
}
|
||||
|
||||
pub fn name() -> &'static str {
|
||||
"debugfsync"
|
||||
}
|
||||
|
||||
pub fn doc() -> &'static str {
|
||||
"call fsync on newly modified key storage files"
|
||||
}
|
||||
@ -120,7 +120,6 @@ Show debug commands if there are no other candidates
|
||||
debugfileset
|
||||
debugformat
|
||||
debugfsinfo
|
||||
debugfsync
|
||||
debuggetbundle
|
||||
debughttp
|
||||
debugignore
|
||||
@ -402,7 +401,6 @@ Show all commands + options
|
||||
debugfileset: rev
|
||||
debugformat: template
|
||||
debugfsinfo:
|
||||
debugfsync:
|
||||
debuggetbundle: head, common, type
|
||||
debughttp:
|
||||
debugignore:
|
||||
|
||||
@ -992,7 +992,6 @@ Test list of internal help commands
|
||||
debugfileset parse and apply a fileset specification
|
||||
debugformat display format information about the current repository
|
||||
debugfsinfo show information detected about current filesystem
|
||||
debugfsync call fsync on newly modified key storage files
|
||||
debuggentrees
|
||||
(no help text available)
|
||||
debuggetbundle
|
||||
|
||||
Loading…
Reference in New Issue
Block a user