Skip to content

Commit 549c777

Browse files
lguohanlguohan
authored
Revert "[MultiDB]except src and dockers : replace redis-cli with sonic-db-cli and use new DBConnector (#3928)"
This reverts commit 0dae59a.
1 parent c475519 commit 549c777

17 files changed

Lines changed: 72 additions & 60 deletions

File tree

‎device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfputil.py‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
SFP_I2C_PAGE_SIZE = 256
2323

2424
# parameters for DB connection
25+
REDIS_HOSTNAME = "localhost"
26+
REDIS_PORT = 6379
2527
REDIS_TIMEOUT_USECS = 0
2628

2729
# parameters for SFP presence
@@ -188,9 +190,10 @@ def get_transceiver_change_event(self, timeout=0):
188190

189191
if self.db_sel == None:
190192
from swsscommon import swsscommon
191-
self.state_db = swsscommon.DBConnector("STATE_DB",
192-
REDIS_TIMEOUT_USECS,
193-
True))
193+
self.state_db = swsscommon.DBConnector(swsscommon.STATE_DB,
194+
REDIS_HOSTNAME,
195+
REDIS_PORT,
196+
REDIS_TIMEOUT_USECS)
194197

195198
# Subscribe to state table for SFP change notifications
196199
self.db_sel = swsscommon.Select()

‎files/build_templates/docker_image_ctl.j2‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -63,20 +63,20 @@ function preStartAction()
6363
docker cp /tmp/dump.rdb database:/var/lib/redis/
6464
fi
6565
{%- elif docker_container_name == "snmp" %}
66-
sonic-db-cli STATE_DB HSET 'DEVICE_METADATA|localhost' chassis_serial_number $(decode-syseeprom -s)
67-
vrfenabled=`sonic-db-cli CONFIG_DB hget "MGMT_VRF_CONFIG|vrf_global" mgmtVrfEnabled`
68-
v1SnmpTrapIp=`sonic-db-cli CONFIG_DB hget "SNMP_TRAP_CONFIG|v1TrapDest" DestIp`
69-
v1SnmpTrapPort=`sonic-db-cli CONFIG_DB hget "SNMP_TRAP_CONFIG|v1TrapDest" DestPort`
70-
v1Vrf=`sonic-db-cli CONFIG_DB hget "SNMP_TRAP_CONFIG|v1TrapDest" vrf`
71-
v1Comm=`sonic-db-cli CONFIG_DB hget "SNMP_TRAP_CONFIG|v1TrapDest" Community`
72-
v2SnmpTrapIp=`sonic-db-cli CONFIG_DB hget "SNMP_TRAP_CONFIG|v2TrapDest" DestIp`
73-
v2SnmpTrapPort=`sonic-db-cli CONFIG_DB hget "SNMP_TRAP_CONFIG|v2TrapDest" DestPort`
74-
v2Vrf=`sonic-db-cli CONFIG_DB hget "SNMP_TRAP_CONFIG|v2TrapDest" vrf`
75-
v2Comm=`sonic-db-cli CONFIG_DB hget "SNMP_TRAP_CONFIG|v2TrapDest" Community`
76-
v3SnmpTrapIp=`sonic-db-cli CONFIG_DB hget "SNMP_TRAP_CONFIG|v3TrapDest" DestIp`
77-
v3SnmpTrapPort=`sonic-db-cli CONFIG_DB hget "SNMP_TRAP_CONFIG|v3TrapDest" DestPort`
78-
v3Vrf=`sonic-db-cli CONFIG_DB hget "SNMP_TRAP_CONFIG|v3TrapDest" vrf`
79-
v3Comm=`sonic-db-cli CONFIG_DB hget "SNMP_TRAP_CONFIG|v3TrapDest" Community`
66+
docker exec -i database redis-cli -n 6 HSET 'DEVICE_METADATA|localhost' chassis_serial_number $(decode-syseeprom -s)
67+
vrfenabled=`/usr/bin/redis-cli -n 4 hget "MGMT_VRF_CONFIG|vrf_global" mgmtVrfEnabled`
68+
v1SnmpTrapIp=`/usr/bin/redis-cli -n 4 hget "SNMP_TRAP_CONFIG|v1TrapDest" DestIp`
69+
v1SnmpTrapPort=`/usr/bin/redis-cli -n 4 hget "SNMP_TRAP_CONFIG|v1TrapDest" DestPort`
70+
v1Vrf=`/usr/bin/redis-cli -n 4 hget "SNMP_TRAP_CONFIG|v1TrapDest" vrf`
71+
v1Comm=`/usr/bin/redis-cli -n 4 hget "SNMP_TRAP_CONFIG|v1TrapDest" Community`
72+
v2SnmpTrapIp=`/usr/bin/redis-cli -n 4 hget "SNMP_TRAP_CONFIG|v2TrapDest" DestIp`
73+
v2SnmpTrapPort=`/usr/bin/redis-cli -n 4 hget "SNMP_TRAP_CONFIG|v2TrapDest" DestPort`
74+
v2Vrf=`/usr/bin/redis-cli -n 4 hget "SNMP_TRAP_CONFIG|v2TrapDest" vrf`
75+
v2Comm=`/usr/bin/redis-cli -n 4 hget "SNMP_TRAP_CONFIG|v2TrapDest" Community`
76+
v3SnmpTrapIp=`/usr/bin/redis-cli -n 4 hget "SNMP_TRAP_CONFIG|v3TrapDest" DestIp`
77+
v3SnmpTrapPort=`/usr/bin/redis-cli -n 4 hget "SNMP_TRAP_CONFIG|v3TrapDest" DestPort`
78+
v3Vrf=`/usr/bin/redis-cli -n 4 hget "SNMP_TRAP_CONFIG|v3TrapDest" vrf`
79+
v3Comm=`/usr/bin/redis-cli -n 4 hget "SNMP_TRAP_CONFIG|v3TrapDest" Community`
8080

8181
if [ "${v1SnmpTrapIp}" != "" ]
8282
then
@@ -113,7 +113,7 @@ function preStartAction()
113113
fi
114114

115115
echo -n "" > /tmp/snmpagentaddr.yml
116-
keys=`sonic-db-cli CONFIG_DB keys "SNMP_AGENT_ADDRESS_CONFIG|*"`
116+
keys=`/usr/bin/redis-cli -n 4 keys "SNMP_AGENT_ADDRESS_CONFIG|*"`
117117
count=1
118118
for key in $keys;do
119119
ip=`echo $key|cut -d "|" -f2`
@@ -151,10 +151,10 @@ function postStartAction()
151151

152152
if [[ "$BOOT_TYPE" == "fast" ]]; then
153153
# set the key to expire in 3 minutes
154-
sonic-db-cli STATE_DB SET "FAST_REBOOT|system" "1" "EX" "180"
154+
redis-cli -n 6 SET "FAST_REBOOT|system" "1" "EX" "180"
155155
fi
156156

157-
sonic-db-cli CONFIG_DB SET "CONFIG_DB_INITIALIZED" "1"
157+
redis-cli -n 4 SET "CONFIG_DB_INITIALIZED" "1"
158158
fi
159159

160160
if [[ -x /usr/bin/db_migrator.py ]]; then

‎files/image_config/config-setup/config-setup‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
###########################################################################
2626

2727
# Initialize constants
28+
CONFIG_DB_INDEX=4
2829
UPDATEGRAPH_CONF=/etc/sonic/updategraph.conf
2930
CONFIG_DB_JSON=/etc/sonic/config_db.json
3031
MINGRAPH_FILE=/etc/sonic/minigraph.xml
@@ -106,9 +107,9 @@ reload_minigraph()
106107
if [ ! -f /etc/sonic/init_cfg.json ]; then
107108
echo "{}" > /etc/sonic/init_cfg.json
108109
fi
109-
sonic-db-cli CONFIG_DB FLUSHDB
110+
redis-cli -n $CONFIG_DB_INDEX FLUSHDB
110111
sonic-cfggen -H -m -j /etc/sonic/init_cfg.json --write-to-db
111-
sonic-db-cli CONFIG_DB SET "CONFIG_DB_INITIALIZED" "1"
112+
redis-cli -n $CONFIG_DB_INDEX SET "CONFIG_DB_INITIALIZED" "1"
112113
if [ -f /etc/sonic/acl.json ]; then
113114
acl-loader update full /etc/sonic/acl.json
114115
fi
@@ -137,7 +138,7 @@ function copy_config_files_and_directories()
137138
# Check if SONiC swich has booted after a warm reboot request
138139
check_system_warm_boot()
139140
{
140-
SYSTEM_WARM_START=`sonic-db-cli STATE_DB hget "WARM_RESTART_ENABLE_TABLE|system" enable`
141+
SYSTEM_WARM_START=`/usr/bin/redis-cli -n 6 hget "WARM_RESTART_ENABLE_TABLE|system" enable`
141142
# SYSTEM_WARM_START could be empty, always make WARM_BOOT meaningful.
142143
if [[ x"$SYSTEM_WARM_START" == x"true" ]]; then
143144
WARM_BOOT="true"
@@ -186,7 +187,7 @@ load_config()
186187
return 1
187188
fi
188189

189-
sonic-db-cli CONFIG_DB FLUSHDB
190+
redis-cli -n $CONFIG_DB_INDEX FLUSHDB
190191
sonic-cfggen -j ${CONFIG_FILE} --write-to-db
191192
if [ $? -ne 0 ]; then
192193
return $?
@@ -197,7 +198,7 @@ load_config()
197198
/usr/bin/db_migrator.py -o migrate
198199
fi
199200

200-
sonic-db-cli CONFIG_DB SET "CONFIG_DB_INITIALIZED" "1"
201+
redis-cli -n $CONFIG_DB_INDEX SET "CONFIG_DB_INITIALIZED" "1"
201202
return 0
202203
}
203204

‎files/image_config/updategraph/updategraph‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
#!/bin/bash
22

3+
CONFIG_DB_INDEX=4
4+
35
reload_minigraph()
46
{
57
echo "Reloading minigraph..."
68
if [ ! -f /etc/sonic/init_cfg.json ]; then
79
echo "{}" > /etc/sonic/init_cfg.json
810
fi
9-
sonic-db-cli CONFIG_DB FLUSHDB
11+
redis-cli -n $CONFIG_DB_INDEX FLUSHDB
1012
sonic-cfggen -H -m -j /etc/sonic/init_cfg.json --write-to-db
11-
sonic-db-cli CONFIG_DB SET "CONFIG_DB_INITIALIZED" "1"
13+
redis-cli -n $CONFIG_DB_INDEX SET "CONFIG_DB_INITIALIZED" "1"
1214
if [ -f /etc/sonic/acl.json ]; then
1315
acl-loader update full /etc/sonic/acl.json
1416
fi
@@ -75,9 +77,9 @@ if [ "$src" = "dhcp" ]; then
7577
else
7678
cp -f /tmp/device_meta.json /etc/sonic/config_db.json
7779
fi
78-
sonic-db-cli CONFIG_DB FLUSHDB
80+
redis-cli -n $CONFIG_DB_INDEX FLUSHDB
7981
sonic-cfggen -j /etc/sonic/config_db.json --write-to-db
80-
sonic-db-cli CONFIG_DB SET "CONFIG_DB_INITIALIZED" "1"
82+
redis-cli -n $CONFIG_DB_INDEX SET "CONFIG_DB_INITIALIZED" "1"
8183
if [ "$dhcp_as_static" = "true" ]; then
8284
sed -i "/enabled=/d" /etc/sonic/updategraph.conf
8385
echo "enabled=false" >> /etc/sonic/updategraph.conf

‎files/image_config/warmboot-finalizer/finalize-warmboot.sh‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ function debug()
2020

2121
function check_warm_boot()
2222
{
23-
WARM_BOOT=`sonic-db-cli STATE_DB hget "WARM_RESTART_ENABLE_TABLE|system" enable`
23+
WARM_BOOT=`/usr/bin/redis-cli -n 6 hget "WARM_RESTART_ENABLE_TABLE|system" enable`
2424
}
2525

2626

@@ -29,10 +29,12 @@ function wait_for_database_service()
2929
debug "Wait for database to become ready..."
3030

3131
# Wait for redis server start before database clean
32-
/usr/bin/docker exec database ping_pong_db_insts
32+
until [[ $(/usr/bin/docker exec database redis-cli ping | grep -c PONG) -gt 0 ]];
33+
do sleep 1;
34+
done
3335

3436
# Wait for configDB initialization
35-
until [[ $(sonic-db-cli CONFIG_DB GET "CONFIG_DB_INITIALIZED") ]];
37+
until [[ $(/usr/bin/docker exec database redis-cli -n 4 GET "CONFIG_DB_INITIALIZED") ]];
3638
do sleep 1;
3739
done
3840

@@ -42,7 +44,7 @@ function wait_for_database_service()
4244

4345
function get_component_state()
4446
{
45-
sonic-db-cli STATE_DB hget "WARM_RESTART_TABLE|$1" state
47+
/usr/bin/redis-cli -n 6 hget "WARM_RESTART_TABLE|$1" state
4648
}
4749

4850

‎files/scripts/configdb-load.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ if [ -r /etc/sonic/config_db.json ]; then
1010
sonic-cfggen -j /etc/sonic/config_db.json --write-to-db
1111
fi
1212

13-
sonic-db-cli CONFIG_DB SET "CONFIG_DB_INITIALIZED" "1"
13+
redis-cli -n 4 SET "CONFIG_DB_INITIALIZED" "1"

‎files/scripts/swss.sh‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ function unlock_service_state_change()
3131

3232
function check_warm_boot()
3333
{
34-
SYSTEM_WARM_START=`sonic-db-cli STATE_DB hget "WARM_RESTART_ENABLE_TABLE|system" enable`
35-
SERVICE_WARM_START=`sonic-db-cli STATE_DB hget "WARM_RESTART_ENABLE_TABLE|${SERVICE}" enable`
34+
SYSTEM_WARM_START=`/usr/bin/redis-cli -n 6 hget "WARM_RESTART_ENABLE_TABLE|system" enable`
35+
SERVICE_WARM_START=`/usr/bin/redis-cli -n 6 hget "WARM_RESTART_ENABLE_TABLE|${SERVICE}" enable`
3636
if [[ x"$SYSTEM_WARM_START" == x"true" ]] || [[ x"$SERVICE_WARM_START" == x"true" ]]; then
3737
WARM_BOOT="true"
3838
else
@@ -43,7 +43,7 @@ function check_warm_boot()
4343
function validate_restore_count()
4444
{
4545
if [[ x"$WARM_BOOT" == x"true" ]]; then
46-
RESTORE_COUNT=`sonic-db-cli STATE_DB hget "WARM_RESTART_TABLE|orchagent" restore_count`
46+
RESTORE_COUNT=`/usr/bin/redis-cli -n 6 hget "WARM_RESTART_TABLE|orchagent" restore_count`
4747
# We have to make sure db data has not been flushed.
4848
if [[ -z "$RESTORE_COUNT" ]]; then
4949
WARM_BOOT="false"
@@ -54,10 +54,12 @@ function validate_restore_count()
5454
function wait_for_database_service()
5555
{
5656
# Wait for redis server start before database clean
57-
/usr/bin/docker exec database ping_pong_db_insts
57+
until [[ $(/usr/bin/docker exec database redis-cli ping | grep -c PONG) -gt 0 ]];
58+
do sleep 1;
59+
done
5860

5961
# Wait for configDB initialization
60-
until [[ $(sonic-db-cli CONFIG_DB GET "CONFIG_DB_INITIALIZED") ]];
62+
until [[ $(/usr/bin/docker exec database redis-cli -n 4 GET "CONFIG_DB_INITIALIZED") ]];
6163
do sleep 1;
6264
done
6365
}
@@ -67,7 +69,7 @@ function wait_for_database_service()
6769
# $2 the string of a list of table prefixes
6870
function clean_up_tables()
6971
{
70-
sonic-db-cli $1 EVAL "
72+
redis-cli -n $1 EVAL "
7173
local tables = {$2}
7274
for i = 1, table.getn(tables) do
7375
local matches = redis.call('KEYS', tables[i])
@@ -112,11 +114,11 @@ start() {
112114
# Don't flush DB during warm boot
113115
if [[ x"$WARM_BOOT" != x"true" ]]; then
114116
debug "Flushing APP, ASIC, COUNTER, CONFIG, and partial STATE databases ..."
115-
sonic-db-cli APPL_DB FLUSHDB
116-
sonic-db-cli ASIC_DB FLUSHDB
117-
sonic-db-cli COUNTERS_DB FLUSHDB
118-
sonic-db-cli FLEX_COUNTER_DB FLUSHDB
119-
clean_up_tables STATE_DB "'PORT_TABLE*', 'MGMT_PORT_TABLE*', 'VLAN_TABLE*', 'VLAN_MEMBER_TABLE*', 'LAG_TABLE*', 'LAG_MEMBER_TABLE*', 'INTERFACE_TABLE*', 'MIRROR_SESSION*', 'VRF_TABLE*', 'FDB_TABLE*'"
117+
/usr/bin/docker exec database redis-cli -n 0 FLUSHDB
118+
/usr/bin/docker exec database redis-cli -n 1 FLUSHDB
119+
/usr/bin/docker exec database redis-cli -n 2 FLUSHDB
120+
/usr/bin/docker exec database redis-cli -n 5 FLUSHDB
121+
clean_up_tables 6 "'PORT_TABLE*', 'MGMT_PORT_TABLE*', 'VLAN_TABLE*', 'VLAN_MEMBER_TABLE*', 'LAG_TABLE*', 'LAG_MEMBER_TABLE*', 'INTERFACE_TABLE*', 'MIRROR_SESSION*', 'VRF_TABLE*', 'FDB_TABLE*'"
120122
fi
121123

122124
# start service docker
@@ -164,7 +166,7 @@ stop() {
164166
# encountered error, e.g. syncd crashed. And swss needs to
165167
# be restarted.
166168
debug "Clearing FAST_REBOOT flag..."
167-
clean_up_tables STATE_DB "'FAST_REBOOT*'"
169+
clean_up_tables 6 "'FAST_REBOOT*'"
168170

169171
# Unlock has to happen before reaching out to peer service
170172
unlock_service_state_change

‎files/scripts/syncd.sh‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ function unlock_service_state_change()
3030

3131
function check_warm_boot()
3232
{
33-
SYSTEM_WARM_START=`sonic-db-cli STATE_DB hget "WARM_RESTART_ENABLE_TABLE|system" enable`
34-
SERVICE_WARM_START=`sonic-db-cli STATE_DB hget "WARM_RESTART_ENABLE_TABLE|${SERVICE}" enable`
33+
SYSTEM_WARM_START=`/usr/bin/redis-cli -n 6 hget "WARM_RESTART_ENABLE_TABLE|system" enable`
34+
SERVICE_WARM_START=`/usr/bin/redis-cli -n 6 hget "WARM_RESTART_ENABLE_TABLE|${SERVICE}" enable`
3535
# SYSTEM_WARM_START could be empty, always make WARM_BOOT meaningful.
3636
if [[ x"$SYSTEM_WARM_START" == x"true" ]] || [[ x"$SERVICE_WARM_START" == x"true" ]]; then
3737
WARM_BOOT="true"
@@ -43,10 +43,12 @@ function check_warm_boot()
4343
function wait_for_database_service()
4444
{
4545
# Wait for redis server start before database clean
46-
/usr/bin/docker exec database ping_pong_db_insts
46+
until [[ $(/usr/bin/docker exec database redis-cli ping | grep -c PONG) -gt 0 ]];
47+
do sleep 1;
48+
done
4749

4850
# Wait for configDB initialization
49-
until [[ $(sonic-db-cli CONFIG_DB GET "CONFIG_DB_INITIALIZED") ]];
51+
until [[ $(/usr/bin/docker exec database redis-cli -n 4 GET "CONFIG_DB_INITIALIZED") ]];
5052
do sleep 1;
5153
done
5254
}
@@ -63,7 +65,7 @@ function getBootType()
6365
;;
6466
*SONIC_BOOT_TYPE=fast*|*fast-reboot*)
6567
# check that the key exists
66-
if [[ $(sonic-db-cli STATE_DB GET "FAST_REBOOT|system") == "1" ]]; then
68+
if [[ $(redis-cli -n 6 GET "FAST_REBOOT|system") == "1" ]]; then
6769
TYPE='fast'
6870
else
6971
TYPE='cold'

‎platform/barefoot/sonic-platform-modules-ingrasys/s9180-32x/utils/qsfp_monitor.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ function _docker_swss_check {
6565
while true
6666
do
6767
# Check if syncd starts
68-
result=`sonic-db-cli ASIC_DB HLEN HIDDEN`
68+
result=`docker exec -i swss bash -c "echo -en \"SELECT 1\\nHLEN HIDDEN\" | redis-cli | sed -n 2p"` #TBD FIX ME
6969
if [ "$result" == "3" ]; then
7070
return
7171
fi

‎platform/barefoot/sonic-platform-modules-ingrasys/s9280-64x/utils/qsfp_monitor.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ function _docker_swss_check {
6666
while true
6767
do
6868
# Check if syncd starts
69-
result=`sonic-db-cli ASIC_DB HLEN HIDDEN`
69+
result=`docker exec -i swss bash -c "echo -en \"SELECT 1\\nHLEN HIDDEN\" | redis-cli | sed -n 2p"` #TBD FIX ME
7070
if [ "$result" == "3" ]; then
7171
return
7272
fi

0 commit comments

Comments
 (0)