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

changed insufficiently reserved length for log message #8152

Merged
merged 2 commits into from Apr 6, 2024

Conversation

galqiwi
Copy link
Contributor

@galqiwi galqiwi commented Mar 17, 2024

During borg prune I've encountered a minor issue -- output was not properly aligned.

Keeping archive (rule: hourly #3):       2024-02-20-23:13:36                  Tue, 2024-02-20 23:13:38 [53dbb412a3d28b8d788cee0fe189d1ceefd4affd27866d23ffaee7cd45af5971]
Keeping archive (rule: hourly[oldest] #4): 2024-02-20-23:09:22                  Tue, 2024-02-20 23:09:24 [66392999b4cb3a71262f1bdff4ecd05bcb6b74c6dc1ae6a2c9903bcf4a8137b3]

This PR fixes this issue. Full command with output can be viewed here.

@galqiwi galqiwi changed the title changed insufficient reserved length for log message changed insufficiently reserved length for log message Mar 17, 2024
@galqiwi
Copy link
Contributor Author

galqiwi commented Mar 17, 2024

It's not a proper fix, and I don't think that there is a proper fix. We can't know beforehand what length all these messages will have without adding unreasonable amount of complexity

@ThomasWaldmann
Copy link
Member

ThomasWaldmann commented Mar 17, 2024

@galqiwi Thanks for the PR!

Hmm, did you experience the issue with master branch? Or rather with some borg 1.2.x release (that code is in 1.2-maint branch)?

In general, the issue should first get fixed in the branch where it has been encountered and after that, it needs checking whether the other branches are affected also. Active branches are: 1.2-maint, 1.4-maint, master.

About the fix: I guess increasing by 4 instead of by 2 would cover more issues of the same kind.

@codecov-commenter
Copy link

codecov-commenter commented Mar 17, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 83.74%. Comparing base (6de9ca8) to head (e3f1349).
Report is 29 commits behind head on master.

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #8152      +/-   ##
==========================================
+ Coverage   83.49%   83.74%   +0.24%     
==========================================
  Files          67       67              
  Lines       12046    12061      +15     
  Branches     2185     2189       +4     
==========================================
+ Hits        10058    10100      +42     
+ Misses       1389     1368      -21     
+ Partials      599      593       -6     

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

@ThomasWaldmann
Copy link
Member

@galqiwi did you see my feedback?

@galqiwi
Copy link
Contributor Author

galqiwi commented Apr 2, 2024

@galqiwi did you see my feedback?

Yes, sorry for late response. I've encountered this bug in 1.2.0 version. Will make a PR to the corresponding branch. By looking at the code, I see that 1.3.x and master are affected too.

ThomasWaldmann added a commit that referenced this pull request Apr 3, 2024
changed insufficiently reserved length for log message (copy of #8152 for 1.2)
ThomasWaldmann added a commit that referenced this pull request Apr 6, 2024
 changed insufficiently reserved length for log message (copy of #8152 for 1.4)
@ThomasWaldmann
Copy link
Member

OK, so now 1.2 and 1.4 branches are fixed, thanks!

You experienced the issue with 1.2.x and 1.4 is quite similar to 1.2.

OTOH, master branch has major changes, so guess one should try how it looks like there.

Also, width in this PR might need increasing (e.g. to 44), but you'll see that when practically trying it out.

@galqiwi
Copy link
Contributor Author

galqiwi commented Apr 6, 2024

Also, width in this PR might need increasing (e.g. to 44), but you'll see that when practically trying it out.

Yeah, my bad. Fixed it.

@ThomasWaldmann ThomasWaldmann merged commit 0c1df41 into borgbackup:master Apr 6, 2024
13 checks passed
@ThomasWaldmann
Copy link
Member

Thanks!

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.

None yet

3 participants