facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-12-29 08:02:24 +03:00
Code Issues Projects Releases Wiki Activity

mononoke/blobstore_healer: wait for MyRouter properly

Browse Source 
Summary:
The blobstore_healer has never waited for MyRouter before querying for slave
status, but it ended up implicitly working because creating a blobstore
required a SQL factory, and creating a SQL factory would result in waiting for
MyRouter.

Now that creating a blobstore doesn't require SQL factory unless you're going
to actually use it (which the healer isn't: it doesn't use a multiplexblob, it
uses the underlying blobstores instead), we no longer wait properly for
MyRouter, so if MyRouter isn't there when we boot, we crash.

This fixes that.

Reviewed By: ahornby

Differential Revision: D20094829

fbshipit-source-id: 82b7e8d893a01049d1f434ee8dff36a877a0d2f4
This commit is contained in:
Thomas Orozco 2020-02-25 07:01:43 -08:00 committed by Facebook Github Bot
parent 693e8dee0a
commit f8fcbc9723
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
eden/mononoke/cmds/blobstore_healer/main.rs
View File

@ -14,14 +14,14 @@ mod replication_lag;
use anyhow::{bail, format_err, Error, Result};
use blobstore::Blobstore;
use blobstore_factory::{make_blobstore, BlobstoreOptions, ReadOnlyStorage};
use blobstore_factory::{make_blobstore, make_sql_factory, BlobstoreOptions, ReadOnlyStorage};
use blobstore_sync_queue::{BlobstoreSyncQueue, SqlBlobstoreSyncQueue};
use chrono::Duration as ChronoDuration;
use clap::{value_t, App, Arg};
use cloned::cloned;
use cmdlib::{
args::{self, get_scuba_sample_builder},
helpers::{block_execute, open_sql_with_config_and_mysql_options},
helpers::block_execute,
};
use configerator::ConfigeratorAPI;
use context::{CoreContext, SessionContainer};
@ -132,12 +132,15 @@ fn maybe_schedule_healer_for_storage(
s => bail!("Storage doesn't use Multiplexed blobstore, got {:?}", s),
};
let sync_queue = open_sql_with_config_and_mysql_options::<SqlBlobstoreSyncQueue>(
let sync_queue = make_sql_factory(
fb,
queue_db,
mysql_options,
readonly_storage,
);
ctx.logger().clone(),
)
.and_then(|sql_factory| sql_factory.open::<SqlBlobstoreSyncQueue>())
.map(|q| q as Arc<dyn BlobstoreSyncQueue>);
let blobstores: HashMap<_, BoxFuture<Arc<dyn Blobstore + 'static>, _>> = {
let mut blobstores = HashMap::new();
@ -179,9 +182,7 @@ fn maybe_schedule_healer_for_storage(
.map(|blobstores| blobstores.into_iter().collect::<HashMap<_, _>>());
let sync_queue = if !dry_run {
sync_queue
.map(|q| Arc::new(q) as Arc<dyn BlobstoreSyncQueue>)
.boxify()
sync_queue.boxify()
} else {
sync_queue
.map({