switch to thrift backed manifold client

Summary: This commit removes the usage of the old manifold client so we can get rid of `tokio_io::Remote`;

Reviewed By: jsgf

Differential Revision: D8751815

fbshipit-source-id: 41ab75076f1b2591496919ea91eb6b1d4d7ae506
This commit is contained in:
Zeyi Fan 2018-07-17 11:34:13 -07:00 committed by Facebook Github Bot
parent b3b1b0e4ed
commit 59103d8996

View File

@ -36,7 +36,7 @@ use delayblob::DelayBlob;
use dieselfilenodes::{MysqlFilenodes, SqliteFilenodes, DEFAULT_INSERT_CHUNK_SIZE};
use fileblob::Fileblob;
use filenodes::{CachingFilenodes, FilenodeInfo, Filenodes};
use manifoldblob::ManifoldBlob;
use manifoldblob::ThriftManifoldBlob;
use mercurial::file::File;
use mercurial_types::{Changeset, Entry, HgBlob, HgBlobNode, HgChangesetId, HgFileEnvelopeMut,
HgFileNodeId, HgManifestEnvelopeMut, HgManifestId, HgNodeHash, HgParents,
@ -253,11 +253,8 @@ impl BlobRepo {
let bookmarks = MysqlDbBookmarks::open(&connection_params)
.context(ErrorKind::StateOpen(StateOpenError::Bookmarks))?;
let blobstore = ManifoldBlob::new_with_prefix(
args.bucket.clone(),
&args.prefix,
args.max_concurrent_requests_per_io_thread,
);
let blobstore = ThriftManifoldBlob::new(args.bucket.clone())?;
let blobstore = PrefixBlobstore::new(blobstore, format!("flat/{}", args.prefix));
let blobstore = new_memcache_blobstore(blobstore, "manifold", args.bucket.as_ref())?;
let blobstore = MemoizedBlobstore::new(blobstore, usize::MAX, args.blobstore_cache_size);