Commit Graph

681 Commits

Author SHA1 Message Date
Lukas Piatkowski
03255529fa CODEMOD: rename mercurial::NodeHash to HgNodeHash
Reviewed By: sid0

Differential Revision: D7619973

fbshipit-source-id: 229fea891788c33eb1f45446ba2333e945ca5553
2018-04-16 03:40:25 -07:00
Lukas Piatkowski
086640fdd0 CODEMOD: rename mercurial_types::BlobNode to DBlobNode
Summary: mercurial_types::DBlobNode should be replaced by types from mononoke_types or mercurial in most cases. This rename should help with tracking this

Reviewed By: sid0

Differential Revision: D7619793

fbshipit-source-id: 261fd92acae825dc4bc8011c3716c5585eb0413c
2018-04-16 03:40:25 -07:00
Lukas Piatkowski
9436963e20 CODEMOD: rename mercurial_types::Parent to DParent
Summary: mercurial_types::DParent should be replaced by types from mononoke_types or mercurial in most cases. This rename should help with tracking this

Reviewed By: sid0

Differential Revision: D7619686

fbshipit-source-id: 5ad105113779387f1408c806860483e06ed5fb3d
2018-04-16 03:40:25 -07:00
Lukas Piatkowski
c35a537aaa CODEMOD: rename mercurial_types::EntryId to DEntryId
Summary: mercurial_types::DEntryId should be replaced by types from mononoke_types or mercurial in most cases. This rename should help with tracking this

Reviewed By: sid0

Differential Revision: D7619571

fbshipit-source-id: bf8d81ec9ffe6a5525d923d7ee67d8e92498aa4d
2018-04-16 03:40:24 -07:00
Lukas Piatkowski
73034a99b2 CODEMOD: rename mercurial_types::HgFileNodeId to DFileNodeId
Summary: mercurial_types::DFileNodeId should be replaced by types from mononoke_types in most cases. This rename should help with tracking this

Reviewed By: sid0

Differential Revision: D7619290

fbshipit-source-id: aa6a8e55ae3810c4531028c3b3db2e5730fe7846
2018-04-16 03:40:24 -07:00
Lukas Piatkowski
7e05a01ce5 CODEMOD: rename mercurial_types::HgManifestId to DManifestId
Summary: mercurial_types::DManifestId should be replaced by types from mononoke_types in most cases and by mercurial::HgManifestId in others. This rename should help with tracking this

Reviewed By: sid0

Differential Revision: D7619062

fbshipit-source-id: 447224194c6555334b64dc29ebabe3ef0d0cb87e
2018-04-16 03:40:24 -07:00
Lukas Piatkowski
f6c3f72745 CODEMOD: rename mercurial_types::HgChangesetId to DChangesetId
Summary: mercurial_types::DChangesetId should be replaced by types from mononoke_types in most cases and by mercurial::HgChangesetId in others. This rename should help with tracking this

Reviewed By: sid0

Differential Revision: D7618897

fbshipit-source-id: 78904f57376606be99b56662164e0c110e632c64
2018-04-16 03:40:24 -07:00
Lukas Piatkowski
16cbfd5133 CODEMOD: rename mercurial_types::NodeHash to DNodeHash
Summary: mercurial_types::NodeHash should be replaced by types from mononoke_types in most cases and by mercurial::NodeHash in others. This rename should help with tracking this fact.

Reviewed By: sid0

Differential Revision: D7618389

fbshipit-source-id: a876e723d911df626c7851fba56a056843b4e049
2018-04-16 03:40:24 -07:00
Siddharth Agarwal
528c76e082 mononoke-types: introduce a MononokeId trait
Summary:
Turns out this trait is actually really useful. In this case it'll be
used to generate blobstore types.

Reviewed By: StanislavGlebik

Differential Revision: D7608152

fbshipit-source-id: 792de037c8b028172f868b9b035ede3db9a39788
2018-04-13 11:34:14 -07:00
Siddharth Agarwal
76e544e0e8 mononoke-types: change context keys to lowercase strings
Summary:
This is going to make life more convenient in upcoming diffs, when these strings are going to be used to generate blobstore keys.

The switch to lowercase is to make those blobstore keys look nicer.

