Skip to content

[pull] master from Azure:master#261

Merged
pull[bot] merged 3 commits intopphuchar:masterfrom
sonic-net:master
Aug 28, 2019
Merged

[pull] master from Azure:master#261
pull[bot] merged 3 commits intopphuchar:masterfrom
sonic-net:master

Conversation

@pull
Copy link
Copy Markdown

@pull pull bot commented Aug 28, 2019

See Commits and Changes for more details.


Created by pull[bot]. Want to support this open source service? Please star it : )

dzhangalibaba and others added 3 commits August 28, 2019 11:15
…base_config.json (#2182)

this is the first step to moving different databases tables into different database instances

in this PR, only handle multiple database instances creation based on user configuration at /etc/sonic/database_config.json

we keep current method to create single database instance if no extra/new DATABASE configuration exist in database_config.json file.

if user try to configure more db instances at database_config.json , we create those new db instances along with the original db instance existing today.

The configuration is as below, later we can add more db related information if needed:
{
...
"DATABASE": {
"redis-db-01" : {
"port" : "6380",
"database": ["APPL_DB", "STATE_DB"]
},
"redis-db-02" : {
"port" : "6381",
"database":["ASIC_DB"]
},
}
...
}

The detail description is at design doc at sonic-net/SONiC#271

The main idea is : when database.sh started, we check the configuration and generate corresponding scripts.

rc.local service handle old_config copy when loading new images, there is no dependency between rc.local and database service today, for safety and make sure the copy operation are done before database try to read it, we make database service run after rc.local

Then database docker started, we check the configuration and generate corresponding scripts/.conf in database docker as well.

based on those conf, we create databases instances as required.

at last, we ping_pong check database are up and continue


Signed-off-by: Dong Zhang d.zhang@alibaba-inc.com
* [platform/cel]: Add new api installer

* [device/celestica]: Update APIs to support both pmon and base image

* [device/e1031]: update hwmon name
Signed-off-by: chiourung_huang <chiourung_huang@edge-core.com>
@pull pull bot added the ⤵️ pull label Aug 28, 2019
@pull pull bot merged commit 4c36866 into pphuchar:master Aug 28, 2019
pphuchar pushed a commit that referenced this pull request Feb 18, 2020
…sonic-net#2679)

Submodule src/sonic-utilities f95da07..2fe01fe:
  > neighbor advertiser script (#469)
  > [aclshow] restore PRIO column and sort entries by priority (#476)
  > Update watermark default polling interval to 10s (#470)
  > show interface status <interface-name> throws error (fixes #427) (#440)

Submodule src/sonic-swss 90eb25d..91171b6:
  > fix a unstable swss egress acl test (#776)
  > [aclorch] Remove  L4 port range support limitation on egress ACL table and add new SWSS virtual test. (#741)
  > Fix orchagent SEGV when PortConfigDone not set (#803)

Submodule src/sonic-swss-common 2592b0c..5f4abd9:
  > Force only supported commands on consumer table (#261)
  > Add multiple fields hdel support (#267)


Signed-off-by: Ying Xie <ying.xie@microsoft.com>
pull bot pushed a commit that referenced this pull request Oct 8, 2021
…tform testing (sonic-net#8815)

* [device/celestica-e1031]: fix apis follow lastest spec
* [device/celestica-e1031]: fix lgtm (#261)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants