Commit Graph

1712 Commits

Author SHA1 Message Date
David Budischek
2a93fe345c Block non fastforward bookmark moves
Summary:
This is a hook in mercurial, in Mononoke it will be part of the implementation. By default all non fastforward pushes are blocked, except when using the NON_FAST_FORWARD pushvar (--non-forward-move is also needed to circumvent client side restrictions). Additionally certain bookmarks (e.g. master) shouldn't be able to be moved in a non fastforward manner at all. This can be done by setting block_non_fast_forward field in config.

Pushrebase can only move the bookmark that is actually being pushrebased so we do not need to check whether it is a fastforward move (it always is)

Reviewed By: StanislavGlebik

Differential Revision: D14405696

fbshipit-source-id: 782b49c26a753918418e02c06dcfab76e3394dc1
2019-03-18 04:12:09 -07:00
David Budischek
16bfb3eb45 Remove unnecessary Option in RepoConfig
Summary: There is no need to have an Option<Vec<XYZ>> as None can simply be represented by an empty vector. This makes these fields easier to use.

Reviewed By: StanislavGlebik

Differential Revision: D14405687

fbshipit-source-id: e4c5ba12a1e3c6a18130026af6814d54952da4d2
2019-03-18 04:12:09 -07:00
Kostia Balytskyi
d6881611e8 mononoke: add run-on-failure arg to the sync job
Summary: This is needed to run the scmadmin tool and lock the repo.

Reviewed By: StanislavGlebik

Differential Revision: D14497608

fbshipit-source-id: 5865b90375db29a17d462044ca4cdb87242a8209
2019-03-17 15:06:53 -07:00
Kostia Balytskyi
4969428ce4 mononoke: add remaining bundles count to the admin tool
Summary: To learn how far behind are we in the absolute bundle numbers.

Reviewed By: StanislavGlebik

Differential Revision: D14491672

fbshipit-source-id: 31d16f115b2b6fe4b88c25a847ce229e123b048b
2019-03-17 14:53:09 -07:00
Kostia Balytskyi
468036f5f2 mononoke: add hg sync counter manipulations to the admin tool
Summary: We want to be able to manipulate hg-sync counters from the Mononoke admin.

Reviewed By: StanislavGlebik

Differential Revision: D14477676

fbshipit-source-id: 11218390bf469d4f297f7f13e9daee2d5f9bb35b
2019-03-16 05:20:32 -07:00
Stanislau Hlebik
b1423c6b43 mononoke: make test more reliable
Summary: `sl` can change it's output, `log -G` is more predictable

Reviewed By: quark-zju

Differential Revision: D14483851

fbshipit-source-id: a701bb6b9807f9b764eae90ad1d79dbecb878a19
2019-03-15 17:44:03 -07:00
Stanislau Hlebik
27c75bd136 mononoke: refactor validate_content() function
Summary:
Before adding hash validation to getpackv1 let's do this refactoring to make it
easier.

This diff also make hash validation more reliable. Previously we were
refetching the same file content again during validation instead of verifying the actual content
that was sent to the client. Since the content was in cache it was fine, but
it's better to check the same content that's sent to the client.

This diff also adds a integration test

Reviewed By: jsgf

Differential Revision: D14407292

fbshipit-source-id: b0667cb3dd6a7e0cee0b02cf87a61d43926d6058
2019-03-15 11:52:38 -07:00
Stanislau Hlebik
80a377dbac mononoke: add logging to getpackv1
Summary: Let's log it to scuba and to scribe just as we do with getfiles requests.

Reviewed By: jsgf

Differential Revision: D14404236

fbshipit-source-id: 079140372c128ee30e152c5626ef8f1127da36b1
2019-03-15 11:52:38 -07:00
Stanislau Hlebik
2e7a787a11 mononoke: handle getpackv1 request on Mononkoe
Summary:
The diff adds support for getpackv1 request. Supporting this request is
necessary because hg client will stop using getfiles soon.

There are two main differences between getfiles and getpackv1. getfiles returns
loose files formats, while getpackv1 returns wirepack pack file (same format as
used by gettreepack). getpackv1 supports fetching more than one filenode per
file.