The switch to string literals is because Rust really supports strings a lot better than it does bytestrings. In particular, `concat!` for literals works with strings, but there's no equivalent for bytestring literals. For current purposes the two are equivalent -- there's no runtime cost to using a string literal here.

Reviewed By: StanislavGlebik

Differential Revision: D7598616

fbshipit-source-id: f2fa543429921cca5fd8dc354ea11000fdab3f76
2018-04-13 11:34:14 -07:00
Siddharth Agarwal
cfa658339c mononoke-types: add a revision to copy info
Summary:
If there are multiple parents, it is important to know which parent to
follow for copy information.

Reviewed By: StanislavGlebik

Differential Revision: D7597811

fbshipit-source-id: 74bb0080671b18beb5483b978016bf66a9496967
2018-04-13 11:34:14 -07:00
Siddharth Agarwal
f7c39a56c8 blobrepo: add some comments around copy info
Summary:
I haven't actually fixed the bug here because that's quite a bit of work that
will hopefully soon be somewhat moot.

Reviewed By: StanislavGlebik

Differential Revision: D7594278

fbshipit-source-id: b29861c71628a7dc903d6405c3348a9e41002fba
2018-04-13 11:34:14 -07:00
Siddharth Agarwal
497daaa17f bundle2-resolver: switch filelog from using HgBlob to Bytes
Summary:
I'm adding a non-`HgBlob` path separately, and using `HgBlob` here is
inconvenient.

Reviewed By: StanislavGlebik

Differential Revision: D7589854

fbshipit-source-id: 21e425e7d70691b982dbd66b1ea4996d1e0eef66
2018-04-13 11:34:14 -07:00
Corbin Hall
ba4c029396 Update Mononoke to use with_context on futures/streams
Summary: Migrates some uses of `.map_err()` and `.context(format!())` usage in Mononoke to `.with_context()`

Reviewed By: lukaspiatkowski

Differential Revision: D7607935

fbshipit-source-id: 551538c78a1755f7aa0716532ab437a1baf6dd89
2018-04-13 11:00:42 -07:00
Lukas Piatkowski
7ab8e03937 server: gettreepack method preparation to return remapped Root Manifest hashes
Summary:
This should be mostly a no-op change, only the types change so that it prepares this code to be able to remap Root Manifest ids.
There is one small logical change that I am also shipping here, which is that fetching of linknode is happening in parallel with fetching of parents and content of the entry.

Reviewed By: StanislavGlebik

Differential Revision: D7600960

fbshipit-source-id: 2233f1c7d6f14e38cb075b5d7f40339d61cbf574
2018-04-13 10:00:03 -07:00
Lukas Piatkowski
78dd4b52a3 server: getbundle request returning mercurial's NodeHash instead of Mononoke's
Summary: getbundle returns changelogs back to Mercurial, so it's IDs should be retrieved from the remapping tables. This diff prepares it for that change

Reviewed By: StanislavGlebik

Differential Revision: D7600959

fbshipit-source-id: e586a92b272e604a1de2619feb9838e982dd802c
2018-04-13 10:00:03 -07:00
Lukas Piatkowski
935a973bd9 hgproto: use mercurial::NodeHash in hgproto handling
Summary:
mercurial::NodeHash is the representation of Mercurial's Sha1 hash, so it should be used to parse and generate hgproto.
This diff doesn't not change two crucial places that are required for full coverage of NodeHash remapping in future:
- Bundle2's tree manifest generation code
- Bundle2's resolver code
Those will be added in dependent diffs

Reviewed By: sid0

Differential Revision: D7600471

fbshipit-source-id: 40e05d5cce6c454200169f6f0049e57d427e9403
2018-04-13 10:00:03 -07:00
Lukas Piatkowski
dd3c638c1d api cleanup: clean api of mercurial and mercurial_types NodeHash
Summary:
This is a cleanup of NodeHash API. There were few unused methods and few ways to convert between mercurial and mercurial_types hashes. With this diff it is very easy to identify the places where this converstion happens.
A followup of this diff will be to use this new API to easily replace the NodeHash convertions in places where it requires remapping.

Reviewed By: sid0

Differential Revision: D7592876

fbshipit-source-id: 6875aa6df1a3708ce54ca5724f6eb960d179192b
2018-04-13 10:00:03 -07:00
Stanislau Hlebik
9d6f639389 mononoke: always fill changesets table
Summary:
Let's fill cs table even if we import only part of the repo. This let's us
import new changesets incrementally.

That can be dangerous since we don't check if parent commits are present.
However this blobimport is a temporary measure until we get a full-fidelity
blobimport that uses a commit API.

Reviewed By: jsgf

Differential Revision: D7485495

fbshipit-source-id: 63ba91bad4eb1c1662db73293c76a506f48a4753
2018-04-13 03:58:22 -07:00
Stanislau Hlebik
d2558d0d6c mononoke: remove linknodes
Summary: They are no longer used in Mononoke and they were replaced with filenodes

Reviewed By: farnz

Differential Revision: D7443319

fbshipit-source-id: 91769de0d4db9f3adf9290070d459c13aa4ed8cc
2018-04-13 02:47:24 -07:00
Stanislau Hlebik
c1e33531e1 mononoke: regenerate test fixtures
Summary:
Blobimport no longer create linknodes, instead it creates filenodes.
Update test fixtures

Reviewed By: farnz

Differential Revision: D7443318

fbshipit-source-id: c400f9fa780cbc10942b413ceca3990de1132802
2018-04-13 02:47:24 -07:00
Stanislau Hlebik
89befdb26d mononoke: avoid using linknodes
Summary: They are replaced by filenodes

Reviewed By: farnz

Differential Revision: D7443320

fbshipit-source-id: 13c7d07bc00dcbaa991663c8da8a07fcb0de1332
2018-04-13 02:47:24 -07:00
Siddharth Agarwal
fe4b00a6ce bundle2-resolver: rename UploadableBlob to UploadableHgBlob
Summary: Follows from D7565808.

Reviewed By: farnz

Differential Revision: D7578765

fbshipit-source-id: df472b121bf7a544a15ea191035799e9d3e1e07a
2018-04-11 13:42:31 -07:00
Siddharth Agarwal
361ae35558 mercurial: define a HgNodeKey key for node keys
Summary:
This is used in a bunch of places throughout bundle2-resolver, and is
the default key that should be used throughout Mercurial.

Reviewed By: farnz

Differential Revision: D7578081

fbshipit-source-id: 8f44b54189b22b0aba8f08853bbd2bbbaa3efc5c
2018-04-11 13:42:31 -07:00
Siddharth Agarwal
8e7a1acc0f mercurial-types: rename Blob to HgBlob
Summary:
This will probably go away soon, but for now I want to be able to
disambiguate the new Thrift-encoded blobs in Mononoke from these.

Reviewed By: StanislavGlebik

Differential Revision: D7565808

fbshipit-source-id: d61f3096fa368b934a923dee54a0ea1e3469ae0d
2018-04-11 13:42:31 -07:00
Siddharth Agarwal
228fcb589b mercurial-types: treat transitions between different file types as modified
Summary: Need this for correct bonsai changeset generation.

Reviewed By: StanislavGlebik

Differential Revision: D7561512

fbshipit-source-id: 3af820426532f77e78c4828f25b7382738fdad6b
2018-04-11 13:42:31 -07:00
Siddharth Agarwal
ead5f3be95 mercurial-types: rename left -> from, right -> to
Summary:
`left` and `right` are too vague in this context, since there's
already `Added` and `Removed` which imply an explicit direction.

Reviewed By: StanislavGlebik

Differential Revision: D7560975

fbshipit-source-id: 847f600508434d62857ff60a6e6678a4426ffa88
2018-04-11 13:42:31 -07:00
Siddharth Agarwal
942c4c5045 mercurial-types-mocks: allow hashes to also be set
Summary: Need this for bonsai changeset tests

Reviewed By: StanislavGlebik

Differential Revision: D7560093

fbshipit-source-id: caa0f92fa7ef1c1adb7775835615cb1cb3c7b6aa
2018-04-10 12:14:32 -07:00
Siddharth Agarwal
4929532fe8 mercurial-types-mocks: implement lookup on manifests
Summary:
This is going to be useful to test out some of the work I'm doing with
generating bonsai changesets.

Reviewed By: StanislavGlebik

Differential Revision: D7555735

fbshipit-source-id: 26175244ed59ba080e1740d004d299d4d15ff593
2018-04-10 12:14:32 -07:00
Siddharth Agarwal
e25f690275 mononoke-types-mocks: fix make_file to set the right content type
Summary: Found while writing a test against this.

