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

services/horizon: Ignore db.ErrCanceled and ctx.Canceled returned by verifyState. #2366

Merged
merged 4 commits into from
Mar 10, 2020

Conversation

abuiles
Copy link
Contributor

@abuiles abuiles commented Mar 6, 2020

PR Checklist

PR Structure

  • This PR has reasonably narrow scope (if not, break it down into smaller PRs).
  • This PR avoids mixing refactoring changes with feature changes (split into two PRs
    otherwise).
  • This PR's title starts with name of package that is most changed in the PR, ex.
    services/friendbot, or all or doc if the changes are broad or impact many
    packages.

Thoroughness

  • This PR adds tests for the most critical parts of the new functionality or fixes.
  • I've updated any docs (developer docs, .md
    files, etc... affected by this change). Take a look in the docs folder for a given service,
    like this one.

Release planning

  • I've updated the relevant CHANGELOG (here for Horizon) if
    needed with deprecations, added features, breaking changes, and DB schema changes.
  • I've decided if this PR requires a new major/minor version according to
    semver, or if it's mainly a patch change. The PR is targeted at the next
    release branch if it's not a patch change.

What

Ignore db.ErrCanceled and ctx.Canceled returned by verifyState.

Fix #2224

Why

If the system is shutdown during state verification, there is a warning inthe log showing

err="addAccountsToStateVerifier failed: Error running history.Q.GetAccountsByIDs: select failed: context canceled" pid=99452 service=expingest

If the system is being shutdown gracefully which is the case when we
get this errors, then we shouldn't log an error.

Fix #2224

Known limitations

[TODO or N/A]

@cla-bot cla-bot bot added the cla: yes label Mar 6, 2020
@abuiles abuiles requested review from bartekn and tamirms March 6, 2020 22:47
Copy link
Contributor

@bartekn bartekn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Let's move the shared code to a separate function (like isCancelledError).

@abuiles abuiles requested a review from bartekn March 9, 2020 17:12
@abuiles
Copy link
Contributor Author

abuiles commented Mar 9, 2020

@bartekn I added the helper.

@abuiles abuiles changed the base branch from release-horizon-v1.1.0 to master March 10, 2020 16:25
@abuiles abuiles force-pushed the handle-db-err-context-cancelled branch from 9cd34eb to 2b4765a Compare March 10, 2020 16:26
abuiles added 3 commits March 10, 2020 11:41
If the system is shutdown during state verification, there is a
warning in the log showing

```
WARN[2020-02-04T18:14:19.987+01:00] State verification errored                    err="addAccountsToStateVerifier failed: Error running history.Q.GetAccountsByIDs: select failed: context canceled" pid=99452 service=expingest
```

If the system is being shutdown gracefully which is the case when we
get this errors, then we shouldn't log an error.

Fix stellar#2224
@abuiles abuiles force-pushed the handle-db-err-context-cancelled branch from 2b4765a to 09d18fb Compare March 10, 2020 16:42
@abuiles abuiles force-pushed the handle-db-err-context-cancelled branch from 09d18fb to 41bc28b Compare March 10, 2020 16:51
@abuiles abuiles merged commit 43b9f5c into stellar:master Mar 10, 2020
@abuiles abuiles deleted the handle-db-err-context-cancelled branch March 10, 2020 17:07
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.

Ignore ErrCanceled errors returned by verifyState
2 participants