diff --git a/eden/mononoke/blobstore/factory/src/sql.rs b/eden/mononoke/blobstore/factory/src/sql.rs index 1edc47bafd..61ab2f5f48 100644 --- a/eden/mononoke/blobstore/factory/src/sql.rs +++ b/eden/mononoke/blobstore/factory/src/sql.rs @@ -112,6 +112,7 @@ impl MetadataSqlFactory { self.fb, global_connection_pool.clone(), pool_config.clone(), + label, config.primary.db_address.clone(), self.mysql_options.read_connection_type(), self.readonly.0, diff --git a/eden/mononoke/blobstore/sqlblob/src/lib.rs b/eden/mononoke/blobstore/sqlblob/src/lib.rs index f8a7af1681..85656a74f4 100644 --- a/eden/mononoke/blobstore/sqlblob/src/lib.rs +++ b/eden/mononoke/blobstore/sqlblob/src/lib.rs @@ -66,6 +66,8 @@ const SQLITE_SHARD_NUM: NonZeroUsize = nonzero!(2_usize); const SINGLE_SHARD_NUM: NonZeroUsize = nonzero!(1_usize); const GC_GENERATION_PATH: &str = "scm/mononoke/xdb_gc/default"; +const SQLBLOB_LABEL: &str = "blobstore"; + // Test setup data const UPDATE_FREQUENCY: Duration = Duration::from_millis(1); const INITIAL_VERSION: u64 = 0; @@ -117,7 +119,7 @@ impl Sqlblob { port, read_con_type, PoolSizeConfig::for_sharded_connection(), - "blobstore".into(), + SQLBLOB_LABEL.into(), readonly, )) .into_future() @@ -153,7 +155,7 @@ impl Sqlblob { port, read_con_type, PoolSizeConfig::for_sharded_connection(), - "blobstore".into(), + SQLBLOB_LABEL.into(), readonly, )) .into_future() @@ -186,6 +188,7 @@ impl Sqlblob { fb, global_connection_pool, pool_config, + SQLBLOB_LABEL.into(), shardmap.clone(), 0..shard_count, read_con_type, @@ -254,6 +257,7 @@ impl Sqlblob { fb, global_connection_pool.clone(), pool_config, + SQLBLOB_LABEL.into(), db_address.clone(), read_con_type, readonly, diff --git a/eden/mononoke/common/rust/sql_ext/src/oss.rs b/eden/mononoke/common/rust/sql_ext/src/oss.rs index d7be1a8d49..02e6c5c2e3 100644 --- a/eden/mononoke/common/rust/sql_ext/src/oss.rs +++ b/eden/mononoke/common/rust/sql_ext/src/oss.rs @@ -76,6 +76,7 @@ pub fn create_mysql_connections_unsharded( _fb: FacebookInit, _connection_pool: SharedConnectionPool, _pool_config: PoolConfig, + _label: String, _tier: String, _read_con_type: ReadConnectionType, _readonly: bool, @@ -97,6 +98,7 @@ pub fn create_mysql_connections_sharded( _fb: FacebookInit, _connection_pool: SharedConnectionPool, _pool_config: PoolConfig, + _label: String, _shardmap: String, _shards: S, _read_con_type: ReadConnectionType,