Reviewed By: StanislavGlebik

Differential Revision: D7555159

fbshipit-source-id: c6f279f41974e08ab690befcc84718c2bb22ddc0
2018-04-10 12:14:32 -07:00
Siddharth Agarwal
57671d0907 mercurial-types-mocks: use swap_remove
Summary: review comments by jsgf

Reviewed By: StanislavGlebik

Differential Revision: D7554533

fbshipit-source-id: ca55036485218e23386b9d8b5d3ff1e2db6d9ce5
2018-04-10 12:14:32 -07:00
Stanislau Hlebik
ef200c69f4 mononoke: add buffered() to treepack generation
Summary:
It increases parallelism, hence speeds up gettreepack request.

Note that currently buffer size is hardcoded. We may change it later, but
right now let's not add too many config knobs.

Reviewed By: farnz

Differential Revision: D7568349

fbshipit-source-id: d1833f1f64438da96c619746d205733af406c921
2018-04-10 10:53:00 -07:00
Stanislau Hlebik
d25271ee8b mononoke: buffer file requests
Summary:
Buffering many file requests increases parallelism.

Note that currently buffer size is hardcoded. We may change it later, but right
now let's not add too many config knobs.

Reviewed By: farnz

Differential Revision: D7568348

fbshipit-source-id: 80456d189cc21d050fcaf7d17cabf8cd59d61d63
2018-04-10 10:52:59 -07:00
Lukas Piatkowski
26d1084ff6 removing unused commands and the corresponding request parsing code
Reviewed By: farnz

Differential Revision: D7568887

fbshipit-source-id: 00f616b745bca746881237ee4eacd1ac42259292
2018-04-10 09:03:40 -07:00
Stanislau Hlebik
b9ecca27bc mononoke: add more tracing
Summary:
Trace parent fetching and linknode fetching for gettreepack

And trace blobstore calls. Note that we are interested in tracing both single
blobstore call and in the retrying manifold calls. Because there can be short
single blobstore calls that fail, but overall retrying manifold call can take a few
seconds.

Reviewed By: farnz

Differential Revision: D7550958

fbshipit-source-id: d607812f558900ee55ddd61b529b7b43e9827f49
2018-04-10 02:52:48 -07:00
Stanislau Hlebik
a80444ed6a mononoke: use async_unit in mercurial_types
Summary:
tokio::run either hangs forever or reports no error at all if test fails. So
let's use async_unit

Reviewed By: farnz

Differential Revision: D7550921

fbshipit-source-id: 5114700bb932fdcd9229da760007703c3b73e11e
2018-04-10 02:22:51 -07:00
Stanislau Hlebik
3c5f2212c0 mononoke: fix select_all()
Summary:
In previous diff upstream select_all() was added. However it had a bug.
In
```
match self.inner.poll() {
...
Async::Ready(_) => {
  return Async::Ready(None);
}
}
```

Async::Ready(None) was returned for the case when inner poll returned  `Async::Ready(None)`
and for the case when inner poll returned `Async::Ready(Some(None, remaining))`.
The former was correct, however the latter wasn't. `Async::Ready(Some(None, remaining))`
happens when one of the internal streams was exhausted, however there can be
many more internal streams that are not exhausted yet. Before this diff these
non-exhausted elements would be just lost, so this diff fixes it.

Reviewed By: farnz

Differential Revision: D7550918

fbshipit-source-id: 908af9fed17744b884aa40afdccfc4654520048b
2018-04-10 02:22:51 -07:00
Stanislau Hlebik
32a914edb6 mononoke: copy-paste select_all method from futures-0.2.0
Summary:
This is a simple but useful combinator that queries lots of streams in parallel
and merges the results.
This is code is taken from futures-0.2.0, but it was modified so that it works
with futures-0.1.*. It was re-formatted with our linter.

The code had a bug that will be fixed in the next diffs

Reviewed By: farnz

Differential Revision: D7550919

fbshipit-source-id: c5b394065c0184a89dfab6a9de699725bc2bd6c2
2018-04-10 02:22:51 -07:00
Lukas Piatkowski
d1859f8222 Fix the test that require config metarepo
Reviewed By: farnz

Differential Revision: D7552656

