Skip to content

[pull] master from Azure:master #1473

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

Merged
pull merged 3 commits into from
Mar 31, 2021
Merged

[pull] master from Azure:master #1473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ecaf97d
[mellanox]: Integrate hw-mgmt package V.7.0010.2002 (#7148)
stephenxs Mar 31, 2021
b313d4d
[systemlag] Lag id boundary set for system lag (#6488)
vganesan-nokia Mar 31, 2021
a8f8385
[doc]: Update issue_template.md (#7067)
kannankvs Mar 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/issue_template.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@
```
(paste your output here)
```
#### Output of `show techsupport`:

```
(paste your output here or download and attach the file here )
```

#### Additional information you deem important (e.g. issue happens only occasionally):

Expand Down
14 changes: 14 additions & 0 deletions files/build_templates/docker_image_ctl.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,19 @@ function preStartAction()
updateSyslogConf
}

{%- if docker_container_name == "database" %}

function setPlatformLagIdBoundaries()
{
CHASSIS_CONF=/usr/share/sonic/device/$PLATFORM/chassisdb.conf
if [ -f "$CHASSIS_CONF" ]; then
source $CHASSIS_CONF
$SONIC_DB_CLI CHASSIS_APP_DB SET "SYSTEM_LAG_ID_START" "$lag_id_start"
$SONIC_DB_CLI CHASSIS_APP_DB SET "SYSTEM_LAG_ID_END" "$lag_id_end"
fi
}
{%- endif %}

function postStartAction()
{
{%- if docker_container_name == "database" %}
Expand Down Expand Up @@ -162,6 +175,7 @@ function postStartAction()
($(docker exec -i ${DOCKERNAME} $SONIC_DB_CLI CHASSIS_APP_DB PING | grep -c True) -gt 0) ]]; do
sleep 1
done
setPlatformLagIdBoundaries
REDIS_SOCK="/var/run/redis-chassis/redis_chassis.sock"
fi
chgrp -f redis $REDIS_SOCK && chmod -f 0760 $REDIS_SOCK
Expand Down
2 changes: 1 addition & 1 deletion platform/mellanox/hw-management.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Mellanox HW Management

MLNX_HW_MANAGEMENT_VERSION = 7.0010.2000
MLNX_HW_MANAGEMENT_VERSION = 7.0010.2002

export MLNX_HW_MANAGEMENT_VERSION

Expand Down
2 changes: 1 addition & 1 deletion platform/mellanox/hw-management/hw-mgmt
Open in desktop
Submodule hw-mgmt updated 11 files
+13 −0 debian/Release.txt
+2 −2 debian/changelog
+38 −33 recipes-kernel/linux/Patch_Status_Table.txt
+105 −0 recipes-kernel/linux/linux-4.19/0076-mlxsw-core-Remove-critical-trip-point-from-thermal-z.patch
+2 −0 recipes-kernel/linux/linux-4.19/series_onl_blklist
+105 −0 recipes-kernel/linux/linux-4.9/0071-mlxsw-core-Remove-critical-trip-point-from-thermal-z.patch
+2 −2 usr/usr/bin/hw-management-chassis-events.sh
+1 −1 usr/usr/bin/hw-management-start-post.sh
+4 −5 usr/usr/bin/hw-management-thermal-control.sh
+9 −1 usr/usr/bin/hw-management-thermal-events.sh
+0 −1 usr/usr/bin/hw-management.sh