Skip to content

Sync to master#9

Merged
nikos-github merged 5 commits intonikos-github:masterfrom
sonic-net:master
Oct 4, 2018
Merged

Sync to master#9
nikos-github merged 5 commits intonikos-github:masterfrom
sonic-net:master

Conversation

@nikos-github
Copy link
Copy Markdown
Owner

- What I did

- How I did it

- How to verify it

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

yxieca and others added 5 commits October 1, 2018 19:01
* [syncd] warn shutdown syncd process when warm boot is enabled

Signed-off-by: Ying Xie <ying.xie@microsoft.com>

* [warmboot] mount folder to hold warmboot temporary files

Signed-off-by: Ying Xie <ying.xie@microsoft.com>

* Fix a typo
* [platform_accton] Remove dependency on particular version of linux.
Signed-off-by: Polly Hsu <polly_hsu@edge-core.com>

* [platfrom] as5712-54x: update i2c_client for linux kernel 4.x.
Signed-off-by: Polly Hsu <polly_hsu@edge-core.com>

* [platform] Update lastest optoe.c from https://github.com/opencomputeproject/oom/blob/master/optoe/optoe.c.
Signed-off-by: roy_lee <roy_lee@accton.com>

* [platform] rm optoe driver here. For it's inside the kernel.
Signed-off-by: roy_lee <roy_lee@accton.com>

* [platform] as5712-54x, merge the change of #2002 which is on branch 201807.
Signed-off-by: roy_lee <roy_lee@accton.com>
#2083)

* Adapt to the new WARM_RESTART_TABLE table schema: change from restart_count to restore_count

Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com>

* Update variable and function name to match restore_count name change

Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com>

* Update swss submodule for warm restart schema change

Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com>
Flashes used for the 7050QX-32 and 7050QX-32S have a fw issue.
The best option to solve the problem is to upgrade to a newer firmware.
However this can only be done while in memory and take 10 seconds.
Adding an upgrade mechanism is possible but would need more
consideration as flashing the firmware and reformating the flash will
exceed the fast-reboot requirements.

A quick mitigation is to align the ext4 partition that we create on
these vfat based system on a 4k boundary.
Here we chose 1M instead but it's the same.
Newer version of sfdisk do this automatically but the one in SONiC
today doesn't have this behavior.

This workaround will only reduce the pace of the flash health
degradation. The only long term fix is to flash the firmware.
* FRR 4.0 integration with SONiC

-- Uses SONiC FRR repo frr/4.0 (which has SONiC support) to build image
-- Makefile changes to make frr4.0 builtable.
-- Updated/Added FRR configuration files
-- bgpd jinja template fixes

To build SONiC images with FRR4.0, simply edit rules/config file and change
routing stack to following:

SONIC_ROUTING_STACK = frr

and then build images as usual.

* Used integrated-vtysh-config in FRR
Changed to single template: frr.conf.j2 for configuration and added tests
@nikos-github nikos-github merged commit 0264bf3 into nikos-github:master Oct 4, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants