Skip to content

fix: improve statsd write error handling #540

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.

Sign up for GitHub

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

Merged
KowalskiThomas merged 2 commits into from
Apr 14, 2026
Merged

fix: improve statsd write error handling #540

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c32f86
fix: un-deadify error handling
KowalskiThomas Apr 12, 2026
bd5e1f2
refactor: better error handling
KowalskiThomas Apr 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions src/statsd.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,15 +136,21 @@ DDRes statsd_send(int fd_sock, const char *key, const void *val, int type) {
DDRES_RETURN_WARN_LOG(DD_WHAT_STATSD, "Serialization failed");
}

// Nothing to do if the write fails
while (static_cast<ssize_t>(sz) != write(fd_sock, buf, sz) &&
Comment thread
KowalskiThomas marked this conversation as resolved.
errno == EINTR) {
// Don't consider this as fatal.
if (errno == EWOULDBLOCK || errno == EAGAIN) {
DDRES_RETURN_WARN_LOG(DD_WHAT_STATSD, "Write failed (sys buffer full)");
} else {
size_t written = 0;
int eintr_retries = 0;
while (written < sz) {
const ssize_t ret = write(fd_sock, buf + written, sz - written);
if (ret == -1) {
constexpr int k_max_eintr_retries = 10;
if (errno == EINTR && ++eintr_retries < k_max_eintr_retries) {
continue;
}
if (errno == EWOULDBLOCK || errno == EAGAIN) {
DDRES_RETURN_WARN_LOG(DD_WHAT_STATSD, "Write failed (sys buffer full)");
}
DDRES_RETURN_WARN_LOG(DD_WHAT_STATSD, "Write failed");
}
written += static_cast<size_t>(ret);
}
return {};
}
Expand Down