mononoke: Back out "mononoke/mysql: group ODS counters by shardmap"

Summary:
Original commit changeset: 0708a4b0dc37

It seem to be the reason of sql timeouts on mononoke startup

Differential Revision: D27337030

fbshipit-source-id: 7b154c09397b0e297e18b186a6338ab801b1769d
This commit is contained in:
Stanislau Hlebik 2021-03-26 01:00:35 -07:00 committed by Facebook GitHub Bot
parent 3615dbc4a8
commit a8b983db80
3 changed files with 2 additions and 9 deletions

View File

@ -112,7 +112,6 @@ 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,

View File

@ -67,8 +67,6 @@ 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;
@ -120,7 +118,7 @@ impl Sqlblob {
port,
read_con_type,
PoolSizeConfig::for_sharded_connection(),
SQLBLOB_LABEL.into(),
"blobstore".into(),
readonly,
);
async move { Ok(res) }
@ -156,7 +154,7 @@ impl Sqlblob {
port,
read_con_type,
PoolSizeConfig::for_sharded_connection(),
SQLBLOB_LABEL.into(),
"blobstore".into(),
readonly,
);
async move { Ok(res) }
@ -193,7 +191,6 @@ impl Sqlblob {
fb,
global_connection_pool,
pool_config,
SQLBLOB_LABEL.into(),
shardmap.clone(),
0..shard_count,
read_con_type,
@ -251,7 +248,6 @@ impl Sqlblob {
fb,
global_connection_pool.clone(),
pool_config,
SQLBLOB_LABEL.into(),
db_address.clone(),
read_con_type,
readonly,

View File

@ -76,7 +76,6 @@ pub fn create_mysql_connections_unsharded(
_fb: FacebookInit,
_connection_pool: SharedConnectionPool,
_pool_config: PoolConfig,
_label: String,
_tier: String,
_read_con_type: ReadConnectionType,
_readonly: bool,
@ -98,7 +97,6 @@ pub fn create_mysql_connections_sharded<S>(
_fb: FacebookInit,
_connection_pool: SharedConnectionPool,
_pool_config: PoolConfig,
_label: String,
_shardmap: String,
_shards: S,
_read_con_type: ReadConnectionType,