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.

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

A set of assorted fixes in logging and error propagation. #2194

Merged
merged 1 commit into from
Aug 1, 2023

Conversation

osctobe
Copy link
Contributor

@osctobe osctobe commented Jun 14, 2023

The changes in this series are mostly independent and could be applied individually. If there are change requests I'll shuffle relevant commits to the back when addressing them.

@osctobe osctobe force-pushed the assorted-fixes branch 2 times, most recently from b00fb0f to 7b5df31 Compare June 15, 2023 11:28
@codecov-commenter
Copy link

codecov-commenter commented Jun 15, 2023

Codecov Report

Patch coverage has no change and project coverage change: -0.02% ⚠️

Comparison is base (53dd6ba) 70.33% compared to head (02f188b) 70.31%.

❗ Current head 02f188b differs from pull request most recent head ad9c583. Consider uploading reports for the commit ad9c583 to get more accurate results

Additional details and impacted files
@@             Coverage Diff              @@
##           criu-dev    #2194      +/-   ##
============================================
- Coverage     70.33%   70.31%   -0.02%     
============================================
  Files           134      134              
  Lines         34026    34025       -1     
============================================
- Hits          23932    23925       -7     
- Misses        10094    10100       +6     

see 3 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

criu/include/log.h Outdated Show resolved Hide resolved
criu/include/sk-inet.h Outdated Show resolved Hide resolved
criu/files-reg.c Outdated Show resolved Hide resolved
criu/sk-unix.c Outdated Show resolved Hide resolved
criu/mount.c Outdated Show resolved Hide resolved
@osctobe osctobe force-pushed the assorted-fixes branch 2 times, most recently from 98eeed7 to 3565e4d Compare June 19, 2023 13:56
@osctobe osctobe requested a review from Snorch June 19, 2023 13:56
Makefile Outdated Show resolved Hide resolved
@Snorch
Copy link
Member

Snorch commented Jun 20, 2023

One general note here, in criu there is a requirement to prefix subjects with component name. See https://github.com/checkpoint-restore/criu/blob/criu-dev/CONTRIBUTING.md#describe-your-changes

@Snorch
Copy link
Member

Snorch commented Jun 22, 2023

Subject: [PATCH] util: Remove error logs for ignored or otherwise logged
diff --git a/criu/netfilter.c b/criu/netfilter.c
index <some index>
--- a/criu/netfilter.c
+++ b/criu/netfilter.c
diff --git a/criu/util.c b/criu/util.c
index <some index>
--- a/criu/util.c
+++ b/criu/util.c

In this case right prefix would be util/netfilter: or just log:

ps: don't forget to fix CI =)

@osctobe osctobe force-pushed the assorted-fixes branch 8 times, most recently from eea7802 to 8712e40 Compare June 22, 2023 16:32
@osctobe
Copy link
Contributor Author

osctobe commented Jun 22, 2023

I've split the build parts into a separate PR.

@osctobe osctobe changed the title A set of assorted tweaks and cleanups in build system and log messages. A set of assorted fixes in logging and error propagation. Jun 22, 2023
@osctobe osctobe force-pushed the assorted-fixes branch 2 times, most recently from c3110e9 to 18f3922 Compare June 24, 2023 01:32
criu/include/sk-inet.h Outdated Show resolved Hide resolved
@osctobe osctobe force-pushed the assorted-fixes branch 5 times, most recently from f00d071 to 5551201 Compare July 25, 2023 15:26
@0x7f454c46
Copy link
Member

Change-Id: I8e5e4953f0231ed935ef3dbbab800080e4ee549f clean this from the commit.

You don't submit those to linux/kernel, neither you do to criu. We hold the same rule, see:
https://elixir.bootlin.com/linux/latest/source/Documentation/dev-tools/checkpatch.rst#L593
The Change-Id line must be removed before submitting.

Include the file descriptor and error code in the debug message to make
it more useful.

Fixes: e7ba909 (2016-03-14 "cr-check: Inspect errno on syscall failures")
Signed-off-by: Michał Mirosław <emmir@google.com>
@avagin avagin merged commit cc500d9 into checkpoint-restore:criu-dev Aug 1, 2023
30 of 37 checks passed
@osctobe osctobe deleted the assorted-fixes branch August 2, 2023 11:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants