Skip to content

Commit

Permalink
[201911][db_migrator][Mellanox] Update Mellanox buffer migrator with …
Browse files Browse the repository at this point in the history 
…2km-cable supported (sonic-net#1575)

Update mellanox buffer migrator with 2km-cable supported
  • Loading branch information
@stephenxs
stephenxs authored Jun 8, 2021
1 parent 2e4c896 commit 0fa5893
Show file tree
Hide file tree
Showing 33 changed files with 42,326 additions and 16 deletions.
19 changes: 17 additions & 2 deletions scripts/db_migrator.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def __init__(self, namespace, socket=None):
none-zero values.
build: sequentially increase within a minor version domain.
"""
self.CURRENT_VERSION = 'version_1_0_4'
self.CURRENT_VERSION = 'version_1_0_6'

self.TABLE_NAME = 'VERSIONS'
self.TABLE_KEY = 'DATABASE'
Expand Down Expand Up @@ -233,10 +233,25 @@ def version_1_0_4(self):

def version_1_0_5(self):
"""
Current latest version. Nothing to do here.
Version 1_0_5.
"""
log.log_info('Handling version_1_0_5')

# Check ASIC type, if Mellanox platform then need DB migration
if self.asic_type == "mellanox":
if self.mellanox_buffer_migrator.mlnx_migrate_buffer_pool_size('version_1_0_5', 'version_1_0_6') and self.mellanox_buffer_migrator.mlnx_migrate_buffer_profile('version_1_0_5', 'version_1_0_6'):
self.set_version('version_1_0_6')
else:
self.set_version('version_1_0_6')

return 'version_1_0_6'

def version_1_0_6(self):
"""
Current latest version. Nothing to do here.
"""
log.log_info('Handling version_1_0_6')

return None

def get_version(self):
Expand Down
84 changes: 73 additions & 11 deletions scripts/mellanox_buffer_migrator.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
Migrate buffer configuration to the default one in the new version automatically
if the configuration matched the default on in the old version.
Current version: 1.0.5 for shared headroom pool support on 201911
Current version: 1.0.6 for 2km cable support
Historical version:
- 201911:
- 1.0.5 for shared headroom pool support
- 1.0.4 for optimized headroom calculation:
- For Microsoft SKUs, calculate headroom with small packet percentage as 50%
- For all SKUs, fix some bugs in the formula
Expand Down Expand Up @@ -290,7 +291,20 @@ def __init__(self, configDB):
},
"version_1_0_5": {
# version 1.0.5 is introduced for shared headroom pools
"pool_configuration_list": ["spc1_t0_pool", "spc1_t1_pool", "spc2_t0_pool", "spc2_t1_pool", "spc2_3800_t0_pool", "spc2_3800_t1_pool"],
"pool_configuration_list": ["spc1_t0_pool", "spc1_t1_pool", "spc2_t0_pool", "spc2_t1_pool",
"spc1_2700_t0_pool_shp", "spc1_2700_t1_pool_shp",
"spc1_2700-d48c8_t0_pool_shp", "spc1_2700-d48c8_t1_pool_shp",
"spc1_2700_t0_single_pool_shp", "spc1_2700_t1_single_pool_shp",
"spc1_2700-d48c8_t0_single_pool_shp", "spc1_2700-d48c8_t1_single_pool_shp",

"spc2_3800-c64_t0_pool_shp", "spc2_3800-c64_t1_pool_shp",
"spc2_3800-d112c8_t0_pool_shp", "spc2_3800-d112c8_t1_pool_shp",
"spc2_3800-d24c52_t0_pool_shp", "spc2_3800-d24c52_t1_pool_shp",
"spc2_3800-d28c50_t0_pool_shp", "spc2_3800-d28c50_t1_pool_shp",

"spc2_3800_t0_pool", "spc2_3800_t1_pool",
"spc3_t0_pool", "spc3_t1_pool"],

"pool_convert_map": {
"spc1_t0_pool_sku_map": {"Mellanox-SN2700-C28D8": "spc1_2700-d48c8_t0_pool_shp",
"Mellanox-SN2700-D48C8": "spc1_2700-d48c8_t0_pool_shp",
Expand Down Expand Up @@ -330,14 +344,14 @@ def __init__(self, configDB):
"spc1_2700-d48c8_t1_single_pool_shp": {"singlepool": { "size": "9686016", "xoff": "1179648" }, "egress_lossless_pool": { "size": "13945824"}},

# The following pools are used for upgrading from 1.0.5 to the newer version
"spc2_3800-c64_t0_pool": {"singlepool": {"size": "23343104"}, "egress_lossless_pool": {"size": "34287552"}},
"spc2_3800-c64_t1_pool": {"singlepool": {"size": "19410944"}, "egress_lossless_pool": {"size": "34287552"}},
"spc2_3800-d112c8_t0_pool": {"singlepool": {"size": "16576512"}, "egress_lossless_pool": {"size": "34287552"}},
"spc2_3800-d112c8_t1_pool": {"singlepool": {"size": "14790656"}, "egress_lossless_pool": {"size": "34287552"}},
"spc2_3800-d24c52_t0_pool": {"singlepool": {"size": "21819392"}, "egress_lossless_pool": {"size": "34287552"}},
"spc2_3800-d24c52_t1_pool": {"singlepool": {"size": "17862656"}, "egress_lossless_pool": {"size": "34287552"}},
"spc2_3800-d28c50_t0_pool": {"singlepool": {"size": "21565440"}, "egress_lossless_pool": {"size": "34287552"}},
"spc2_3800-d28c50_t1_pool": {"singlepool": {"size": "17604608"}, "egress_lossless_pool": {"size": "34287552"}},
"spc2_3800-c64_t0_pool_shp": {"singlepool": {"size": "25866240", "xoff": "2523136"}, "egress_lossless_pool": {"size": "34287552"}},
"spc2_3800-c64_t1_pool_shp": {"singlepool": {"size": "23900160", "xoff": "4489216"}, "egress_lossless_pool": {"size": "34287552"}},
"spc2_3800-d112c8_t0_pool_shp": {"singlepool": {"size": "20017152", "xoff": "3440640"}, "egress_lossless_pool": {"size": "34287552"}},
"spc2_3800-d112c8_t1_pool_shp": {"singlepool": {"size": "19124224", "xoff": "4333568"}, "egress_lossless_pool": {"size": "34287552"}},
"spc2_3800-d24c52_t0_pool_shp": {"singlepool": {"size": "24576000", "xoff": "2756608"}, "egress_lossless_pool": {"size": "34287552"}},
"spc2_3800-d24c52_t1_pool_shp": {"singlepool": {"size": "22597632", "xoff": "4734976"}, "egress_lossless_pool": {"size": "34287552"}},
"spc2_3800-d28c50_t0_pool_shp": {"singlepool": {"size": "24360960", "xoff": "2795520"}, "egress_lossless_pool": {"size": "34287552"}},
"spc2_3800-d28c50_t1_pool_shp": {"singlepool": {"size": "22380544", "xoff": "4775936"}, "egress_lossless_pool": {"size": "34287552"}},

"spc2_3800_t0_pool": {"doublepool": { "size": "13924352" }, "egress_lossless_pool": { "size": "34287552"}},
"spc2_3800_t1_pool": {"doublepool": { "size": "12457984" }, "egress_lossless_pool": { "size": "34287552"}},
Expand Down Expand Up @@ -401,6 +415,41 @@ def __init__(self, configDB):
"pg_lossless_100000_300m_profile": {"xoff": "102400", "xon":"19456"}}
}
}
},
"version_1_0_6": {
# Version 1.0.6 is introduced for 2km cable support
#
# pool_mapped_from_old_version is not required because no pool flavor mapping changed

# Buffer pool info for normal mode
"buffer_pool_list" : ['ingress_lossless_pool', 'ingress_lossy_pool', 'egress_lossless_pool', 'egress_lossy_pool'],

"buffer_pools": {
"spc1_2700_t1_pool_shp": {"doublepool": { "size": "4439552", "xoff": "2146304" }, "egress_lossless_pool": { "size": "13945824"}},

# Buffer pool for single pool
"spc1_2700_t1_single_pool_shp": {"singlepool": { "size": "8719360", "xoff": "2146304" }, "egress_lossless_pool": { "size": "13945824"}},

# The following pools are used for upgrading from 1.0.5 to the newer version
"spc2_3800-c64_t1_pool_shp": {"singlepool": {"size": "24219648", "xoff": "4169728"}, "egress_lossless_pool": {"size": "34287552"}}
},
"buffer_pools_inherited": {
"version_1_0_4": ["spc1_t0_pool", "spc1_t1_pool", "spc2_t0_pool", "spc2_t1_pool", "spc3_t0_pool", "spc3_t1_pool"],
"version_1_0_5": [# Generic SKUs for 3800
"spc2_3800_t0_pool",
"spc2_3800_t1_pool",
# Non generic SKUs
"spc1_2700_t0_pool_shp",
"spc1_2700_t0_single_pool_shp",
"spc1_2700-d48c8_t0_pool_shp",
"spc1_2700-d48c8_t0_single_pool_shp",
"spc2_3800-c64_t0_pool_shp", "spc2_3800-d112c8_t0_pool_shp",
"spc2_3800-d24c52_t0_pool_shp", "spc2_3800-d28c50_t0_pool_shp",
"spc1_2700-d48c8_t1_pool_shp",
"spc1_2700-d48c8_t1_single_pool_shp",
"spc2_3800-d112c8_t1_pool_shp",
"spc2_3800-d24c52_t1_pool_shp", "spc2_3800-d28c50_t1_pool_shp"]
}
}
}

Expand All @@ -419,6 +468,17 @@ def mlnx_default_buffer_parameters(self, db_version, table):

return self.mellanox_default_parameter[db_version].get(table)

def mlnx_merge_inherited_info(self, db_version, buffer_pools):
inherited_info = self.mlnx_default_buffer_parameters(db_version, "buffer_pools_inherited")
if inherited_info:
for from_version, inherited_pool_list in inherited_info.iteritems():
pools_in_base_version = self.mlnx_default_buffer_parameters(from_version, "buffer_pools")
log.log_info("inherited pool list {} from version {} loaded".format(inherited_pool_list, from_version))
for key in inherited_pool_list:
pool_config = pools_in_base_version.get(key)
if pool_config:
buffer_pools[key] = pool_config

def mlnx_migrate_map_old_pool_to_new(self, pool_mapping, pool_convert_map, old_config_name):
new_config_name = None
if pool_mapping:
Expand Down Expand Up @@ -530,6 +590,7 @@ def mlnx_migrate_buffer_pool_size(self, old_version, new_version):
pool_convert_map = self.mlnx_default_buffer_parameters(new_version, "pool_convert_map")
log.log_info("got old configuration {}".format(configdb_buffer_pools))
default_buffer_pools_old = self.mlnx_default_buffer_parameters(old_version, "buffer_pools")
self.mlnx_merge_inherited_info(old_version, default_buffer_pools_old)
for old_config_name in default_pool_conf_list_old:
old_config = default_buffer_pools_old[old_config_name]
self.mlnx_migrate_extend_condensed_pool(old_config, old_config_name)
Expand All @@ -547,6 +608,7 @@ def mlnx_migrate_buffer_pool_size(self, old_version, new_version):
return True

default_buffer_pools_new = self.mlnx_default_buffer_parameters(new_version, "buffer_pools")
self.mlnx_merge_inherited_info(new_version, default_buffer_pools_new)
new_buffer_pool_conf = default_buffer_pools_new.get(new_config_name)
if not new_buffer_pool_conf:
log.log_error("Can't find the buffer pool configuration for {} in {}".format(new_config_name, new_version))
Expand Down Expand Up @@ -590,7 +652,7 @@ def mlnx_migrate_buffer_profile(self, old_version, new_version):
default_headroom_sets_new = self.mlnx_default_buffer_parameters(new_version, "headrooms")
default_headrooms_old = None
default_headrooms_new = None
if default_headroom_sets_old and default_headroom_sets_old:
if default_headroom_sets_old and default_headroom_sets_new:
if self.platform == 'x86_64-mlnx_msn3800-r0':
default_headrooms_old = default_headroom_sets_old.get("spc2_3800_headroom")
default_headrooms_new = default_headroom_sets_new.get("spc2_3800_headroom")
Expand Down
Loading

0 comments on commit 0fa5893

Please sign in to comment.