Skip to content

Commit 36895fb

Browse files
authored
[database-chassis][lagid] Initialize SYSTEM_LAG_IDS_FREE_LIST in CHASSIS_APP_DB (sonic-net#20369)
Modify database.sh to create a initial SYSTEM_LAG_IDS_FREE_LIST in the CHASSIS_APP_DB on SUP during database-chassis startup Modify the database consistency check in swss.sh to append the lagid to the end of SYSTEM_LAG_IDS_FREE_LIST when lagid is released. Modify the lag_id_end=1023 (not 1024) in chassisdb.conf since BCM supports the large lagid is 1023 Signed-off-by: mlok <marty.lok@nokia.com>
1 parent a6e0d2d commit 36895fb

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
start_chassis_db=1
22
chassis_db_address=10.6.0.100
33
lag_id_start=1
4-
lag_id_end=1024
4+
lag_id_end=1023

files/build_templates/docker_image_ctl.j2

+6
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,12 @@ function setPlatformLagIdBoundaries()
121121
{
122122
docker exec -i ${DOCKERNAME} $SONIC_DB_CLI CHASSIS_APP_DB SET "SYSTEM_LAG_ID_START" "$lag_id_start"
123123
docker exec -i ${DOCKERNAME} $SONIC_DB_CLI CHASSIS_APP_DB SET "SYSTEM_LAG_ID_END" "$lag_id_end"
124+
docker exec -i ${DOCKERNAME} $SONIC_DB_CLI CHASSIS_APP_DB EVAL "
125+
local start_id = tonumber(ARGV[1])
126+
local end_id = tonumber(ARGV[2])
127+
for id = start_id,end_id do
128+
redis.call('rpush','SYSTEM_LAG_IDS_FREE_LIST', tostring(id))
129+
end" 0 $lag_id_start $lag_id_end
124130
}
125131
function waitForAllInstanceDatabaseConfigJsonFilesReady()
126132
{

files/scripts/swss.sh

+1
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@ function clean_up_chassis_db_tables()
233233
local lagid = redis.call('HGET', 'SYSTEM_LAG_ID_TABLE', lagname)
234234
redis.call('SREM', 'SYSTEM_LAG_ID_SET', lagid)
235235
redis.call('HDEL', 'SYSTEM_LAG_ID_TABLE', lagname)
236+
redis.call('rpush', 'SYSTEM_LAG_IDS_FREE_LIST', lagid)
236237
nsl = nsl + 1
237238
end
238239
end

0 commit comments

Comments
 (0)