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

new_blobimport: print number of uploaded CS every 5000

Browse Source 
Summary: printing every CS is too verbose, but we still want to see progress in non-debug mode

Reviewed By: kulshrax

Differential Revision: D7925747

fbshipit-source-id: c3ed92ef8c8fbf7714779a2bf011d31c94aefa37
This commit is contained in:
Lukas Piatkowski 2018-05-11 12:42:32 -07:00 committed by Facebook Github Bot
parent 51c49a47be
commit 1f58bd7060
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmds/new_blobimport/main.rs
View File

@ -30,6 +30,7 @@ mod changeset;
use std::fs;
use std::path::Path;
use std::sync::Arc;
use std::sync::atomic::{AtomicUsize, Ordering};
use clap::{App, Arg, ArgMatches};
use failure::err_msg;
@ -192,10 +193,15 @@ fn main() {
let blobrepo = Arc::new(open_blobrepo(&logger, &matches));
let cs_count = Arc::new(AtomicUsize::new(1));
let upload_changesets = changeset::upload_changesets(revlogrepo.clone(), blobrepo.clone())
.for_each(|cs| {
cs.map(|cs| {
info!(logger, "inserted: {}", cs.get_changeset_id());
debug!(logger, "inserted: {}", cs.get_changeset_id());
let cnt = cs_count.fetch_add(1, Ordering::SeqCst);
if cnt % 5000 == 0 {
info!(logger, "inserted commits # {}", cnt);
}
()
}).map_err(|err| {
error!(logger, "failed to blobimport: {}", err);

14
tests/integration/test-eden-server.t
View File

@ -115,14 +115,14 @@ Add commit with a directory
$ echo "private_key=\"$TESTDIR/edenservertest.key\"" >> $TESTTMP/config
$ echo "ca_pem_file=\"$TESTDIR/edenservertest.crt\"" >> $TESTTMP/config
$ newblobimport $TESTTMP/repo/.hg $TESTTMP/blobrepo
$ newblobimport $TESTTMP/repo/.hg $TESTTMP/blobrepo --debug
$ grep 'inserted:' < $TESTTMP/blobimport.out
I* inserted: 3903775176ed42b1458a6281db4a0ccf4d9f287a (glob)
I* inserted: 4dabaf45f54add88ca2797dfdeb00a7d55144243 (glob)
I* inserted: 533267b0e203537fa53d2aec834b062f0b2249cd (glob)
I* inserted: 813c7514ad5e14493de885987c241c14c5cd3153 (glob)
I* inserted: 7f48e9c786d1cbab525424e45139585724f84e28 (glob)
I* inserted: 617e87e2aa2fe36508e8d5e15a162bcd2e79808e (glob)
D* inserted: 3903775176ed42b1458a6281db4a0ccf4d9f287a (glob)
D* inserted: 4dabaf45f54add88ca2797dfdeb00a7d55144243 (glob)
D* inserted: 533267b0e203537fa53d2aec834b062f0b2249cd (glob)
D* inserted: 813c7514ad5e14493de885987c241c14c5cd3153 (glob)
D* inserted: 7f48e9c786d1cbab525424e45139585724f84e28 (glob)
D* inserted: 617e87e2aa2fe36508e8d5e15a162bcd2e79808e (glob)
$ edenserver --config-file $TESTTMP/config