Differential Revision: D14404234

fbshipit-source-id: cfaef6a2ebb76da2df68c05e838d89690f56a9f0
2019-03-15 11:52:38 -07:00
Stanislau Hlebik
eba5dc3706 mononoke: fix integration test
Summary: The order was changed after ec00921aece0adc6aaca49e5580bff52784c4ca5

Reviewed By: quark-zju

Differential Revision: D14482440

fbshipit-source-id: d13327ed16387e597ca6fc1cfab0787a13f38d00
2019-03-15 11:03:42 -07:00
Kostia Balytskyi
f77c59ccf1 mononoke: make sure sync job starts only after myrouter is usable
Summary:
We've see failures during the attempts to deploy this job to TW without such
waits. After adding the wait, things look better.

Reviewed By: StanislavGlebik

Differential Revision: D14456207

fbshipit-source-id: 8469932d7387060c026164ac97fa604453b0d296
2019-03-15 05:09:20 -07:00
Igor Abramov
a70e6d30c6 mononoke: remove HgNodeHash from hook_tailer
Summary: Replacing the usage of deprecated HgNodeHash with HgChangesetId.

Reviewed By: StanislavGlebik

Differential Revision: D14455700

fbshipit-source-id: 326f6b3bcea67062769093c037306f9a21bbbfa4
2019-03-14 14:22:08 -07:00
Jim Meyering
4f03a2f3cc fb-mononoke-admin: scm/mononoke/packman.yml: add 'packager: ONCALL' line (trivial)
Summary: Every packman-managed RPM in fbcode should now have a `packager: ONCALL` line in its packman.yml file. This diff adds one for fb-mononoke-admin. Assuming I found the right oncall, would you Accept+Ship this change?

Reviewed By: sunshowers

Differential Revision: D14399325

fbshipit-source-id: 5dd03b3f8722b4fb13b85acbe7702bc780b49f76
2019-03-12 19:15:27 -07:00
Jeremy Fitzhardinge
32330eb699 mononoke/bundle_resolver: remove unused lazy_static dep
Reviewed By: zertosh

Differential Revision: D14422817

fbshipit-source-id: a9cc62353e1f07211576d8a1d20d2c439dd1fdb8
2019-03-12 17:30:30 -07:00
Johan Schuijt-Li
758716b6a6 mononoke: increase getfiles timeout to 90 minutes
Summary: Increase timeout in line with observed operations.

Differential Revision: D14421000

fbshipit-source-id: 68941a5188e41c6dd7fbb3b59af0a912327f76a4
2019-03-12 07:14:00 -07:00
David Budischek
7b92ba7c25 Remove logging to scribe from blobrepo
Summary: See D14279065, this diff is simply to clean up the deprecated code

Reviewed By: StanislavGlebik

Differential Revision: D14279210

fbshipit-source-id: 10801fb04ad533a80bb7a2f9dcdf3ee5906aa68d
2019-03-12 04:50:45 -07:00
David Budischek
a76d7c1cdd Log pushrebase commits to scribe
Summary:
Currently we are logging new commits from BlobRepo. This will lead to issues once CommitCloud starts using Mononoke as we cannot differentiate between phases at that level. The solution is to log commits when they are pushrebased as this guarantees that they are public commits.

Note: This only introduces the new logic, cleaning up the existing implementation is part of D14279210

Reviewed By: StanislavGlebik

Differential Revision: D14279065

fbshipit-source-id: d714fae7164a8af815fc7716379ff0b7eb4826fb
2019-03-12 04:50:45 -07:00
Jun Wu
b02e32e02e remotenames: fix crash with hg-git + remotefilelog
Summary:
Fixes the below type error when pulling from a git repo using hg-git on my laptop:

    File "edenscm/hgext/remotenames.py", line 225, in expull
      pullremotenames(repo, remote, bookmarks)
    File "edenscm/hgext/remotenames.py", line 314, in pullremotenames
      path = activepath(repo.ui, remote)
    File "edenscm/hgext/remotenames.py", line 1464, in activepath
      rpath = _normalizeremote(remote.url)
    File "edenscm/hgext/remotenames.py", line 1439, in _normalizeremote
      u = util.url(remote)
    File "edenscm/hgext/hggit/__init__.py", line 164, in _url
      if not (path.startswith(pycompat.ossep) and ":" in path):
    AttributeError: 'function' object has no attribute 'startswith'

Basically, `peer.url()` is the API, `peer._url` is a private field that does
not always exist somehow.

Besides, further remove named branches that can crash hg-git with
NotImplementedError:

    File "edenscm/hgext/remotenames.py", line 225, in expull
      pullremotenames(repo, remote, bookmarks)
    File "edenscm/hgext/remotenames.py", line 322, in pullremotenames
      for branch, nodes in remote.branchmap().iteritems():
    File "edenscm/hgext/hggit/gitrepo.py", line 73, in branchmap
      raise NotImplementedError

Reviewed By: DurhamG

Differential Revision: D14144462

fbshipit-source-id: 2e886c639cf6689480f84626eaf0d5ec25512ea0
2019-03-11 15:23:23 -07:00
Jeremy Fitzhardinge
cb8bb26481 mononoke/glusterblob: use symlinks rather than relying on rename
Summary:
Apparently Gluster really can't copy with renames, so write to a
unique name, then symlink the canonical key to it. If the symlink already
exists, then we'll assume that the file already does, and remove the unique
name.

Reviewed By: StanislavGlebik

Differential Revision: D14014167

fbshipit-source-id: 1e5e2ce989652232d67d2aaac776e35127f58fb0
2019-03-11 14:02:28 -07:00
Jeremy Fitzhardinge
1e531b22bf mononoke/glusterblob: add more error context
Summary: Keep track of error causes so we can print better errors.

Reviewed By: StanislavGlebik

Differential Revision: D14014165

fbshipit-source-id: e9a7846256bbfbfd689e0d78f01b1ac50cf64c1b
2019-03-11 14:02:28 -07:00
Jeremy Fitzhardinge
9a63389c94 mononoke/glusterblob: use a shallower directory tree (FORMAT BREAKING)
Summary:
Reduce directory fan out levels to 2 wide ones (xxx/xxx) rather than 4 narrow
(xx/xx/xx/xx). This saves write latency cost: with 4 levels, until we get
~billions of blobs, every write will also be a mkdir, and we'll have many
single-entry directories. With 2 wide levels this will be true up to ~millions of
blobs, but then start to fill out the leaf directories.

The downside is that the leaf directory loading will be higher once we do have
billions of objects, but I think it will be managable.

This is NOT INTEROPERABLE with 4-level fanout, so invalidates existing stores.

Reviewed By: aslpavel

Differential Revision: D13923991

fbshipit-source-id: b93ddc49305c921f8a1b34606796b6d75273fb75
2019-03-11 14:02:28 -07:00
Jeremy Fitzhardinge
93d71fef7e mononoke/glusterblob: fix naming to conform to Gluster rsync hack
Summary:
Adding `.data` to the end breaks the "rsync hack" to keep files colocated on
the same node.

Reviewed By: aslpavel

Differential Revision: D14014284

fbshipit-source-id: c65b237ed03c9c8ea3a6ac239135820379b7e38d
2019-03-11 14:02:28 -07:00
Lukas Piatkowski
9398bf5231 hooks/verify_integrity: pass username and ssh env variables from CoreContext to verify_integrity.py
Summary: In this final diff for verify_integrity the data authorization data is being passed from hgcli (where the ssh connection is established) to Mononoke where it is further passed to verify_integrity script.

Reviewed By: StanislavGlebik

Differential Revision: D14387759

fbshipit-source-id: 2c0f9eef4128f5af0052276a1830ea2f449fb03a
2019-03-11 10:43:50 -07:00
Lukas Piatkowski
03d11a0169 core context: pass username and ssh env vars inside core context
Summary: The username and ssh vars are both properties of request, so they fit nicely inside per request CoreContext. They will be used in verify_integrity hook.

Reviewed By: StanislavGlebik

Differential Revision: D14385840

