Enable Multi DB #20305

Pan-XT · 2024-09-19T17:47:26Z

Why I did it

Enable Multi DB

How I did it

modify [dockers/docker-database/Dockerfile.j2] and add [multi_database_config.json.j2]
modify [dockers/docker-database/critical_processes.j2] and [dockers/docker-database/supervisord.conf.j2] to resolve the formatting issues caused by multiple Redis processes.
modify [dockers/docker-database/docker-database-init.sh] to enable Multi DB if /etc/sonic/enable_multidb exists and ensure that the redis service has the necessary permissions to access /var/lib/$inst
modify [Makefile.work] [slave.mk] [/files/build_templates/sonic_debian_extension.j2 ] for setting ENABLE_MULTIDB=y when building SONiC image.

…into multidb

eddieruan-alibaba · 2024-09-24T05:09:07Z

Double committed to Phoenixwing eddieruan-alibaba@9f9f4d8

and verified on vSONiC

admin@PE3:~$ ps aux | grep redis
message+ 1011 1.4 0.2 86764 22372 pts/0 Sl 04:30 0:31 /usr/bin/redis-server 127.0.0.1:6379
message+ 1012 0.6 0.2 77548 22316 pts/0 Sl 04:30 0:14 /usr/bin/redis-server 127.0.0.1:6380
message+ 1015 0.5 0.2 64748 17696 pts/0 Sl 04:30 0:11 /usr/bin/redis-server 127.0.0.1:6381
message+ 1016 1.9 0.3 71404 22532 pts/0 Sl 04:30 0:43 /usr/bin/redis-server 127.0.0.1:6382
message+ 1018 0.2 0.2 62188 16456 pts/0 Sl 04:30 0:05 /usr/bin/redis-server 127.0.0.1:6383

eddieruan-alibaba · 2024-09-24T05:10:05Z

/azpw ms_conflict

eddieruan-alibaba · 2024-09-24T05:11:29Z

@StormLiangMS, @liushilongbuaa Can you trigger the following command?

Github Branch not ready
Please wait a few minutes to run again!
'/azpw ms_conflict'

eddieruan-alibaba

This change is enabled in Phoenix wing and verified in Phoenix wing's daily sanity.

http://phoenixwing.com.cn/vsonic

…ends on /etc/sonic/enable_multidb

eddieruan-alibaba · 2024-10-11T19:51:31Z

Validated with phoenix wing vsonic image

admin@PE3:$ ls -l /etc/sonic/enable_multidb
-rw-r--r-- 1 root root 0 Oct 11 01:46 /etc/sonic/enable_multidb
admin@PE3:$ ps aux | grep redis
message+ 990 0.8 0.5 86764 39228 pts/0 Sl 06:28 7:06 /usr/bin/redis-server 127.0.0.1:6379
message+ 991 0.8 0.2 71404 21248 pts/0 Rl 06:28 6:50 /usr/bin/redis-server 127.0.0.1:6380
message+ 992 0.3 0.2 64748 17384 pts/0 Sl 06:28 2:28 /usr/bin/redis-server 127.0.0.1:6381
message+ 994 2.9 0.3 71404 24000 pts/0 Sl 06:28 23:44 /usr/bin/redis-server 127.0.0.1:6382
message+ 996 0.1 0.2 62188 16904 pts/0 Sl 06:28 1:22 /usr/bin/redis-server 127.0.0.1:6383
admin 111122 0.0 0.0 6868 648 pts/0 S+ 19:51 0:00 grep redis

…into multidb

kperumalbfn · 2024-11-04T17:25:44Z

@saiarcot895 @kcudnik could you review this PR

kcudnik · 2024-11-05T11:44:25Z

@saiarcot895 @kcudnik could you review this PR

Can you fix build errors ?

eddieruan-alibaba · 2024-11-05T14:11:00Z

@saiarcot895 @kcudnik could you review this PR

Can you fix build errors ?

The build failure was due to yesterday's connection outage

