Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom

[docker-syncd-brcm]: Sleep to allow syncd to create socket before calling bcmcmd #733

Merged
merged 2 commits into from
Jun 22, 2017
Merged

[docker-syncd-brcm]: Sleep to allow syncd to create socket before calling bcmcmd #733

merged 2 commits into from
Jun 22, 2017

Conversation

jleveque
Copy link
Contributor

No description provided.

@jleveque jleveque self-assigned this Jun 21, 2017
@jleveque jleveque requested a review from lguohan June 21, 2017 18:20
pavel-shirshov
pavel-shirshov suggested changes Jun 21, 2017
View reviewed changes
platform/broadcom/docker-syncd-brcm/start.sh Outdated
@@ -10,6 +10,8 @@ supervisorctl start syncd

# If this platform has an initialization file for the Broadcom LED microprocessor, load it
if [ -r ${PLATFORM_DIR}/led_proc_init.soc ]; then
# Sleep a bit to allow syncd to create the socket for bcmcmd to connect to
sleep 5
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wait until the socket is active
Like this
while /bin/true;
do

if [[ -e /var/run/sswsyncd/sswsyncd.socket ]];
then
break
fi
echo sleep
sleep 1

done

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Otherwise you're having a race condition here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, Pavel. This is intended to be a temporary solution; we will eventually load this file in SAI instead of in this script. However, I agree your solution is more robust, even for this temporary change. Resolved.

@lguohan lguohan merged commit 629362c into sonic-net:master Jun 22, 2017
@jleveque jleveque deleted the s6000_led_sleep branch June 22, 2017 03:06
qiluo-msft added a commit that referenced this pull request Jun 30, 2017
@qiluo-msft
Merge master to v1.0.3 (#778)
e3863f6 
* [build_debian]: Add dbus package to update timezone (#702)

Signed-off-by: Hiayang Zheng haiyang.z@alibaba.inc

* [Accton]: Add a new supported device and platform, AS7712-32X (#662)

* platform/broadcom: Add a new supported device and platform, AS7712-32X

* Switch Vendor: Edge-core
* Switch SKU:  AS7712-32X
* ASIC Vendor: Broadcom
* Swich ASIC: Tomahawk
* Port Configuration: 32x100G
* SONiC Image: SONiC-ONIE-Broadcom

  Signed-off-by: polly_hsu@accton.com

* [image]: load platform specific settings in sonic-to-sonic upgrade (#710)

* [submodule]: Update sairedis submodule (#712)

Include fix for saithrift port split parsing

* [docker-ptf]: Install exabgp in docker ptf (#709)

* [platform]: fix file mode for acction platform to create clean build (#714)

* [image]: expand dockerfs.tar.gz directly on to disk without intermediate file (#715)

* [submodule]: update swss/sairedis/swss-common submodule (#716)

fix bug for logrotate sairedis log

* [submodule]: update sonic-swss (#719)

* [image]: add debian security update in the apt source list (#724)

* [submodule]: update sonic-platform-daemons (#722)

* [platform]: turn on/off four leds for breakout-able front panel ports (#723)

turn on/off four leds for breakout-able front panel ports on arista 7050 qx32 platform

* [sonic-quagga]:update submodule (#718)

Signed-off-by: Sihui Han <sihan@microsoft.com>

* Add Broadcom LED microprocessor initialization for Dell S6000 (#726)

* Add Broadcom LED microprocessor initialization for Dell S6000

* Increase bcmcmd timeout to 60 seconds

* [platform]: Update sonic-platform-modules-arista (#727)

* [Broadcom]: Update SAI package to support Accton-AS7712-C32 (#720)

* Remove exsiting sonic-platform-modules-accton and apply submodule add… (#717)

* Remove exsiting sonic-platform-modules-accton and apply submodule adding on this folder.

* Remove redundant commnet

* Remove folder platform/broadcom/sonic-platform-modules-accton.

* Add this dir for submodule.

* [submodule]: update sonic-platform-daemons submodule (#731)

* [installer] Copy old config files rather than only minigraph (#730)

* [BGPD]: add bgp dynamic neighbor configuration (#708)

* add bgp dynamic neighbor configuration

* [bgpd]: update as comments

* update as comment

* update to deployment_id_asn_map

* minor change

* [docker-syncd-brcm]: Sleep to allow syncd to create socket before calling bcmcmd (#733)

* [docker-syncd-brcm]: Sleep to allow syncd to create socket before calling bcmcmd

* Instead of fixed sleep interval, continually check for presence of socket

* [sonic-cfggen]: Support multiple input yaml files with -y option (#729)

* [sonic-cfggen]: Fix minigraph.py when port_alias_map absent (#738)

* [bgp]: move allowas-in into ipv6 section to enable allowas-in for ipv6 (#741)

* [swss]: Sleep 5 min regardless of arp_update return code (#743)

- arp_update return code is not guaranteed to be true/false.
  When there is no VLAN, arp_update will return true.
  When there are VLANs, arp_update will return false because the
  command arping returns 1 due to the option '-w 0'.
- This script should be run every 5 minutes regardless of the return
  code.

* [Mellanox]: Update SAI version (#740)

- Initialize ECMP default hashing with IPv6 packets

* [sonic-cfggen]: Add default IP deny rule in translate_acl (#734)

- Add IPv4 implicit rule: deny ip any any
  This implicit rule has lowest priority and ensures that
  the device denies all unmatched IP traffic.

* [docker-platform-monitor]: Add fancontrol (#735)

* Fix typo in README (#750)

* Fix typo in README

* Fix comment

* Fix README

* [DHCP Relay]: Add support for custom Option 82 circuit_id of the form '<hostname>:<portname>' (#747)

* Add docker-dhcp-relay/Dockerfile to .gitignore

* Add isc-dhcp-relay .deb package to image build process, along with my Option 82 patch

* Install custom isc-dhcp-relay in dhcp_relay docker

* Install isc-dhcp-relay build dependencies in sonic-slave Docker container

* Copy the built .deb package to the destination directory

* Add dependencies for isc-dhcp-relay

* Change Option 82 string to '<hostname>:<portname>'

* Install dependencies of .deb files implicitly in Dockerfile

* Remove unused line

* Remove unnecessary space

* [Accton]: Add a new supported device and platform AS7716-32X  (#732)

Switch Vendor: Edge-core
Switch SKU: AS7716-32X
ASIC Vendor: Broadcom
Swich ASIC: Tomahawk
Port Configuration: 32x100G
SONiC Image: SONiC-ONIE-Broadcom

Signed-off-by: polly_hsu@accton.com

* [.gitignore]: Update src, config engine (#754)

Signed-off-by: marian-pritsak <marianp@mellanox.com>

* [submodule]: update sonic-swss (#755)

* [sonic-swss-common]: Submodule update (#759)

* [mgmt slave] Install correct version of python-cffi (#760)

* [DHCP Relay]: Fix Option 82 string - Remove quotes; add MAC address of receiving port as remote_id (#763)

* [platform]: add front panel index in port_config.ini for s6100 (#752)

* add front panel index in port_config.ini

* [igb]: change download url to azure storage url (#770)

* [baseimage]: Increase net.core.rmem_max to 2097152  (#767)

* Increase net.core.rmem_max to 2097152

* Update Ingrasys platform submodule (#764)

* Remove specific fancontrol service.

Signed-off-by: Wade He <chihen.he@gmail.com>

* [Broadcom]: Update SAI package to support Celestica Seastone DX010 and Accton AS7716 (#768)

* [LLDP]: Port description (TLV 4) now contains '<neighbor_host_name>:<port_name>' (#772)

* [sonic-slave]: install docker-ce 17.03.02 stable version (#774)

* [device]: add minigraph and LED support for Arista 7050 QX32S (#773)

* Update submodules: sairedis, swss
lguohan added a commit to lguohan/sonic-buildimage that referenced this pull request Dec 28, 2018
@lguohan
[submodule]: update sonic-swss
dcee4e5 
* 0c07a80 2018-12-27 | [intfmgrd]: Merge intfsyncd into intfmgrd (sonic-net#635) (HEAD, origin/master, origin/HEAD) [Marian Pritsak]
* a45c7b5 2018-12-23 | [watermark] fix watermark clear not working for PG (sonic-net#729) [Mykola F]
*   25d16b3 2018-12-23 | [neighorch] return back original condition for port oper status (sonic-net#727) [Qi Luo]
|\
| * 05a3558 2018-12-12 | [neighorch] return back original condition for port oper status [Stepan Blyschak]
* | 514cfef 2018-12-23 | [swssconfig]: Remove deprecated qos buffer configurations (sonic-net#726) [Shuotian Cheng]
* | 025268a 2018-12-22 | [WR]: Add reconciliation logic for teamsyncd (sonic-net#725) [pavel-shirshov]
* | 5803a8c 2018-12-21 | Fix: crash while destructing crmorch (sonic-net#731) [Qi Luo]
* | 998b4ab 2018-12-21 | Temporarily skip the testcase test_routing_WarmRestart to unblock other pull requests (sonic-net#733) [Qi Luo]
* | a7a68c1 2018-12-19 | Optimize neigh restore process during warm-reboot (sonic-net#722) [zhenggen-xu]
|/
* 3d60b3e 2018-12-03 | [portsorch] Portsorch simple improvements (sonic-net#718) [stepanblyschak]

Signed-off-by: Guohan Lu <gulv@microsoft.com>
@lguohan lguohan mentioned this pull request Dec 28, 2018
Merged
lguohan added a commit that referenced this pull request Dec 29, 2018
@lguohan
[submodule]: update sonic-swss (#2403)
1e8d3ec 
* 0c07a80 2018-12-27 | [intfmgrd]: Merge intfsyncd into intfmgrd (#635) (HEAD, origin/master, origin/HEAD) [Marian Pritsak]
* a45c7b5 2018-12-23 | [watermark] fix watermark clear not working for PG (#729) [Mykola F]
*   25d16b3 2018-12-23 | [neighorch] return back original condition for port oper status (#727) [Qi Luo]
|\
| * 05a3558 2018-12-12 | [neighorch] return back original condition for port oper status [Stepan Blyschak]
* | 514cfef 2018-12-23 | [swssconfig]: Remove deprecated qos buffer configurations (#726) [Shuotian Cheng]
* | 025268a 2018-12-22 | [WR]: Add reconciliation logic for teamsyncd (#725) [pavel-shirshov]
* | 5803a8c 2018-12-21 | Fix: crash while destructing crmorch (#731) [Qi Luo]
* | 998b4ab 2018-12-21 | Temporarily skip the testcase test_routing_WarmRestart to unblock other pull requests (#733) [Qi Luo]
* | a7a68c1 2018-12-19 | Optimize neigh restore process during warm-reboot (#722) [zhenggen-xu]
|/
* 3d60b3e 2018-12-03 | [portsorch] Portsorch simple improvements (#718) [stepanblyschak]

Signed-off-by: Guohan Lu <gulv@microsoft.com>
yxieca pushed a commit that referenced this pull request Jan 4, 2019
@lguohan @yxieca
[submodule]: update sonic-swss (#2403)
602204f 
* 0c07a80 2018-12-27 | [intfmgrd]: Merge intfsyncd into intfmgrd (#635) (HEAD, origin/master, origin/HEAD) [Marian Pritsak]
* a45c7b5 2018-12-23 | [watermark] fix watermark clear not working for PG (#729) [Mykola F]
*   25d16b3 2018-12-23 | [neighorch] return back original condition for port oper status (#727) [Qi Luo]
|\
| * 05a3558 2018-12-12 | [neighorch] return back original condition for port oper status [Stepan Blyschak]
* | 514cfef 2018-12-23 | [swssconfig]: Remove deprecated qos buffer configurations (#726) [Shuotian Cheng]
* | 025268a 2018-12-22 | [WR]: Add reconciliation logic for teamsyncd (#725) [pavel-shirshov]
* | 5803a8c 2018-12-21 | Fix: crash while destructing crmorch (#731) [Qi Luo]
* | 998b4ab 2018-12-21 | Temporarily skip the testcase test_routing_WarmRestart to unblock other pull requests (#733) [Qi Luo]
* | a7a68c1 2018-12-19 | Optimize neigh restore process during warm-reboot (#722) [zhenggen-xu]
|/
* 3d60b3e 2018-12-03 | [portsorch] Portsorch simple improvements (#718) [stepanblyschak]

Signed-off-by: Guohan Lu <gulv@microsoft.com>
madhanmellanox pushed a commit to madhanmellanox/sonic-buildimage that referenced this pull request Mar 23, 2020
@qiluo-msft
Temporarily skip the testcase test_routing_WarmRestart to unblock oth…
998b4ab 
…er pull requests (sonic-net#733)

* Temporarily skip to unblock other pull requests
* Add missing import
liat-grozovik pushed a commit that referenced this pull request Jan 11, 2023
@nazariig
[submodule] Advance sonic-swss-common pointer (#13321)
d7b2bdb 
Update sonic-swss-common submodule pointer to include the following:

a4987b9 Change the dtor of ProducerStateTable to virtual method (#735)
7be565c [hash]: Add GH DB schema. (#733)

Signed-off-by: Nazarii Hnydyn <nazariig@nvidia.com>
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@lguohan lguohan lguohan approved these changes

@pavel-shirshov pavel-shirshov pavel-shirshov approved these changes

@svc-acs svc-acs svc-acs approved these changes

Assignees

@jleveque jleveque

Labels
Bug 🐛
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@jleveque @lguohan @pavel-shirshov @svc-acs @msftclas