fbshipit-source-id: 89da8c11535fee049ae72a5ed875f7bb994d22e9
2018-04-09 15:07:57 -07:00
Siddharth Agarwal
32f1a4ef03 mercurial-types: represent symlinks as blobs, not paths
Summary:
There's no guarantee that a symlink is a valid `MPath` -- in fact, it
frequently will be an absolute symlink which is not a valid `MPath`.

Reviewed By: lukaspiatkowski

Differential Revision: D7541672

fbshipit-source-id: c7eca54cd06e811cf54932ab8f671c13a62b5f71
2018-04-09 12:06:57 -07:00
Siddharth Agarwal
25f99bf472 mononoke-types: make most fields of BonsaiChangeset unqualified or optional
Summary:
This will help in case we ever need to abandon this format in the
future.

Reviewed By: jsgf

Differential Revision: D7483425

fbshipit-source-id: 0cca098ca861cca0994c06709849ececffb38fc5
2018-04-09 12:06:57 -07:00
Stanislau Hlebik
27d46fd45c mononoke: change the schema of bookmarks table
Summary:
Bump bookmark size limit - we use 512 for infinitepush, let's use the same
here. Also add a primary key

Reviewed By: farnz

Differential Revision: D7534967

fbshipit-source-id: aeef926de910a3a9934fb1588778f8f503821071
2018-04-09 08:03:51 -07:00
Stanislau Hlebik
9a132310e6 mononoke: add logging for lookup() method
Reviewed By: farnz

Differential Revision: D7534943

fbshipit-source-id: ede4ef930b6b9674b2c6ab1fbc8425f6ec458730
2018-04-09 08:03:51 -07:00
Stanislau Hlebik
e702e89c81 mononoke: more efficient known() method
Summary: Since we have changesets, we can answer known queries more efficiently.

Reviewed By: farnz

Differential Revision: D7534911

fbshipit-source-id: 72f75c9d9a6cd7f1464660eb0ec16f94ca24f33c
2018-04-07 11:05:32 -07:00
Stanislau Hlebik
b145efaa1a mononoke: trace gettreepack
Summary: Same as with getfiles tracing

Reviewed By: farnz

Differential Revision: D7501835

fbshipit-source-id: afca8910147c49322a4f3d7e12fe3b8ad3c88675
2018-04-07 11:05:32 -07:00
Stanislau Hlebik
67af16c4cd mononoke: add getfiles tracing
Summary:
Trace all interesting events in getfiles request: fetching file content,
parents, linknodes etc

Reviewed By: kulshrax

Differential Revision: D7500351

fbshipit-source-id: 3ba8d9d323da00a9f8b2172200ac2b258bc6e6f6
2018-04-07 11:05:32 -07:00
Siddharth Agarwal
667ab89301 mercurial-types-mocks: redo the way mock manifests are defined
Summary:
The current structure makes defining new manifests really verbose and
doesn't easily support nested manifests. Make it really simple: either accept a
path map or a description (a csv).

Also switch to a `BTreeMap` to allow lookups in the next diff.

This is unfortunately hard to separate out because all the bits are
interconnected.

Reviewed By: StanislavGlebik

Differential Revision: D7531115

fbshipit-source-id: ca0fa35d4e0ac6a4e23adb2a7d2b5679ce52b643
2018-04-06 13:16:55 -07:00
Siddharth Agarwal
34829b7600 mercurial-types-mocks: better type for make_file
Summary: Better and more efficient.

Reviewed By: farnz

Differential Revision: D7530674

fbshipit-source-id: ab161354fd0dcb98bd1d20836e5d1a17a7fba7a7
2018-04-06 13:16:55 -07:00
Siddharth Agarwal
7cb68c0c60 mercurial-types: make the Type enum use FileType
Summary:
Since `FileType` now exists, the `Type` enum can use it instead of
defining its own stuff.

Reviewed By: farnz

Differential Revision: D7526046

fbshipit-source-id: 3b8eb5502bee9bc410ced811dc019c1ce757633f
2018-04-06 13:16:55 -07:00
Arun Kulshreshtha
ecc05868af Write traces to Scuba in Mononoke server
Summary: Update the Scuba logging code in Mononoke server to also upload traces to Everstore

Reviewed By: jsgf, farnz

Differential Revision: D7492955

fbshipit-source-id: 6f0f788af33210064977894b97798bb4143caf1b
2018-04-06 11:34:00 -07:00