2024-11-04T08:09:16.9633070Z get_url_version https://sonicstorage.blob.core.windows.net/public/fips/bookworm/1.4.3-1/armhf/symcrypt-openssl_1.4.3-1_armhf.deb failed
2024-11-04T08:09:16.9633607Z make[1]: *** [Makefile:12: /sonic/target/debs/bookworm/symcrypt-openssl_1.4.3-1_armhf.deb] Error 1

Could someone help to trigger a rebuild? @kperumalbfn @kcudnik

oleksandrivantsiv · 2024-11-05T21:47:55Z

dockers/docker-database/multi_database_config.json.j2

+        },
+        "redis1": {
+           "hostname" : "{{HOST_IP}}",
+            "port" : 6380,


The port selection conflicts with both the chassis DB and Smart Switch DB service and must be changed. Port 6380 is used by the chassis Redis server, while ports 6381-6388 are assigned to the DPU databases.

@oleksandrivantsiv where does chassis DB's port get defined?

This multi-db approach is enabled only on the platform which needs performance and controlled via a compile flag. ENABLE_MULTIDB=y The detail information could be found at https://lists.sonicfoundation.dev/g/sonic-wg-routing/wiki/37961

During the discussion in routing WG, we feel there is NO use case to enable it for chassis based platform for the following reasons.

The scale for chassis based approach is limited. MSFT uses it as T1, and Alibaba uses it as gateway. The benefit is less.

Even chassis case wants to use it later. It may only wants to enable it for main switch asic, not enable all 5 for each DPU. That means we need to create a new j2 for that case.

Discussed with Guahan on this one. 6380 will be kept for Chassis DB. It is not easy to change chassis's port number.

We use 6379, 6378, 6377, ... a.k.a going down for new redis instances.

@Pan-XT can you update your diff?

Update redis1,reids2,redis3,redis4 port number to 6378,6377,6376,6375

…into multidb

liuh-80 · 2024-11-06T08:09:21Z

dockers/docker-database/supervisord.conf.j2

@@ -31,6 +31,8 @@ dependent_startup=true
 {% if INSTANCES %}
 {%     for redis_inst, redis_items in INSTANCES.items() %}
 {%- if redis_inst != 'remote_redis' %}
+


Suggest remove unnecessary change in this file

This change is the same as #20545 , so I remove it.

liuh-80 · 2024-11-06T08:16:50Z

dockers/docker-database/multi_database_config.json.j2

+            "unix_socket_path" : "/var/run/redis{{DEV}}/redis.sock",
+            "persistence_for_warm_boot" : "yes"
+            {% if DATABASE_TYPE is defined and DATABASE_TYPE != "" %}
+            ,"database_type": "{{DATABASE_TYPE}}"


I didn't find code in sonic-swss-common to parse and handle 'database_type', is there a PR?

I search that PR, not find any code read "database_type"
This attribute is an optional attribute, and this file need be parsed by SonicDBConfig::parseDatabaseConfig
https://github.com/sonic-net/sonic-swss-common/blob/master/common/dbconnector.cpp

Otherwise, sonic-swss-common lib can't handle multi-DB, so please make sure sonic-swss-common also change to handle it.

https://github.com/sonic-net/sonic-buildimage/blob/master/dockers/docker-database/docker-database-init.sh#L53

@liuh-80

This field was added via
9f08f88
by @Pterosaur

It is current SONiC behavior
https://github.com/sonic-net/sonic-buildimage/blob/master/dockers/docker-database/database_config.json.j2#L10

Can you help to check with him to see what the need for this field?

liuh-80 · 2024-11-06T08:18:20Z

dockers/docker-database/multi_database_config.json.j2

+        "DPU_APPL_DB" : {
+            "id" : 15,
+            "separator": ":",
+            "instance" : {% if include_remote_db %} "remote_redis" {% else %} "redis" {% endif %},


Suggest define a variable for all these dupe template

Currently, the multi_database_config.json.j2 is consistent with the database_config.json.j2, except for the added content related to redis1,redis2,redis3,redis4. Defining a variable for all these dupe templates will be implemented in future modifications.

liuh-80 · 2024-11-06T08:29:20Z

dockers/docker-database/docker-database-init.sh

@@ -125,6 +129,12 @@ do
    else
        echo -n > /var/lib/$inst/dump.rdb
    fi
+
+    chown -R redis:redis /var/lib/$inst


Add comments to this file, help other understand.
Also, this seems not related with enable multi-DB, can this move to another PR?

Here are the necessary permissions for enable_multidb, see /etc/supervisor/conf.d/supervisord.conf.j2

Hi @Pan-XT , can you add your comments to this file? that will help other understand the propose of this code.

ok，I add commnets “the Redis process is operating under the 'redis' user in supervisord and make redis user own /var/lib/$inst inside db container.”

liuh-80 · 2024-11-06T08:29:49Z

dockers/docker-database/critical_processes.j2

@@ -1,5 +1,6 @@
 {% if INSTANCES %}
 {%     for redis_inst, redis_items in INSTANCES.items() %}
+


Remove this unnecessary change?

If there is no blank line here, all program:{{ redis_inst }} of critical_processes will be concentrated on one line, which will cause subsequent regular expression matching to fail.

Does changing {%- endfor %} to {% endfor %} work? That will make the intention a bit clearer.

and revert chmod -f 0760 $sock_file

…into multidb

Pan-XT added 14 commits August 30, 2024 18:26

Updated supervisord.conf.j2 to support multidb

aaefb71

Merge branch 'multidb' of https://github.com/Pan-XT/sonic-buildimage …

c5c3e59

…into multidb

chown redis

289f8e6

update multi db json.j2

f51867e

[sonic-swss] update submodule for sonic-swss

42fc418

Updated docker-database-init.sh to support multidb

67a9804

update multi_database_config.json.j2

4c6527e

update docker-database-init.sh

46939a0

update multi_database_config.json

5b3c458

update critical_processes.j2

2bc006a

update docker-database-init.sh

614bb83

update docker-database-init.sh

e42bfc3

update docker-database-init.sh

f51eedb

update docker-database-init.sh

2b121de

Pan-XT requested a review from lguohan as a code owner September 19, 2024 17:47

Enable Multi DB

397c6fa

Revert changes to src/sonic-swss

81fdc48

eddieruan-alibaba approved these changes Sep 25, 2024

View reviewed changes

Pan-XT added 2 commits September 26, 2024 13:11

enable multi db for cisco-8101-p4-32x100-vs

a220f2c

Set ENABLE_MULTIDB=y when building SONiC image and enable Multidb dep…

e53cc25

…ends on /etc/sonic/enable_multidb

Pan-XT requested review from qiluo-msft and xumia as code owners October 9, 2024 11:44

Pan-XT and others added 2 commits October 10, 2024 14:57

update sonic_debian_extension.j2

87aab3e

Merge branch 'sonic-net:master' into multidb

b158823

eddieruan-alibaba requested review from venkatmahalingam and hasan-brcm October 11, 2024 19:51

Pan-XT added 10 commits November 1, 2024 08:40

update docker-database-init.sh

5981cb4

Merge branch 'master' of https://github.com/sonic-net/sonic-buildimage …

67c4798

…into multidb

chmod -f 0760 $sock_file

1743065

update docker-database-init.sh

ca52619

Merge branch 'master' of https://github.com/sonic-net/sonic-buildimage …

43869e1

…into multidb

Merge branch 'master' of https://github.com/sonic-net/sonic-buildimage …

43bcec0

…into multidb

update docker-database-init.sh

8c5405e

update docker-databse-init.sh

2185014

Merge branch 'master' of https://github.com/sonic-net/sonic-buildimage …

b854771

…into multidb

chmod -f 0760 $sock_file

5c98f54

kperumalbfn requested a review from saiarcot895 November 4, 2024 17:25

kperumalbfn requested a review from kcudnik November 4, 2024 17:26

oleksandrivantsiv suggested changes Nov 5, 2024

View reviewed changes

Pan-XT added 2 commits November 6, 2024 13:40

Merge branch 'master' of https://github.com/sonic-net/sonic-buildimage …

26d834c

…into multidb

going down for new redis instances

2f7eda0

kcudnik approved these changes Nov 6, 2024

View reviewed changes

qiluo-msft requested a review from liuh-80 November 6, 2024 08:06

liuh-80 reviewed Nov 6, 2024

View reviewed changes

revert changes to supervisord.conf.j2

3b30645

and revert chmod -f 0760 $sock_file

Pan-XT requested a review from oleksandrivantsiv November 6, 2024 15:27

Pan-XT added 3 commits November 7, 2024 10:29

Merge branch 'master' of https://github.com/sonic-net/sonic-buildimage …

f402859

…into multidb

add comments on chown -R redis:redis /var/lib/$inst

55808b5

Merge branch 'master' of https://github.com/sonic-net/sonic-buildimage …

90ace92

…into multidb

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Enable Multi DB #20305

Enable Multi DB #20305

Pan-XT commented Sep 19, 2024 •

edited

Loading

eddieruan-alibaba commented Sep 24, 2024

eddieruan-alibaba commented Sep 24, 2024

eddieruan-alibaba commented Sep 24, 2024

eddieruan-alibaba left a comment

eddieruan-alibaba commented Oct 11, 2024

kperumalbfn commented Nov 4, 2024 •

edited

Loading

kcudnik commented Nov 5, 2024

eddieruan-alibaba commented Nov 5, 2024

oleksandrivantsiv Nov 5, 2024

eddieruan-alibaba Nov 5, 2024 •

edited

Loading

eddieruan-alibaba Nov 6, 2024

Pan-XT Nov 6, 2024

liuh-80 Nov 6, 2024

Pan-XT Nov 6, 2024 •

edited

Loading

liuh-80 Nov 7, 2024

liuh-80 Nov 6, 2024

Pan-XT Nov 7, 2024

liuh-80 Nov 7, 2024

Pan-XT Nov 7, 2024 •

edited

Loading

eddieruan-alibaba Nov 7, 2024

liuh-80 Nov 6, 2024

Pan-XT Nov 7, 2024

liuh-80 Nov 7, 2024

liuh-80 Nov 6, 2024

Pan-XT Nov 6, 2024

liuh-80 Nov 7, 2024

Pan-XT Nov 7, 2024

liuh-80 Nov 7, 2024

liuh-80 Nov 6, 2024

Pan-XT Nov 6, 2024

liuh-80 Nov 7, 2024

saiarcot895 Nov 7, 2024

		@@ -1,5 +1,6 @@
		{% if INSTANCES %}
		{% for redis_inst, redis_items in INSTANCES.items() %}

Enable Multi DB #20305

Are you sure you want to change the base?

Enable Multi DB #20305

Conversation

Pan-XT commented Sep 19, 2024 • edited Loading

Why I did it

How I did it

eddieruan-alibaba commented Sep 24, 2024

eddieruan-alibaba commented Sep 24, 2024

eddieruan-alibaba commented Sep 24, 2024

eddieruan-alibaba left a comment

Choose a reason for hiding this comment

eddieruan-alibaba commented Oct 11, 2024

kperumalbfn commented Nov 4, 2024 • edited Loading

kcudnik commented Nov 5, 2024

eddieruan-alibaba commented Nov 5, 2024

Choose a reason for hiding this comment

eddieruan-alibaba Nov 5, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Pan-XT Nov 6, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Pan-XT Nov 7, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Pan-XT commented Sep 19, 2024 •

edited

Loading

kperumalbfn commented Nov 4, 2024 •

edited

Loading

eddieruan-alibaba Nov 5, 2024 •

edited

Loading

Pan-XT Nov 6, 2024 •

edited

Loading

Pan-XT Nov 7, 2024 •

edited

Loading