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

Revert "Move /var/log to RAM for Mellanox SN2700, Nokia 7215 and Dell S6100 #16775

Merged
merged 1 commit into from
Oct 11, 2023

Conversation

assrinivasan
Copy link
Contributor

@assrinivasan assrinivasan commented Oct 4, 2023

This reverts commit 05f326e.

Why I did it

Mellanox raised concerns about PR15077. So, we need to revert it.

Work item tracking
  • Microsoft ADO 25355843:

How I did it

By calling git revert on commit SHA 05f326e, which is PR #15077 , and fixing merge conflicts on Dell's installer.conf file.

How to verify it

Check that the files modified by aforementioned PR does not have log_inram config.
Build and flash images with this config then verify the following:

Dell S6100

admin@str3-s6100-acs-7:~$ df -h | grep -i '/var/log'
/dev/loop1      3.9G   13M  3.7G   1% /var/log
admin@str3-s6100-acs-7:~$
admin@str3-s6100-acs-7:~$ free -h
               total        used        free      shared  buff/cache   available
Mem:           7.7Gi       1.6Gi       4.8Gi        49Mi       1.4Gi       5.9Gi
Swap:             0B          0B          0B
admin@str3-s6100-acs-7:~$

Mellanox SN2700

admin@str-msn2700-22:~$ df -h | grep -i '/var/log'
/dev/loop1      3.9G  198M  3.5G   6% /var/log
admin@str-msn2700-22:~$
admin@str-msn2700-22:~$ free -h
               total        used        free      shared  buff/cache   available
Mem:           7.7Gi       2.7Gi       3.5Gi       141Mi       1.5Gi       4.7Gi
Swap:             0B          0B          0B
admin@str-msn2700-22:~$

Nokia 7215

admin@str2-7215-acs-1:~$
admin@str2-7215-acs-1:~$  df -h | grep -i '/var/log'
/dev/loop1      3.9G  856K  3.7G   1% /var/log
admin@str2-7215-acs-1:~$
admin@str2-7215-acs-1:~$ free -h
               total        used        free      shared  buff/cache   available
Mem:           3.0Gi       592Mi       1.8Gi       7.0Mi       560Mi       2.3Gi
Swap:             0B          0B          0B
admin@str2-7215-acs-1:~$

Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111
  • 202205
  • 202211
  • 202305

Tested branch (Please provide the tested image version)

Description for the changelog

Link to config_db schema for YANG module changes

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

@dgsudharsan
Copy link
Collaborator

@assrinivasan @prgeor Can you please add labels to branches where the revert needs to be backported?

@prgeor
Copy link
Contributor

prgeor commented Oct 9, 2023

@yxieca @lguohan please merge

@yxieca yxieca requested a review from Blueve October 9, 2023 16:03
@yxieca
Copy link
Contributor

yxieca commented Oct 9, 2023

@Blueve Please review the 7215 change. Thanks.

@assrinivasan assrinivasan self-assigned this Oct 9, 2023
@assrinivasan assrinivasan changed the title Revert "Move /var/log to RAM for Mellanox SN2700, Nokia 7215 and Dell… Revert "Move /var/log to RAM for Mellanox SN2700, Nokia 7215 and Dell S6100 Oct 11, 2023
@lguohan lguohan merged commit 61683d9 into sonic-net:master Oct 11, 2023
@Blueve
Copy link
Contributor

Blueve commented Oct 13, 2023

@yxieca LGTM

mssonicbld pushed a commit to mssonicbld/sonic-buildimage that referenced this pull request Oct 14, 2023
@mssonicbld
Copy link
Collaborator

Cherry-pick PR to 202205: #16886

@mssonicbld
Copy link
Collaborator

Cherry-pick PR to 202305: #16915

mssonicbld pushed a commit that referenced this pull request Oct 17, 2023
… S6100 (#15077)" (#16775)

This reverts commit 05f326e.

Microsoft ADO 25355843:
stephenxs added a commit to stephenxs/sonic-buildimage that referenced this pull request Jun 4, 2024
…and Dell S6100 (sonic-net#15077)" (sonic-net#16775)"

This reverts commit 61683d9.

Signed-off-by: Stephen Sun <stephens@nvidia.com>
# for free to join this conversation on GitHub. Already have an account? # to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants