mononoke: switch back to thrift manifold

Summary:
The issues were fixed, and also thrift manifold works better during bulk
blobimport.

Reviewed By: farnz

Differential Revision: D9132384

fbshipit-source-id: ab4a04eeff86bb4968b80af00c404fad710db183
This commit is contained in:
Stanislau Hlebik 2018-08-15 01:41:56 -07:00 committed by Facebook Github Bot
parent 66f683760d
commit 75452452b5

View File

@ -42,7 +42,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,
@ -252,11 +252,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 blob_pool = Arc::new(cachelib::get_pool("blobstore-blobs").ok_or(Error::from(
ErrorKind::MissingCachePool("blobstore-blobs".to_string()),