mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 09:17:30 +03:00
2767b28825
Reviewed By: krallin Differential Revision: D23053788 fbshipit-source-id: 615a4f4064a56d6e45818f85f002267d4bf08c95
396 lines
12 KiB
Perl
396 lines
12 KiB
Perl
# Copyright (c) Facebook, Inc. and its affiliates.
|
|
#
|
|
# This software may be used and distributed according to the terms of the
|
|
# GNU General Public License found in the LICENSE file in the root
|
|
# directory of this source tree.
|
|
|
|
$ . "${TEST_FIXTURES}/library.sh"
|
|
|
|
setup configuration
|
|
|
|
$ ENABLE_PRESERVE_BUNDLE2=1 setup_common_config blob_files
|
|
$ cd $TESTTMP
|
|
|
|
setup repo
|
|
|
|
$ hginit_treemanifest repo-hg
|
|
$ cd repo-hg
|
|
$ echo foo > a
|
|
$ echo foo > b
|
|
$ hg addremove && hg ci -m 'initial'
|
|
adding a
|
|
adding b
|
|
$ echo 'bar' > a
|
|
$ hg addremove && hg ci -m 'a => bar'
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [extensions]
|
|
> pushrebase =
|
|
> EOF
|
|
|
|
create master bookmark
|
|
|
|
$ hg bookmark master_bookmark -r tip
|
|
|
|
blobimport them into Mononoke storage and start Mononoke
|
|
$ cd ..
|
|
$ blobimport repo-hg/.hg repo
|
|
|
|
start mononoke
|
|
$ mononoke
|
|
$ wait_for_mononoke
|
|
|
|
Make client repo
|
|
$ hgclone_treemanifest ssh://user@dummy/repo-hg client-push --noupdate --config extensions.remotenames= -q
|
|
|
|
Push to Mononoke
|
|
$ cd $TESTTMP/client-push
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [extensions]
|
|
> pushrebase =
|
|
> remotenames =
|
|
> EOF
|
|
$ hg up -q tip
|
|
|
|
$ mkcommit pushcommit
|
|
$ hgmn push -r . --to master_bookmark -q
|
|
|
|
$ mkcommit anothercommit
|
|
$ hgmn push -r . --to master_bookmark -q
|
|
|
|
$ hgmn push -r .^ --to master_bookmark -q --non-forward-move --pushvar NON_FAST_FORWARD=true
|
|
[1]
|
|
|
|
Check that new entry was added to the sync database. 3 pushes and 1 blobimport
|
|
$ sqlite3 "$TESTTMP/monsql/sqlite_dbs" "select count(*) from bookmarks_update_log";
|
|
4
|
|
|
|
Sync it to another client
|
|
$ cd $TESTTMP
|
|
$ cat >> repo-hg/.hg/hgrc <<EOF
|
|
> [treemanifest]
|
|
> treeonly=True
|
|
> EOF
|
|
|
|
|
|
Make a copy of it that will be used later
|
|
$ cp -r repo-hg repo-hg-2
|
|
$ cp -r repo-hg repo-hg-3
|
|
|
|
Try to sync blobimport bookmark move, which should fail
|
|
$ cd "$TESTTMP"
|
|
$ create_repo_lock_sqlite3_db
|
|
$ init_repo_lock_sqlite3_db
|
|
$ sqlite3 "$TESTTMP/hgrepos/repo_lock" "select count(*) from repo_lock"
|
|
1
|
|
$ mononoke_hg_sync_with_failure_handler repo-hg 0 2>&1 | grep 'unexpected bookmark move'
|
|
unexpected bookmark move: blobimport
|
|
$ sqlite3 "$TESTTMP/hgrepos/repo_lock" "select count(*) from repo_lock"
|
|
1
|
|
|
|
Sync a pushrebase bookmark move
|
|
$ mononoke_hg_sync repo-hg 1 2>&1 | grep 'successful sync'
|
|
* successful sync of entries [2] (glob)
|
|
$ cd repo-hg
|
|
$ hg log -r master_bookmark
|
|
commit: 1e43292ffbb3
|
|
bookmark: master_bookmark
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: pushcommit
|
|
|
|
$ cd $TESTTMP
|
|
$ mononoke_hg_sync repo-hg 2 2>&1 | grep 'successful sync'
|
|
* successful sync of entries [3] (glob)
|
|
$ cd repo-hg
|
|
$ hg log -r master_bookmark
|
|
commit: 6cc06ef82eeb
|
|
bookmark: master_bookmark
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: anothercommit
|
|
|
|
$ hg log -r master_bookmark^
|
|
commit: 1e43292ffbb3
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: pushcommit
|
|
|
|
$ cd $TESTTMP
|
|
$ mononoke_hg_sync repo-hg 3 2>&1 | grep 'successful sync'
|
|
* successful sync of entries [4] (glob)
|
|
$ cd repo-hg
|
|
$ hg log -r master_bookmark
|
|
commit: 1e43292ffbb3
|
|
bookmark: master_bookmark
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: pushcommit
|
|
|
|
Enable replay verification hooks
|
|
$ cd $TESTTMP/repo-hg-2
|
|
$ enable_replay_verification_hook
|
|
$ hg log -r master_bookmark
|
|
commit: add0c792bfce
|
|
bookmark: master_bookmark
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: a => bar
|
|
|
|
$ cd $TESTTMP
|
|
$ sqlite3 "$TESTTMP/monsql/sqlite_dbs" "update bundle_replay_data set commit_hashes_json = '{\"1e43292ffbb38fa183e7f21fb8e8a8450e61c890\":10000000000}' where bookmark_update_log_id = 2"
|
|
$ mononoke_hg_sync_with_retry repo-hg-2 1 2>&1 | grep 'replay failed'
|
|
replay failed: error:pushkey
|
|
replay failed: error:pushkey
|
|
replay failed: error:pushkey
|
|
replay failed: error:pushkey
|
|
Oops, we allowed a wrong bookmark to be unbundlereplayed onto
|
|
$ cat >> $TESTTMP/repo-hg-2/.hg/hgrc << CONFIG
|
|
> [facebook]
|
|
> hooks.unbundlereplaybooks=master_bookmark,blabla
|
|
> CONFIG
|
|
|
|
Now bookmark is not blocked
|
|
$ mononoke_hg_sync repo-hg-2 1 2>&1 | grep 'replay failed'
|
|
replay failed: error:pushkey
|
|
replay failed: error:pushkey
|
|
|
|
Set the correct timestamp back
|
|
$ sqlite3 "$TESTTMP/monsql/sqlite_dbs" "update bundle_replay_data set commit_hashes_json = '{\"1e43292ffbb38fa183e7f21fb8e8a8450e61c890\":0}' where bookmark_update_log_id = 2"
|
|
|
|
$ cd repo-hg-2
|
|
$ hg log -r master_bookmark
|
|
commit: add0c792bfce
|
|
bookmark: master_bookmark
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: a => bar
|
|
|
|
Replay in a loop
|
|
$ cd $TESTTMP
|
|
$ mononoke_hg_sync_loop repo-hg-3 0 2>&1 | grep 'unexpected bookmark'
|
|
* unexpected bookmark move: blobimport (glob)
|
|
$ mononoke_hg_sync_loop repo-hg-3 1 --bundle-prefetch 0 2>&1 | grep 'successful sync'
|
|
* successful sync of entries [2] (glob)
|
|
* successful sync of entries [3] (glob)
|
|
* successful sync of entries [4] (glob)
|
|
$ sqlite3 "$TESTTMP/monsql/sqlite_dbs" "select * from mutable_counters where name = 'latest-replayed-request'";
|
|
0|latest-replayed-request|4
|
|
|
|
Make one more push from the client
|
|
$ cd $TESTTMP/client-push
|
|
$ hg up -q master_bookmark
|
|
$ mkcommit onemorecommit
|
|
$ hgmn push -r . --to master_bookmark -q
|
|
|
|
Continue replay
|
|
$ cd $TESTTMP
|
|
$ mononoke_hg_sync_loop repo-hg-3 1 2>&1 | grep 'successful sync'
|
|
* successful sync of entries [5] (glob)
|
|
$ cd $TESTTMP/repo-hg-3
|
|
$ hg log -r tip
|
|
commit: 67d5c96d65a7
|
|
bookmark: master_bookmark
|
|
parent: 1e43292ffbb3
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: onemorecommit
|
|
|
|
Make a commit that makes a file executable and a commit that adds a symlink. Make sure they are sync correctly
|
|
$ cd $TESTTMP/client-push
|
|
$ hgmn up -q 2
|
|
$ chmod +x pushcommit
|
|
$ hg ci -m 'exec mode'
|
|
$ hgmn push -r . --to master_bookmark
|
|
pushing rev 15776eb106e6 to destination ssh://user@dummy/repo bookmark master_bookmark
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 0 changes to 0 files
|
|
updating bookmark master_bookmark
|
|
$ hgmn up -q 2
|
|
$ ln -s pushcommit symlink_to_pushcommit
|
|
$ hg addremove
|
|
adding symlink_to_pushcommit
|
|
$ hg ci -m 'symlink'
|
|
$ hgmn push -r . --to master_bookmark
|
|
pushing rev 6f060fabc8e7 to destination ssh://user@dummy/repo bookmark master_bookmark
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 0 changes to 0 files
|
|
updating bookmark master_bookmark
|
|
|
|
Continue replay
|
|
$ cd $TESTTMP/repo-hg-3
|
|
$ cat >>.hg/hgrc <<CONFIG
|
|
> [hooks]
|
|
> prepushkey = python "$TESTTMP/replayverification.py"
|
|
> CONFIG
|
|
|
|
$ cd $TESTTMP
|
|
$ mononoke_hg_sync_loop repo-hg-3 5 2>&1 | grep 'successful sync'
|
|
* successful sync of entries [6] (glob)
|
|
* successful sync of entries [7] (glob)
|
|
$ cd repo-hg-3
|
|
$ hg log -r master_bookmark^
|
|
commit: a7acac33c050
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: exec mode
|
|
|
|
$ hg log -r master_bookmark
|
|
commit: 6f24f1b38581
|
|
bookmark: master_bookmark
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: symlink
|
|
|
|
Verify that repo-hg-2 is locked for normal pushes
|
|
$ cd $TESTTMP/client-push
|
|
$ hg up 0 -q
|
|
$ echo >> ababagalamaga && hg ci -qAm ababagalamaga
|
|
$ hg push -r . --to master_bookmark ssh://user@dummy/repo-hg-2
|
|
pushing rev 24e27c11427d to destination ssh://user@dummy/repo-hg-2 bookmark master_bookmark
|
|
searching for changes
|
|
remote: pushing 1 changeset:
|
|
remote: 24e27c11427d ababagalamaga
|
|
remote: 1 new changeset from the server will be downloaded
|
|
remote: [RepoLock] Repo locked for non-unbundlereplay pushes
|
|
remote: pushkey-abort: prepushkey.lock hook failed
|
|
remote: transaction abort!
|
|
remote: rollback completed
|
|
abort: updating bookmark master_bookmark failed!
|
|
[255]
|
|
|
|
Test hook bypass using REPLAY_BYPASS file
|
|
$ cd $TESTTMP/repo-hg-2
|
|
$ cat >>.hg/hgrc <<CONFIG
|
|
> [hooks]
|
|
> prepushkey = python:$TESTTMP/replayverification.py:verify_replay
|
|
> [facebook]
|
|
> hooks.unbundlereplaybooks=other_bookmark
|
|
> CONFIG
|
|
$ hg log -r master_bookmark
|
|
commit: add0c792bfce
|
|
bookmark: master_bookmark
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: a => bar
|
|
|
|
$ cd $TESTTMP
|
|
$ touch repo-hg-2/.hg/REPLAY_BYPASS
|
|
|
|
Test failing to sync, but already having the correct bookmark location
|
|
$ sqlite3 "$TESTTMP/monsql/sqlite_dbs" "update bundle_replay_data set commit_hashes_json = '{\"add0c792bfce89610d277fd5b1e32f5287994d1d\":10000000000}' where bookmark_update_log_id = 2"
|
|
$ mononoke_hg_sync_with_retry repo-hg-2 1 2>&1 | grep 'successful sync'
|
|
* successful sync of entries [2] (glob)
|
|
|
|
Test further sync
|
|
$ sqlite3 "$TESTTMP/monsql/sqlite_dbs" "update bundle_replay_data set commit_hashes_json = '{\"1e43292ffbb38fa183e7f21fb8e8a8450e61c890\":10000000000}' where bookmark_update_log_id = 2"
|
|
$ mononoke_hg_sync_with_retry repo-hg-2 1 2>&1 | grep -E '(sync failed|successful sync)'
|
|
* sync failed. Invalidating process (glob)
|
|
* sync failed, let's check if the bookmark is where we want it to be anyway (glob)
|
|
* successful sync of entries [2] (glob)
|
|
|
|
Test bookmark deletion sync
|
|
$ cat >>$TESTTMP/repo-hg-3/.hg/hgrc <<CONFIG
|
|
> [hooks]
|
|
> prepushkey = python:$TESTTMP/replayverification.py:verify_replay
|
|
> CONFIG
|
|
$ cd $TESTTMP/client-push
|
|
$ hgmn -q up master_bookmark
|
|
$ hgmn -q push --rev . --to book_to_delete --create
|
|
[1]
|
|
$ hg log -r master_bookmark
|
|
commit: 6f24f1b38581
|
|
bookmark: default/book_to_delete
|
|
bookmark: default/master_bookmark
|
|
hoistedname: book_to_delete
|
|
hoistedname: master_bookmark
|
|
parent: a7acac33c050
|
|
user: test
|
|
date: * (glob)
|
|
summary: symlink
|
|
|
|
$ cd $TESTTMP
|
|
$ mononoke_hg_sync_loop repo-hg-3 7 2>&1 | grep 'successful sync'
|
|
* successful sync of entries [8] (glob)
|
|
$ cd $TESTTMP/client-push
|
|
$ hgmn push --delete book_to_delete
|
|
pushing to * (glob)
|
|
searching for changes
|
|
no changes found
|
|
deleting remote bookmark book_to_delete
|
|
[1]
|
|
$ hg log -r master_bookmark
|
|
commit: 6f24f1b38581
|
|
bookmark: default/master_bookmark
|
|
hoistedname: master_bookmark
|
|
parent: a7acac33c050
|
|
user: test
|
|
date: * (glob)
|
|
summary: symlink
|
|
|
|
$ cd $TESTTMP
|
|
$ mononoke_hg_sync_loop repo-hg-3 8 2>&1 | grep 'successful sync'
|
|
* successful sync of entries [9] (glob)
|
|
$ cd $TESTTMP/repo-hg-3
|
|
$ hg log -r master_bookmark
|
|
commit: 6f24f1b38581
|
|
bookmark: master_bookmark
|
|
user: test
|
|
date: * (glob)
|
|
summary: symlink
|
|
|
|
|
|
Test force pushrebase sync
|
|
$ cd $TESTTMP/client-push
|
|
$ hgmn -q up master_bookmark^
|
|
-- create a commit, which is not an ancestor of master
|
|
$ mkcommit commit_to_force_pushmaster
|
|
$ hg log -r .
|
|
commit: cc83c88b72d3
|
|
parent: a7acac33c050
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: commit_to_force_pushmaster
|
|
|
|
-- force-pushrebase this commit
|
|
$ hgmn push -q -f --to master_bookmark
|
|
-- master should now point to it
|
|
$ hg log -r .
|
|
commit: cc83c88b72d3
|
|
bookmark: default/master_bookmark
|
|
hoistedname: master_bookmark
|
|
parent: a7acac33c050
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: commit_to_force_pushmaster
|
|
|
|
-- let us now see if we can replay it
|
|
$ cd $TESTTMP
|
|
$ mononoke_hg_sync_loop repo-hg-3 8 2>&1 | grep 'successful sync'
|
|
* successful sync of entries [10] (glob)
|
|
-- and if the replay result is good (e.g. master_bookmark points to the same commit as in client-push)
|
|
$ cd $TESTTMP/repo-hg-3
|
|
$ hg log -r master_bookmark
|
|
commit: cc83c88b72d3
|
|
bookmark: master_bookmark
|
|
parent: a7acac33c050
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: commit_to_force_pushmaster
|
|
|
|
|
|
Test the job exits when the exit file is set
|
|
$ cd $TESTTMP/client-push
|
|
$ hg up -q master_bookmark
|
|
$ mkcommit exitcommit
|
|
$ hgmn push -r . --to master_bookmark -q
|
|
$ touch $TESTTMP/exit-file
|
|
$ cd $TESTTMP
|
|
$ mononoke_hg_sync_loop repo-hg-3 8 --exit-file $TESTTMP/exit-file 2>&1 | grep 'exists'
|
|
* path "$TESTTMP/exit-file" exists: exiting ... (glob)
|