Merge branch 'sonic-net:master' into bookworm_migration_sonic_gnmi

sonic-net · Apr 9, 2024 · d0598f7 · d0598f7
2 parents 6d6a0ac + 6b63a50
commit d0598f7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/sonic_data_client/mixed_db_client.go b/sonic_data_client/mixed_db_client.go
@@ -501,7 +501,7 @@ func NewMixedDbClient(paths []*gnmipb.Path, prefix *gnmipb.Path, origin string,
 	// If target is DPU_APPL_DB, this is multiple database, create DB connector for DPU
 	// If target is original APPL_DB, create DB connector for backward compatibility
 	if target == DPU_APPL_DB_NAME || target == APPL_DB_NAME {
-		client.applDB = swsscommon.NewDBConnector(target, SWSS_TIMEOUT, false)
+		client.applDB = swsscommon.NewDBConnector(target, SWSS_TIMEOUT, false, dbkey)
 	}
 	client.target = target
 	client.dbkey = dbkey

diff --git a/sonic_db_config/db_config_test.go b/sonic_db_config/db_config_test.go
@@ -210,8 +210,8 @@ func TestGetDbMultiInstance(t *testing.T) {
 	})
 	t.Run("Sock", func(t *testing.T) {
 		sock_path, _ := GetDbSockByDBKey("CONFIG_DB", dbkey)
-		if sock_path != "/var/run/redis0/redis.sock" {
-			t.Fatalf(`Sock("") = %q, want "/var/run/redis0/redis.sock", error`, sock_path)
+		if sock_path != "/var/run/redis/redis.sock" {
+			t.Fatalf(`Sock("") = %q, want "/var/run/redis/redis.sock", error`, sock_path)
 		}
 	})
 	t.Run("AllInstances", func(t *testing.T) {

diff --git a/testdata/database_config_dpu.json b/testdata/database_config_dpu.json
@@ -3,7 +3,7 @@
         "redis":{
             "hostname" : "127.0.0.1",
             "port" : 6379,
-            "unix_socket_path" : "/var/run/redis0/redis.sock"
+            "unix_socket_path" : "/var/run/redis/redis.sock"
         }
     },
     "DATABASES" : {