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

rrdcached dump support #1235

Merged
merged 7 commits into from Oct 20, 2023
Merged

rrdcached dump support #1235

merged 7 commits into from Oct 20, 2023

Conversation

thz
Copy link
Contributor

@thz thz commented Oct 12, 2023

fixes #1141

Help strings for TUNE command were lacking the trailing newline
character. This causes the FLUSH syntax printed in the same line as
TUNE's.
The `sendall` func is implemented as a loop over multiple send() calls until all bytes are sent. Previously on subsequent calls the incorrect buffer was used for sending.
This change also forbids `allow_retry` when at least one byte was successfully sent already. This would otherwise mess up the protocol, when retrying from the start.
Previously, tests replaced the daemon-based dump use with a local use.
This is changed in this commit as dump is now supported via daemon.
src/rrd_client.c Fixed Show resolved Hide resolved
@codecov
Copy link

codecov bot commented Oct 15, 2023

Codecov Report

Merging #1235 (6c63597) into master (d8923c5) will increase coverage by 0.01%.
The diff coverage is 57.25%.

@@            Coverage Diff             @@
##           master    #1235      +/-   ##
==========================================
+ Coverage   50.96%   50.97%   +0.01%     
==========================================
  Files          45       45              
  Lines       18093    18214     +121     
==========================================
+ Hits         9221     9285      +64     
- Misses       8872     8929      +57     
Files Coverage Δ
src/rrd_daemon.c 48.17% <64.10%> (+0.32%) ⬆️
src/rrd_dump.c 62.31% <33.33%> (-0.80%) ⬇️
src/rrd_client.c 62.69% <60.56%> (-0.18%) ⬇️

... and 4 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@thz
Copy link
Contributor Author

thz commented Oct 15, 2023

The grep 404 was recently "recently" fixed upstream: microsoft/vcpkg#29067

Would this need a bump of the vcpkgCommitId now?

@oetiker
Copy link
Owner

oetiker commented Oct 20, 2023

The grep 404 was recently "recently" fixed upstream: microsoft/vcpkg#29067

Would this need a bump of the vcpkgCommitId now?

@thz please try :)

@thz
Copy link
Contributor Author

thz commented Oct 20, 2023

The grep 404 was recently "recently" fixed upstream: microsoft/vcpkg#29067
Would this need a bump of the vcpkgCommitId now?

@thz please try :)

I just tested a manual vcpkg run from github.com/microsoft/vcpkg HEAD and it succeeded building the deps (including a slightly newer grep version). So I committed the SHA1 of the last tag as vcpkgCommitId...
I think CI needs approval again.

@c72578
Copy link
Collaborator

c72578 commented Oct 20, 2023

Here is some background info concerning the updated vcpkg, which is part of this PR:

  • Update vcpkg to current 2023.10.19 Release, commit 8eb5735
  • Current versions of libraries are e.g.:
    cairo 1.17.8, expat 2.5.0, fontconfig 2.14.2, freetype 2.12.1,
    gettext 0.21.1, glib 2.78.0, libpng 1.6.39, pango 1.50.14,
    pcre2 10.40, libxml2 2.11.5 and zlib 1.3

@thz
Copy link
Contributor Author

thz commented Oct 20, 2023

Oh nice. Ready for merge then.

@oetiker oetiker merged commit f142cc1 into oetiker:master Oct 20, 2023
9 checks passed
@oetiker
Copy link
Owner

oetiker commented Oct 20, 2023

thank you!

c72578 added a commit to c72578/rrdtool-1.x that referenced this pull request Oct 21, 2023
vcpkg has been updated to 2023.10.19 Release, commit 8eb5735 in oetiker#1235.
The name of libffi.dll has changed to ffi-8.dll.

- Update `collect_rrdtool_vcpkg_files.bat`, which is used by the
  `release-windows.yml` GitHub Action:
  libffi.dll -> ffi-8.dll
oetiker pushed a commit that referenced this pull request Oct 22, 2023
vcpkg has been updated to 2023.10.19 Release, commit 8eb5735 in #1235.
The name of libffi.dll has changed to ffi-8.dll.

- Update `collect_rrdtool_vcpkg_files.bat`, which is used by the
  `release-windows.yml` GitHub Action:
  libffi.dll -> ffi-8.dll
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.

rrdtool dump not works with rrdcached
3 participants