fbshipit-source-id: 9fe3cb96ffa89d8b017c730e37ca9ea4124ede0c
2019-03-11 10:43:50 -07:00
Lukas Piatkowski
9857627949 hgcli: pass ssh related env variables to Mononoke
Summary:
This additional data that is send to Mononoke will be used e.g. in verify_integrity hook.
This diff also contains change to the user_unixname, instead of passing env variable USER there we pass value produced by users crate. Since the user_unixname is not used anywhere now it is safe to do so.

Reviewed By: StanislavGlebik

Differential Revision: D14385280

fbshipit-source-id: 1e48c232fafbba5d5188c7d162e9ef21efd738f7
2019-03-11 10:43:50 -07:00
Stanislau Hlebik
c3898c81eb mononoke: getpackv1 params parsing
Summary:
This stack is about adding getpackv1 wireproto request support (see task for
more details).

This diff adds a Decoder trait implementation. It parses all parameters for a
single file (i.e. filename + list of nodes). This Decoder is combined with
the previous diff to fully parse getpackv1 request

Reviewed By: lukaspiatkowski

Differential Revision: D14401516

fbshipit-source-id: 9b5fa1f48de338e58a288eb0653bd734cd8d1623
2019-03-11 07:17:07 -07:00
Stanislau Hlebik
9ec3d19252 mononoke: make decode_getfiles_arg_stream generic
Summary:
The stack is about adding support for getpackv1 wireproto request.

This diff make decode_getfiles_arg_stream function generic over Decoder type.
At the moment decode_getfiles_arg_stream is used for unpacking `getfiles` wireproto
request. However getpackv1 packs request in a similar way to getfiles (which
is different from any other wireproto requests). Let's re-use the same
functionality for getpackv1

Reviewed By: lukaspiatkowski

Differential Revision: D14401517

fbshipit-source-id: ef0e9abeecec61c7c3d25b4a9e36da3f05c870cb
2019-03-11 07:17:07 -07:00
Lukas Piatkowski
9ef931f579 hooks/check_unittests: add proper intergration tests with mocking
Reviewed By: StanislavGlebik

Differential Revision: D14323720

fbshipit-source-id: 742e3db48d2ed7f767575585e319af2d7e79ff59
2019-03-11 07:11:41 -07:00
Stanislau Hlebik
d4e93edae5 mononoke: add copy/rename sources to list of conflict files in pushrebase
Summary:
Copy & rename sources must be included in the list of conflict files so that if
a copy was modified between root and `onto` bookmark then pushrebase should
fail with conflicts.

Note that some some merge cases are not handled yet - see TODO in the code

Reviewed By: lukaspiatkowski

Differential Revision: D14322036

fbshipit-source-id: d69bcceaa24987dd1e9d67e77f6a3205b580a7d8
2019-03-11 05:18:31 -07:00
Stanislau Hlebik
816305f75a monononoke: earlier merge detection in pushrebase
Summary:
Mononoke does not support pushrebasing over a merge commit. Previously
`find_closest_ancestor_root` didn't detect merges.
In cases like

```

o <- onto
|
o   o <- commit to pushrebase
|\ /
| o
o  <- main branch
...

```

`find_closest_ancestor_root` would go to the main branch and finally fail with
`RootTooFarBehind` error. By detecting merge commit earlier we could print
better error message and avoid doing useless traversal

Reviewed By: lukaspiatkowski

Differential Revision: D14321616

fbshipit-source-id: 2aa53a2627f25897a241616a429864f1cfca3100
2019-03-11 04:20:32 -07:00
Stanislau Hlebik
e6c8ef00aa mononoke: fix computing of changed files
Summary:
The problem was in using `file_changes()` of a bonsai object. If a file
replaces a directory, then it just returns an added file, but not a removed
directory.

However `changed_entry_stream` didn't return an entry if just it's mode was changed (i.e. file became executable, or file became a symlink). This diff fixes it as well

Let's use the same computing changing files method instead of `file_changes()`.

Differential Revision: D14279470

fbshipit-source-id: 976b0abd93646f7d68137c83cb07a8564922ce17
2019-03-08 06:28:49 -08:00
Mark Thomas
00b9ba5ba4 replycaps in tests can be different lengths
Summary:
In integration tests, the sent replycaps part can be different lengths
depending on client capabilities.  Usually this is globbed, but a couple
of places are missing.

Reviewed By: aslpavel

Differential Revision: D14363789

fbshipit-source-id: 5db161bd646c7a9fa8aeef2281ee7eb4d0c7771e
2019-03-08 03:04:03 -08:00
Liubov Dmitrieva
3883eb666e inifinitepush: raise error for unsupported commands with Mononoke
Summary:
Basically the supported ones are:

hg pushbackup
hg isbackedup -r <rev> --remote

Unsupported:
hg pullbackup
hg getavailablebackups
hg backupdelete
hg debugcheckbackup

Supported (client side):
hg backupenable
hg backupdisable
hg debugwaitbackup

Reviewed By: DurhamG

Differential Revision: D14106642

fbshipit-source-id: ebdea01b72333692b1a65d138c1dee21874a45c0
2019-03-07 07:56:07 -08:00
Lukas Piatkowski
b6d390acc1 hooks/check_unittests: use the intergraph endpoint result to make an accept/reject decision
Summary: This endpoint is also used in Mercurial now.

Reviewed By: StanislavGlebik

Differential Revision: D14303557

fbshipit-source-id: fe38b62d010de2846dcf800f93ba050d9c396873
2019-03-06 07:50:56 -08:00
Kostia Balytskyi
e561682ecd mononoke: rename crates to contain underscores instead of dashes
Summary: Let's not use dashes in crate names.

Reviewed By: StanislavGlebik

Differential Revision: D14341596

fbshipit-source-id: 85a7ded60cf2e326997ac70ee47a29116af97590
2019-03-06 07:18:28 -08:00
Lukas Piatkowski
4e8ca0cb7e hooks: extract phabricator message parsing into convienient module
Summary: The phabricator message parsing capability will be also used from check_unittests Rust hook, so it had to be extracted and adjusted to Rust standards.

Reviewed By: StanislavGlebik

Differential Revision: D14301561

fbshipit-source-id: 47b59527dfadd7b761f750825da52ffce14fdf21
2019-03-05 10:32:30 -08:00
Stanislau Hlebik
59de5e286e mononoke: add a test fo the issue with incorrectly computing changed files
Summary:
There's a bug in pushrebase. When a directory is replaced with a file, then
changed file list is computed incorrectly. This diff adds a test that
highlights the issue, next diff fixes it.

Differential Revision: D14279472

fbshipit-source-id: dbb8738e4cd0b2c025060e91b5772662c296f342
2019-03-04 06:18:14 -08:00
Stanislau Hlebik
94dcd8203c mononoke: change compute_changed_files
Summary:
Make compute_changed_files accept manifest id, it will be used in the next
diffs

Differential Revision: D14279468

fbshipit-source-id: eca92900ed8862bb6db38ff6c5ed5372d8206aa9
2019-03-04 06:18:13 -08:00
Stanislau Hlebik
0c5df091ea mononoke: rustfmt
Differential Revision: D14299676

fbshipit-source-id: 5da8769ef718abb44bbe65b5c670f5be13327359
2019-03-04 06:18:13 -08:00
Stanislau Hlebik
5951aaaac2 mononoke: rename p0/p1 to p1/p2
Summary: p1/p2 is more common, let's use that

Differential Revision: D14279469

fbshipit-source-id: 60c81e383cdbfeb2c9c0b30a682e37775c29d4e3
2019-03-04 06:18:13 -08:00
Mark Thomas
c4dd73553f strip mutation extras when pushrebasing commits
Summary:
In the future we will be introducing mutation recording in commit extras.  For
pushrebase, these fields need to be stripped when the commit is rebased.  This
matches the Mercurial server behaviour.

At some point we will update Mononoke pushrebase to fill in these fields with
the pushrebase information, but that can wait until it is more widely deployed.

Reviewed By: quark-zju

Differential Revision: D14263856

fbshipit-source-id: 78b682fc580695137fd1fd4a4f65210a77f16b24
2019-03-01 07:28:24 -08:00
Arun Kulshreshtha
dd88471bea remotefilelog: add debuggethistory command
Summary: This diff adds a new `hg debuggethistory` command that takes filenode/path pairs from stdin, fetches the history of the files from the API server, and writes the results to a historypack in the hg cache.

Reviewed By: quark-zju

Differential Revision: D14248082

fbshipit-source-id: 8014a758abd3a578ea213d8d3177812629b2fd51
2019-02-28 15:29:44 -08:00
Arun Kulshreshtha
2f0d6ae746 remotefilelog: attach edenapi client to repo object
Summary: The Eden API client in Mercurial should be a singleton. This diff assigns the client to `repo.edenapi` so that it is accessible throughout the code.

Reviewed By: quark-zju

Differential Revision: D14233314

fbshipit-source-id: 8e0ed22c32611e8f6e7d4461c3e31870d47a0e95
2019-02-28 15:29:44 -08:00
Zeyi Fan
5a5868c5f1 cache content sha1 (and file size) in memory
Summary: This diff uses `cachelib` to cache content SHA1 (and file size) in memory.

Reviewed By: StanislavGlebik

Differential Revision: D14011572

fbshipit-source-id: 957c1ff5e3db2393dd613943a521e5950c361554
2019-02-28 14:53:57 -08:00
Johan Schuijt-Li
5f4a2e3827 clienttelemetry: introduce support
Summary:
Client telemetry is used to send which commands are being run on the client,
which makes debugging slow sessions easier. For the client perspective, the
server hostname is send back so that the user knows to which physical host it's
connected, which is also useful debug info.

Reviewed By: StanislavGlebik

Differential Revision: D14261097

fbshipit-source-id: f4dc752671b76483f9dcb38aa4e3d16680087850
2019-02-28 10:34:47 -08:00
Johan Schuijt-Li
fff25e234f hgproto: rustfmt
Summary: Format code.

Reviewed By: StanislavGlebik

Differential Revision: D14261098

fbshipit-source-id: 8f9e2f8860fdcd24f91cbfef8974eb379c71049d
2019-02-28 10:34:47 -08:00
Kostia Balytskyi
ab9a38b97b mononoke: add scuba logging for mononoke_hg_sync_job
Summary:
We want to be able to reason about the progress of the sync job.
List of fields logged to [`mononoke_hg_sync`](https://our.intern.facebook.com/intern/scuba/query/?dataset=mononoke_hg_sync&pool=uber):
- reason
- entry
- repo_id
- succes
- err
- delay
- bookmark

Reviewed By: StanislavGlebik

Differential Revision: D14243842

fbshipit-source-id: 8ee3591be8f1dc9e1adca081b7b8eb51e7c6521a
2019-02-28 03:17:19 -08:00
Arun Kulshreshtha
c48b6b14b9 Fix conversion between HgHistoryEntry and LooseHistoryEntry
Summary:
When converting from Mononoke `HgHistoryEntry` to Mercurial's `LooseHistoryEntry`, rather than directly copying the parents, we need to implement remotefilelog's logic for handling copied files.

Specifically, a copied file will usually have 0 parents (or 1 in the case of a merge). The filenode of the original (pre-copy) file is stored separately in the file's copy info. In the remtoefilelog loose file format, the filenode of the original file is stored as the p1 for the copy file, and the merge parent (if any) of the file is stored as the p2.

Reviewed By: StanislavGlebik

Differential Revision: D14256997

fbshipit-source-id: 09a070fb95d8b6c08c26e73156123d33cbfc685d
2019-02-28 02:53:05 -08:00
Arun Kulshreshtha
b500ad4311 Correctly set linknode during LooseHistoryEntry conversion
Summary: The code was accidentally setting the linknode for every entry to be the same as the filenode. This diff fixes the issue.

Differential Revision: D14251788

fbshipit-source-id: f0512c4c6ff59e2d22df0b42b4ee52a20f77a88f
2019-02-27 17:26:24 -08:00
Arun Kulshreshtha
2c58d0616a Make history fetching depth configurable
Summary: Add an optional `depth` parameter to the `getfilehistory` endpoint, allowing the caller to specify the maximum number of history entries to fetch.

Differential Revision: D14222991

fbshipit-source-id: 8b28c9674e764f0098a9780f94ef2957ef117f09
2019-02-27 12:43:57 -08:00