From afe297be1ddf16b7a55b378cf4ba22d38ba51869 Mon Sep 17 00:00:00 2001 From: mlok Date: Fri, 27 Sep 2024 21:55:50 -0400 Subject: [PATCH] [database-chassis][lagid] Initialize SYSTEM_LAG_IDS_FREE_LIST in CHASSIS_APP_DB Signed-off-by: mlok --- device/nokia/x86_64-nokia_ixr7250e_sup-r0/chassisdb.conf | 2 +- files/build_templates/docker_image_ctl.j2 | 6 ++++++ files/scripts/swss.sh | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/chassisdb.conf b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/chassisdb.conf index 220e262f68e8..1ee5a0239d63 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/chassisdb.conf +++ b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/chassisdb.conf @@ -1,4 +1,4 @@ start_chassis_db=1 chassis_db_address=10.6.0.100 lag_id_start=1 -lag_id_end=1024 +lag_id_end=1023 diff --git a/files/build_templates/docker_image_ctl.j2 b/files/build_templates/docker_image_ctl.j2 index 87f801c1549c..3b04959064fc 100644 --- a/files/build_templates/docker_image_ctl.j2 +++ b/files/build_templates/docker_image_ctl.j2 @@ -120,6 +120,12 @@ function setPlatformLagIdBoundaries() { docker exec -i ${DOCKERNAME} $SONIC_DB_CLI CHASSIS_APP_DB SET "SYSTEM_LAG_ID_START" "$lag_id_start" docker exec -i ${DOCKERNAME} $SONIC_DB_CLI CHASSIS_APP_DB SET "SYSTEM_LAG_ID_END" "$lag_id_end" + docker exec -i ${DOCKERNAME} $SONIC_DB_CLI CHASSIS_APP_DB EVAL " + local start_id = tonumber(ARGV[1]) + local end_id = tonumber(ARGV[2]) + for id = start_id,end_id do + redis.call('rpush','SYSTEM_LAG_IDS_FREE_LIST', tostring(id)) + end" 0 $lag_id_start $lag_id_end } function waitForAllInstanceDatabaseConfigJsonFilesReady() { diff --git a/files/scripts/swss.sh b/files/scripts/swss.sh index 35815fe4dfb9..f081cf6de8e4 100755 --- a/files/scripts/swss.sh +++ b/files/scripts/swss.sh @@ -233,6 +233,7 @@ function clean_up_chassis_db_tables() local lagid = redis.call('HGET', 'SYSTEM_LAG_ID_TABLE', lagname) redis.call('SREM', 'SYSTEM_LAG_ID_SET', lagid) redis.call('HDEL', 'SYSTEM_LAG_ID_TABLE', lagname) + redis.call('rpush', 'SYSTEM_LAG_IDS_FREE_LIST', lagid) nsl = nsl + 1 end end