Skip to content

mctp: Add retry for one-time peer property queries on timeout #129

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

mctp: Add retry for one-time peer property queries on timeout #129

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
60 changes: 47 additions & 13 deletions src/mctpd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2835,23 +2835,57 @@ static int method_learn_endpoint(sd_bus_message *call, void *data,
// and routable.
static int query_peer_properties(struct peer *peer)
{
const unsigned int max_retries = 4;
int rc;

rc = query_get_peer_msgtypes(peer);
if (rc < 0) {
// Warn here, it's a mandatory command code.
// It might be too noisy if some devices don't implement it.
warnx("Error getting endpoint types for %s. Ignoring error %d %s",
peer_tostr(peer), rc, strerror(-rc));
rc = 0;
for (unsigned int i = 0; i < max_retries; i++) {
rc = query_get_peer_msgtypes(peer);

// Success
if (rc == 0)
break;

// On timeout, retry
if (rc == -ETIMEDOUT) {
if (peer->ctx->verbose)
warnx("Retrying to get endpoint types for %s. Attempt %u",
peer_tostr(peer), i + 1);
continue;
}

// On other errors, warn and ignore
if (rc < 0) {
if (peer->ctx->verbose)
warnx("Error getting endpoint types for %s. Ignoring error %d %s",
peer_tostr(peer), -rc, strerror(-rc));
rc = 0;
break;
}
}

rc = query_get_peer_uuid(peer);
if (rc < 0) {
if (peer->ctx->verbose)
warnx("Error getting UUID for %s. Ignoring error %d %s",
peer_tostr(peer), rc, strerror(-rc));
rc = 0;
for (unsigned int i = 0; i < max_retries; i++) {
rc = query_get_peer_uuid(peer);

// Success
if (rc == 0)
break;

// On timeout, retry
if (rc == -ETIMEDOUT) {
if (peer->ctx->verbose)
warnx("Retrying to get peer UUID for %s. Attempt %u",
peer_tostr(peer), i + 1);
continue;
}

// On other errors, warn and ignore
if (rc < 0) {
if (peer->ctx->verbose)
warnx("Error getting UUID for %s. Ignoring error %d %s",
peer_tostr(peer), -rc, strerror(-rc));
rc = 0;
break;
}
}

// TODO: emit property changed? Though currently they are all const.
Expand Down