Skip to content

Don't fail if logrotate cron job file isn't present#6964

Merged
yxieca merged 1 commit intosonic-net:masterfrom
saiarcot895:logrotate-cronjob-remove
Dec 6, 2022
Merged

Don't fail if logrotate cron job file isn't present#6964
yxieca merged 1 commit intosonic-net:masterfrom
saiarcot895:logrotate-cronjob-remove

Conversation

@saiarcot895
Copy link
Contributor

@saiarcot895 saiarcot895 commented Dec 5, 2022

Signed-off-by: Saikrishna Arcot [email protected]

Description of PR

Summary:
Work on sonic-net/sonic-buildimage#12392.

Type of change

  • Bug fix
  • Testbed and Framework(new/improvement)
  • Test case(new/improvement)

Back port request

  • 201911
  • 202012
  • 202205

Approach

What is the motivation for this PR?

Bullseye-based images currently have both a cronjob task and a systemd timer configured for the logrotate rotation. This can cause conflicts with two simultaneous log rotations happening (in the worst case; I think there's some check somewhere to prevent this from happening).

How did you do it?

To fix this, the cronjob task will be removed. This means that this file will no longer exist. Therefore, don't fail if this file doesn't exist.

How did you verify/test it?

Verified that KVM T0 part 1 tests pass with an image without /etc/cron.d/logrotate.

Any platform specific information?

Supported testbed topology if it's a new test case?

Documentation

Bullseye-based images currently have both a cronjob task and a systemd
timer configured for the logrotate rotation. This can cause conflicts
with two simultaneous log rotations happening (in the worst case; I
think there's some check somewhere to prevent this from happening).

To fix this, the cronjob task will be removed. This means that this file
will no longer exist. Therefore, don't fail if this file doesn't exist.

Signed-off-by: Saikrishna Arcot <[email protected]>
@azure-pipelines
Copy link

The pre-commit check detected issues in the files touched by this pull request.
The detected issues may be old or new. For new issues, please try to fix them.

For old issues, it is not mandatory to fix them because they were not caused by this change. It is unfair to blame
author of this pull request. But if you can take extra effort to fix the old issues as well, that would be great!

Detailed pre-commit check results:
trim trailing whitespace.................................................Passed
fix end of files.........................................................Passed
check yaml...........................................(no files to check)Skipped
check for added large files..............................................Passed
check python ast.........................................................Passed
flake8...................................................................Failed
- hook id: flake8
- exit code: 1

tests/common/plugins/loganalyzer/loganalyzer.py:44:121: E501 line too long (141 > 120 characters)
tests/common/plugins/loganalyzer/loganalyzer.py:100:121: E501 line too long (137 > 120 characters)
tests/common/plugins/loganalyzer/loganalyzer.py:128:121: E501 line too long (122 > 120 characters)
tests/common/plugins/loganalyzer/loganalyzer.py:145:121: E501 line too long (145 > 120 characters)
tests/common/plugins/loganalyzer/loganalyzer.py:188:121: E501 line too long (124 > 120 characters)
tests/common/plugins/loganalyzer/loganalyzer.py:217:27: F523 '...'.format(...) has unused arguments at position(s): 0
tests/common/plugins/loganalyzer/loganalyzer.py:245:121: E501 line too long (189 > 120 characters)
tests/common/plugins/loganalyzer/loganalyzer.py:258:121: E501 line too long (142 > 120 characters)
tests/common/plugins/loganalyzer/loganalyzer.py:270:121: E501 line too long (145 > 120 characters)
tests/common/plugins/loganalyzer/loganalyzer.py:280:121: E501 line too long (166 > 120 characters)
tests/common/plugins/loganalyzer/loganalyzer.py:285:121: E501 line too long (203 > 120 characters)
...
[truncated extra lines, please run pre-commit locally to view full check results]

To run the pre-commit checks locally, you can follow below steps:

  1. Ensure that default python is python3. In sonic-mgmt docker container, default python is python2. You can run
    the check by activating the python3 virtual environment in sonic-mgmt docker container or outside of sonic-mgmt
    docker container.
  2. Ensure that the pre-commit package is installed:
sudo pip install pre-commit
  1. Go to repository root folder
  2. Install the pre-commit hooks:
pre-commit install
  1. Use pre-commit to check staged file:
pre-commit
  1. Alternatively, you can check committed files using:
pre-commit run --from-ref <commit_id> --to-ref <commit_id>

@saiarcot895 saiarcot895 requested a review from yxieca December 5, 2022 20:53
@saiarcot895
Copy link
Contributor Author

flake8 failures appear to be for lines I didn't touch. If needed, I can fix those issues as well.

@yxieca yxieca merged commit 433ae11 into sonic-net:master Dec 6, 2022
@saiarcot895 saiarcot895 deleted the logrotate-cronjob-remove branch December 7, 2022 00:59
wangxin pushed a commit that referenced this pull request Dec 7, 2022
Bullseye-based images currently have both a cronjob task and a systemd
timer configured for the logrotate rotation. This can cause conflicts
with two simultaneous log rotations happening (in the worst case; I
think there's some check somewhere to prevent this from happening).

To fix this, the cronjob task will be removed. This means that this file
will no longer exist. Therefore, don't fail if this file doesn't exist.

Signed-off-by: Saikrishna Arcot <[email protected]>

Signed-off-by: Saikrishna Arcot <[email protected]>
@rraghav-cisco
Copy link
Contributor

@wangxin , we need this in 202012 branch as well.

bingwang-ms pushed a commit to bingwang-ms/sonic-mgmt that referenced this pull request Jul 27, 2023
…ic-mgmt into internal-202205

Fix merge conflicts.
- [pre-commit] Fix style issues in test scripts under `tests/acl` folder (sonic-net#6679)
- Moving check for reboot cause after interface status check (sonic-net#6721)
- Adding watchdog timeout values for Cisco 8808 Supervisor and Different LCs (sonic-net#6776)
- add Ether check in macsec_dp_poll (sonic-net#6828)
- Disable PFC watchdog in test_cpu_memory_usage_counterpoll (sonic-net#6851)
- Testcase to verify that lossless traffic is not dropped during congesion. (sonic-net#6853)
- Ignore Broadcom sai sai unbind ERR log for now (sonic-net#6539)
- [chassis][multi-asic] update the loganalyser regex for multi asic (sonic-net#6885)
- [mx] Fix test_acl failed on mx topo (sonic-net#6971) (sonic-net#6983)
- [202205][mx] Add support for mx in test_null_route_helper (sonic-net#6967) (sonic-net#6982)
- [m0][everflow] Add m0 support for everflow and refactor everflow setup_info (sonic-net#6900)
- [ACL] Add acl stress test (sonic-net#6903)
- Enhance test_tor_ecn (sonic-net#6906)
- Fix erros - Added unique IPV6 address for the missed ACL rules PR sonic-net#6390 (sonic-net#6909)
- enabled bfd tests (sonic-net#6919)
- Skip bgp speaker test on backend topo (sonic-net#6922)
- [advanced-reboot] Handle logs in tmpfs: backup two log files before reboot (sonic-net#6923)
- Fix missing definition (sonic-net#6930)
- [Mellanox] Add minimal table definition for SN2201 (sonic-net#6943)
- Update qos test param for dualtor topology (sonic-net#6948)
- fix setup for single asic lc (sonic-net#6951)
- Fix QoS sai test for running with python3 (sonic-net#6961)
- Don't fail if logrotate cron job file isn't present (sonic-net#6964)
- Disable post sanity check for vxlan test (sonic-net#6980)
- Merge branch 'azure-202205' into dev/yaqiangzhu/202205_merge
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants