Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[updategraph] Remove pending_initialization flag after first boot #1538

Merged
merged 1 commit into from
Mar 28, 2018
Merged

[updategraph] Remove pending_initialization flag after first boot #1538

merged 1 commit into from
Mar 28, 2018

Conversation

taoyl-ms
Copy link
Contributor

- What I did
Fix a bug that in certain procedure manual-deployed minigraph could get overwritten by default minigraph.

- How I did it
To always remove /tmp/pending_config_initialization flag no matter if $enabled=true (default minigraph copied) or not (minigraph got from DHCP).

- How to verify it

  1. Do a new installation with an image with ENABLE_DHCP_GRAPH_SERVICE = y option (mapped to $enabled=true in /etc/sonic/updategraph.conf)
  2. Boot normally. Use DHCP service to deploy a minigraph A, or default minigraph, or minimal minigraph.
  3. Manually copy minigraph B onto device
  4. config load_minigraph
    Under above steps, before fix, minigraph B will be overwritten by default minigraph before loaded into configDB. After fix, minigraph B will be loaded correctly.

@taoyl-ms taoyl-ms requested a review from lguohan March 28, 2018 00:31
@lguohan lguohan merged commit 4daf002 into sonic-net:master Mar 28, 2018
@madhanmellanox madhanmellanox mentioned this pull request Jan 17, 2021
Closed
4 tasks
lguohan pushed a commit to qiluo-msft/sonic-buildimage that referenced this pull request Jan 20, 2021
@qiluo-msft @lguohan
[sonic-swss] Update submodule
af352f8 
Including below commits:
693a02c 2021-01-08 | [gearbox] Add support for "hwinfo" field (sonic-net#1547) [Baptiste Covolato]
7e3b2c6 2021-01-09 | [Evpn Warmreboot] Added Dependancy check logic in VrfMgr (sonic-net#1466) [nkelapur]
a960e2e 2021-01-09 | [Orchagent]: FdbOrch changes for EVPN VXLAN (sonic-net#1275) [Pankaj Jain]
097cfda 2021-01-08 | [swss test] update setup guide for swss tests (sonic-net#1582) [Ying Xie]
b42253a 2021-01-05 | Fix for armhf build (sonic-net#1580) [Qi Luo]
d8c1465 2021-01-05 | [dvs] Update/disable DVS tests with new FRR 7.5 behavior (sonic-net#1579) [Danny Allen]
f6c7422 2021-01-05 | ASIC internal temperature sensors support (sonic-net#1517) [Santhosh Kumar T]
0aa9ef2 2021-01-01 | Simply by auto iterator type, because we will tune the return types of library functions (sonic-net#1577) [Qi Luo]
773238b 2020-12-31 | [build]: Fix format string for size_t (sonic-net#1576) [Qi Luo]
7ba4e43 2020-12-30 | [fgnhgorch] add warm reboot support for fgnhg (sonic-net#1538) [weixchen1215]
4cf6617 2020-12-30 | [ci]: add build for arm64 and armhf (sonic-net#1572) [lguohan]
6ebc0ed 2020-12-29 | [ci]: add azure-pipeline for amd64 (sonic-net#1571) [lguohan]
e32b9d0 2020-12-29 | [FDBSYNCD] Added pytest for fdbsyncd (sonic-net#1560) [KISHORE KUNAL]
a43f6be 2020-12-30 | [crm] Add support for snat, dnat and ipmc crm resources (sonic-net#1511) [Prabhu Sreenivasan]
7fc3888 2020-12-29 | PY Test script for EVPN L3 VxLAN (sonic-net#1330) [Tapash Das]
6eb36d9 2020-12-27 | vlanmgr changes related to EVPN VxLan warmboot (sonic-net#1460) [anilkpan]
lguohan pushed a commit that referenced this pull request Jan 21, 2021
@qiluo-msft
[sonic-swss] Update submodule (#6336)
21c3573 
Including below commits:

36f7332 2021-01-14 | modified ERR log to NOTICE log for FDB notification failure after VLAN delete (#1595) [madhanmellanox]
c21c883 2021-01-12 | [ci]: download artifacts from master branch build (#1597) [lguohan]
a1d03a4 2021-01-12 | [fgnhgorch] Match mode changes for Fine Grained ECMP (#1565) [anish-n]
1b65f3d 2021-01-12 | [ci]: use sonicbld pool (#1594) [lguohan]
48ae866 2021-01-12 | [pfcwd] Update PFC storm detection logic for Mellanox platforms (#1586) [Volodymyr Samotiy]
850001f 2021-01-12 | [FPMSYNCD] Evpn/Vxlan related changes to support FRR7.5(#1585) [KISHORE KUNAL]
64ca9bb 2021-01-12 | [ci]: only copy artifacts when build is successful (#1590) [lguohan]
17d0dae 2021-01-11 | [Fdborch] Fix for arm compilation (#1592) [Prince Sunny]
693a02c 2021-01-08 | [gearbox] Add support for "hwinfo" field (#1547) [Baptiste Covolato]
7e3b2c6 2021-01-09 | [Evpn Warmreboot] Added Dependancy check logic in VrfMgr (#1466) [nkelapur]
a960e2e 2021-01-09 | [Orchagent]: FdbOrch changes for EVPN VXLAN (#1275) [Pankaj Jain]
097cfda 2021-01-08 | [swss test] update setup guide for swss tests (#1582) [Ying Xie]
b42253a 2021-01-05 | Fix for armhf build (#1580) [Qi Luo]
d8c1465 2021-01-05 | [dvs] Update/disable DVS tests with new FRR 7.5 behavior (#1579) [Danny Allen]
f6c7422 2021-01-05 | ASIC internal temperature sensors support (#1517) [Santhosh Kumar T]
0aa9ef2 2021-01-01 | Simply by auto iterator type, because we will tune the return types of library functions (#1577) [Qi Luo]
773238b 2020-12-31 | [build]: Fix format string for size_t (#1576) [Qi Luo]
7ba4e43 2020-12-30 | [fgnhgorch] add warm reboot support for fgnhg (#1538) [weixchen1215]
4cf6617 2020-12-30 | [ci]: add build for arm64 and armhf (#1572) [lguohan]
6ebc0ed 2020-12-29 | [ci]: add azure-pipeline for amd64 (#1571) [lguohan]
e32b9d0 2020-12-29 | [FDBSYNCD] Added pytest for fdbsyncd (#1560) [KISHORE KUNAL]
a43f6be 2020-12-30 | [crm] Add support for snat, dnat and ipmc crm resources (#1511) [Prabhu Sreenivasan]
7fc3888 2020-12-29 | PY Test script for EVPN L3 VxLAN (#1330) [Tapash Das]
6eb36d9 2020-12-27 | vlanmgr changes related to EVPN VxLan warmboot (#1460) [anilkpan]

Signed-off-by: Guohan Lu <lguohan@gmail.com>
daall pushed a commit that referenced this pull request Jan 22, 2021
@qiluo-msft @daall
[sonic-swss] Update submodule (#6336)
77ec2ee 
Including below commits:

36f7332 2021-01-14 | modified ERR log to NOTICE log for FDB notification failure after VLAN delete (#1595) [madhanmellanox]
c21c883 2021-01-12 | [ci]: download artifacts from master branch build (#1597) [lguohan]
a1d03a4 2021-01-12 | [fgnhgorch] Match mode changes for Fine Grained ECMP (#1565) [anish-n]
1b65f3d 2021-01-12 | [ci]: use sonicbld pool (#1594) [lguohan]
48ae866 2021-01-12 | [pfcwd] Update PFC storm detection logic for Mellanox platforms (#1586) [Volodymyr Samotiy]
850001f 2021-01-12 | [FPMSYNCD] Evpn/Vxlan related changes to support FRR7.5(#1585) [KISHORE KUNAL]
64ca9bb 2021-01-12 | [ci]: only copy artifacts when build is successful (#1590) [lguohan]
17d0dae 2021-01-11 | [Fdborch] Fix for arm compilation (#1592) [Prince Sunny]
693a02c 2021-01-08 | [gearbox] Add support for "hwinfo" field (#1547) [Baptiste Covolato]
7e3b2c6 2021-01-09 | [Evpn Warmreboot] Added Dependancy check logic in VrfMgr (#1466) [nkelapur]
a960e2e 2021-01-09 | [Orchagent]: FdbOrch changes for EVPN VXLAN (#1275) [Pankaj Jain]
097cfda 2021-01-08 | [swss test] update setup guide for swss tests (#1582) [Ying Xie]
b42253a 2021-01-05 | Fix for armhf build (#1580) [Qi Luo]
d8c1465 2021-01-05 | [dvs] Update/disable DVS tests with new FRR 7.5 behavior (#1579) [Danny Allen]
f6c7422 2021-01-05 | ASIC internal temperature sensors support (#1517) [Santhosh Kumar T]
0aa9ef2 2021-01-01 | Simply by auto iterator type, because we will tune the return types of library functions (#1577) [Qi Luo]
773238b 2020-12-31 | [build]: Fix format string for size_t (#1576) [Qi Luo]
7ba4e43 2020-12-30 | [fgnhgorch] add warm reboot support for fgnhg (#1538) [weixchen1215]
4cf6617 2020-12-30 | [ci]: add build for arm64 and armhf (#1572) [lguohan]
6ebc0ed 2020-12-29 | [ci]: add azure-pipeline for amd64 (#1571) [lguohan]
e32b9d0 2020-12-29 | [FDBSYNCD] Added pytest for fdbsyncd (#1560) [KISHORE KUNAL]
a43f6be 2020-12-30 | [crm] Add support for snat, dnat and ipmc crm resources (#1511) [Prabhu Sreenivasan]
7fc3888 2020-12-29 | PY Test script for EVPN L3 VxLAN (#1330) [Tapash Das]
6eb36d9 2020-12-27 | vlanmgr changes related to EVPN VxLan warmboot (#1460) [anilkpan]

Signed-off-by: Guohan Lu <lguohan@gmail.com>
allas-nvidia added a commit to allas-nvidia/sonic-buildimage that referenced this pull request Apr 6, 2021
@allas-nvidia
[submodule update] sonic-utilities
10a8cc8 
27ad705  Update PR 1310 with change of the function _checkNoPortsInAsicDb to checkNoPortsInAsicDb
55c64f2  [config/main.py]: Filter table from input config while config validation\DPB.
1993087  [config_mgmt.py]: Verify port status down in APPL DB.
69a5077  Replace call with mock.call
cf52272  interface_name_is_valid add arg config_db
0834863  [config/main.py]: Use click.abort() and fix test case by deepcopy().
7c76602  Fix _shutdownIntf to check correct call
bbf05e1  [tests/config_mgmt_test.py]: Minor changes to fix tests.
5e69412  Tests for shutdown intf
2352650  [config_mgmt.py]: Shutdown the interfaces after config validation. (sonic-net#28)
9bbc25f  [config] Eliminate race condition between reloading Monit config and (sonic-net#1543)
87b2481  Reduce time taken by show commands on multi-asic platforms (sonic-net#1544)
12fc01e  [reboot] No need enable the Linux magic system request key (sonic-net#1538)
e0f678a  [setup.py]: move the module to test requirement (sonic-net#1542)
d55d406  [acl_loader]: add iptype match to the rules for dataplane acl
37376dd  [ci]: download latest docker-sonic-vs from sonic-swss repo
e9cfb32  [fast-reboot] Fix dump script to support PortChannels in a VLAN group (sonic-net#1393)

Signed-off-by: allas <allas@nvidia.com>
yxieca added a commit to yxieca/sonic-buildimage that referenced this pull request Apr 8, 2021
@yxieca
[202012][swss][utilities] advance submodule heads
ab85469 
SWSS:
* d97c7c7 2021-04-07 | [Dynamic Buffer Calc] Enhancement: coding style and LGTM alerts (sonic-net#1693) (HEAD -> 202012) [Stephen Sun]
* f70b3da 2021-04-03 | [Makefile] Reorder libsaimetadata and libswsscommon (sonic-net#1689) [Kamil Cudnik]
* 72ae85d 2021-04-08 | [vlan] Add support of VLAN host interface (sonic-net#1645) [Volodymyr Samotiy]
* a555b9c 2021-04-02 | Correct the sflow default sample rate (sonic-net#1623) [fredyu190011]

Utilities:
* 1a789d2 2021-04-07 | Fixed the possibility of using uninitialized variable in route_check.py (sonic-net#1551) (HEAD -> 202012) [Renuka Manavalan]
* 2412e3c 2021-04-06 | Fix fast-reboot-dump.py SonicV2Connector after late merge (sonic-net#1546) [shlomibitton]
* f99c5f1 2021-04-02 | [fast-reboot] Fix dump script to support PortChannels in a VLAN group (sonic-net#1393) [shlomibitton]
* 716e2af 2021-04-04 | Reduce time taken by show commands on multi-asic platforms (sonic-net#1544) [abdosi]
* a160519 2021-04-03 | [setup.py]: move the module to test requirement (sonic-net#1542) [lguohan]
* eaa67fe 2021-04-04 | [config] Eliminate race condition between reloading Monit config and (sonic-net#1543) [yozhao101]
* 2497a9e 2021-04-03 | [reboot] No need enable the Linux magic system request key (sonic-net#1538) [yozhao101]
* 9fda6fe 2021-04-06 | [fwutil]: Fix next image mount (sonic-net#1533) [Nazarii Hnydyn]
* 9af50fe 2021-02-09 | Import 'mock' module from 'unittest' library (sonic-net#1415) (HEAD -> 202012) [Joe LeVeque]

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
@yxieca yxieca mentioned this pull request Apr 8, 2021
Merged
yxieca added a commit that referenced this pull request Apr 9, 2021
@yxieca
[202012][swss][utilities] advance submodule heads (#7267)
4a54148 
SWSS:
* d97c7c7 2021-04-07 | [Dynamic Buffer Calc] Enhancement: coding style and LGTM alerts (#1693) (HEAD -> 202012) [Stephen Sun]
* f70b3da 2021-04-03 | [Makefile] Reorder libsaimetadata and libswsscommon (#1689) [Kamil Cudnik]
* 72ae85d 2021-04-08 | [vlan] Add support of VLAN host interface (#1645) [Volodymyr Samotiy]
* a555b9c 2021-04-02 | Correct the sflow default sample rate (#1623) [fredyu190011]

Utilities:
* 1a789d2 2021-04-07 | Fixed the possibility of using uninitialized variable in route_check.py (#1551) (HEAD -> 202012) [Renuka Manavalan]
* 2412e3c 2021-04-06 | Fix fast-reboot-dump.py SonicV2Connector after late merge (#1546) [shlomibitton]
* f99c5f1 2021-04-02 | [fast-reboot] Fix dump script to support PortChannels in a VLAN group (#1393) [shlomibitton]
* 716e2af 2021-04-04 | Reduce time taken by show commands on multi-asic platforms (#1544) [abdosi]
* a160519 2021-04-03 | [setup.py]: move the module to test requirement (#1542) [lguohan]
* eaa67fe 2021-04-04 | [config] Eliminate race condition between reloading Monit config and (#1543) [yozhao101]
* 2497a9e 2021-04-03 | [reboot] No need enable the Linux magic system request key (#1538) [yozhao101]
* 9fda6fe 2021-04-06 | [fwutil]: Fix next image mount (#1533) [Nazarii Hnydyn]
* 9af50fe 2021-02-09 | Import 'mock' module from 'unittest' library (#1415) (HEAD -> 202012) [Joe LeVeque]

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
stepanblyschak pushed a commit to stepanblyschak/sonic-buildimage that referenced this pull request May 10, 2021
@yozhao101
[reboot] No need enable the Linux magic system request key (sonic-net…
12fc01e 
…#1538)

As introduced by the kernel doc, we do not need the line 20 in reboot script since it only influenced the capability to reboot the Linux kernel by hitting the combo magic key of keyboard.

Signed-off-by: Yong Zhao <yozhao@microsoft.com>
theasianpianist pushed a commit to theasianpianist/sonic-buildimage that referenced this pull request Feb 5, 2022
@weixchen1215
[fgnhgorch] add warm reboot support for fgnhg (sonic-net#1538)
7ba4e43 
- Add bake() functions in FgnhgOrch
  bake() function retrieves the state database information
  so that when the new route is added, fgnhg orch is able to recover
  the nexthop and bucket the same as before warm reboot.

- Add priority to fgnhg tables so that fgnhg tables can be loaded prior to route table.

Co-authored-by: Ubuntu <weixchen@weixchen-dev.papr3y04rasunohgmh0bxenl2f.xx.internal.cloudapp.net>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lguohan lguohan lguohan approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@taoyl-ms @lguohan