Revert "Fix docker database flush_unused_database failed issue (sonic…

…-net#11600) (sonic-net#11677)" (sonic-net#12084) This reverts commit 7e4883e.
dgsudharsan · Sep 15, 2022 · e51368d · e51368d
1 parent 1e034d5
commit e51368d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/dockers/docker-database/docker-database-init.sh b/dockers/docker-database/docker-database-init.sh
@@ -79,7 +79,7 @@ rm $db_cfg_file_tmp
 
 # copy dump.rdb file to each instance for restoration
 DUMPFILE=/var/lib/redis/dump.rdb
-redis_inst_list=`/usr/bin/python3 -c "from swsscommon import swsscommon; print(' '.join(swsscommon.SonicDBConfig.getInstanceList().keys()))"`
+redis_inst_list=`/usr/bin/python3 -c "import swsssdk; print(' '.join(swsssdk.SonicDBConfig.get_instancelist().keys()))"`
 for inst in $redis_inst_list
 do
     mkdir -p /var/lib/$inst

diff --git a/dockers/docker-database/flush_unused_database b/dockers/docker-database/flush_unused_database
@@ -11,15 +11,15 @@ while(True):
         break
     time.sleep(1)
 
-instlists = swsscommon.SonicDBConfig.getInstanceList()
+instlists = swsssdk.SonicDBConfig.get_instancelist()
 for instname, v in instlists.items():
-    insthost = v.hostname
-    instsocket = v.unixSocketPath
+    insthost = v['hostname']
+    instsocket = v['unix_socket_path']
 
-    dblists = swsscommon.SonicDBConfig.getDbList()
+    dblists = swsssdk.SonicDBConfig.get_dblist()
     for dbname in dblists:
-        dbid = swsscommon.SonicDBConfig.getDbId(dbname)
-        dbinst = swsscommon.SonicDBConfig.getDbInst(dbname)
+        dbid = swsssdk.SonicDBConfig.get_dbid(dbname)
+        dbinst = swsssdk.SonicDBConfig.get_instancename(dbname)
 
         # this DB is on current instance, skip flush
         if dbinst == instname: