mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 16:31:02 +03:00
3658ac7aab
Summary: running p4 syncimport when a client spec changes is very slow, and this blocks us from using it in prod. This diff speeds up p4 syncimport by using multiple workers when calling `p4 where` on a big list of files. It reduces the runtime from ~14mins to ~3mins when I add a new mapping `u'//depot/Tools/...': u'Tools/...',` to ovrsource config and run p4 syncimport. Reviewed By: dsp Differential Revision: D6838406 fbshipit-source-id: e7260be5dea2b41e176fdc3508a78134cb1e9c35
159 lines
4.9 KiB
Raku
159 lines
4.9 KiB
Raku
#require p4
|
|
|
|
$ . $TESTDIR/p4setup.sh
|
|
|
|
$ p4 client -o hg-p4-import-narrow | sed '/^View:/,$ d' >p4client
|
|
$ echo "View:" >>p4client
|
|
$ echo " //depot/Main/Narrow/... //hg-p4-import-narrow/Main/Narrow/..." >>p4client
|
|
$ p4 client -i <p4client
|
|
Client hg-p4-import-narrow saved.
|
|
|
|
Populate the Depot
|
|
$ mkdir Main
|
|
$ mkdir Main/Narrow
|
|
$ echo a > Main/Narrow/a
|
|
$ echo b > Main/Narrow/b
|
|
$ p4 add Main/Narrow/a Main/Narrow/b
|
|
//depot/Main/Narrow/a#1 - opened for add
|
|
//depot/Main/Narrow/b#1 - opened for add
|
|
$ p4 submit -d initial
|
|
Submitting change 1.
|
|
Locking 2 files ...
|
|
add //depot/Main/Narrow/a#1
|
|
add //depot/Main/Narrow/b#1
|
|
Change 1 submitted.
|
|
|
|
$ p4 edit Main/Narrow/a
|
|
//depot/Main/Narrow/a#1 - opened for edit
|
|
$ echo a >> Main/Narrow/a
|
|
$ p4 submit -d second
|
|
Submitting change 2.
|
|
Locking 1 files ...
|
|
edit //depot/Main/Narrow/a#2
|
|
Change 2 submitted.
|
|
|
|
$ mkdir Main/Outside
|
|
$ echo a >> Main/Outside/a
|
|
$ p4 add Main/Outside/a
|
|
//depot/Main/Outside/a#1 - opened for add
|
|
$ p4 submit -d third
|
|
Submitting change 3.
|
|
Locking 1 files ...
|
|
add //depot/Main/Outside/a#1
|
|
Change 3 submitted.
|
|
|
|
$ p4 edit Main/Outside/a
|
|
//depot/Main/Outside/a#1 - opened for edit
|
|
$ echo a >> Main/Outside/a
|
|
$ p4 submit -d fourth
|
|
Submitting change 4.
|
|
Locking 1 files ...
|
|
edit //depot/Main/Outside/a#2
|
|
Change 4 submitted.
|
|
|
|
Fast Import
|
|
|
|
$ cd $hgwd
|
|
$ hg init --config 'format.usefncache=False'
|
|
$ hg p4fastimport --bookmark master --debug -P $P4ROOT hg-p4-import-narrow
|
|
loading changelist numbers.
|
|
2 changelists to import.
|
|
loading list of files.
|
|
2 files to import.
|
|
reading filelog * (glob)
|
|
reading filelog * (glob)
|
|
importing repository.
|
|
writing filelog: b789fdd96dc2, p1 000000000000, linkrev 0, 2 bytes, src: *, path: Main/Narrow/a (glob)
|
|
writing filelog: a80d06849b33, p1 b789fdd96dc2, linkrev 1, 4 bytes, src: *, path: Main/Narrow/a (glob)
|
|
writing filelog: 1e88685f5dde, p1 000000000000, linkrev 0, 2 bytes, src: *, path: Main/Narrow/b (glob)
|
|
changelist 1: writing manifest. node: f32ae4efccd8 p1: 000000000000 p2: 000000000000 linkrev: 0
|
|
changelist 1: writing changelog: initial
|
|
changelist 2: writing manifest. node: 11c5dab8abaf p1: f32ae4efccd8 p2: 000000000000 linkrev: 1
|
|
changelist 2: writing changelog: second
|
|
writing bookmark
|
|
updating the branch cache
|
|
2 revision(s), 2 file(s) imported.
|
|
|
|
Sync Import
|
|
|
|
$ hg p4syncimport --bookmark master --debug -P $P4ROOT hg-p4-import-narrow hg-p4-import
|
|
incremental import from changelist: 3, node: * (glob)
|
|
2 (current client) 4 (requested client) 2 (latest imported)
|
|
latest change list number 4
|
|
3 p4 filelogs to read
|
|
1 new filelogs and 2 reuse filelogs
|
|
running a sync import.
|
|
writing filelog: b8a08782de62, p1 000000000000, linkrev 2, 4 bytes, src: *, path: Main/Outside/a (glob)
|
|
changelist 4: writing manifest. node: * p1: 11c5dab8abaf p2: 000000000000 linkrev: 2 (glob)
|
|
changelist 4: writing changelog: p4fastimport synchronizing client view
|
|
writing bookmark
|
|
updating the branch cache
|
|
1 revision, 1 file(s) imported.
|
|
|
|
$ hg manifest -r tip
|
|
Main/Narrow/a
|
|
Main/Narrow/b
|
|
Main/Outside/a
|
|
|
|
Verify
|
|
|
|
$ hg verify
|
|
checking changesets
|
|
checking manifests
|
|
crosschecking files in changesets and manifests
|
|
checking files
|
|
3 files, 3 changesets, 4 total revisions
|
|
|
|
$ hg update master
|
|
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(activating bookmark master)
|
|
|
|
Fast Import after Sync Import
|
|
|
|
$ hg p4fastimport --bookmark master --debug -P $P4ROOT hg-p4-import
|
|
incremental import from changelist: 5, node: * (glob)
|
|
loading changelist numbers.
|
|
0 changelists to import.
|
|
|
|
Syncimport must abort if there are newer commits
|
|
|
|
$ cd $p4wd
|
|
$ p4 edit Main/Outside/a
|
|
//depot/Main/Outside/a#2 - opened for edit
|
|
$ echo a >> Main/Outside/a
|
|
$ p4 submit -d fifth
|
|
Submitting change 5.
|
|
Locking 1 files ...
|
|
edit //depot/Main/Outside/a#3
|
|
Change 5 submitted.
|
|
|
|
$ cd $hgwd
|
|
$ hg p4syncimport --bookmark master --debug -P $P4ROOT hg-p4-import-narrow hg-p4-import
|
|
incremental import from changelist: 5, node: * (glob)
|
|
2 (current client) 5 (requested client) 4 (latest imported)
|
|
abort: repository must contain most recent changes
|
|
[255]
|
|
|
|
Remove stuff
|
|
|
|
$ hg p4fastimport --bookmark master -P $P4ROOT hg-p4-import
|
|
$ hg p4syncimport --bookmark master --debug -P $P4ROOT hg-p4-import hg-p4-import-narrow
|
|
incremental import from changelist: 6, node: * (glob)
|
|
5 (current client) 2 (requested client) 5 (latest imported)
|
|
latest change list number 2
|
|
2 p4 filelogs to read
|
|
0 new filelogs and 2 reuse filelogs
|
|
running a sync import.
|
|
changelist 2: writing manifest. node: 38e379ab01af p1: e432a49b940b p2: 000000000000 linkrev: 4
|
|
changelist 2: writing changelog: p4fastimport synchronizing client view
|
|
writing bookmark
|
|
updating the branch cache
|
|
1 revision, 0 file(s) imported.
|
|
|
|
$ hg manifest -r tip
|
|
Main/Narrow/a
|
|
Main/Narrow/b
|
|
|
|
End Test
|
|
stopping the p4 server
|