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

ingest/ledgerbackend: Restart Stellar-Core when it's context is cancelled #4192

Merged
merged 5 commits into from
Jan 28, 2022

Conversation

bartekn
Copy link
Contributor

@bartekn bartekn commented Jan 23, 2022

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.

After refactoring in #4088 (and as a result of my wrong comment: #4088 (comment)) the CaptiveCoreBackend.isPrepared method returned true if stellarCoreRunner process was shutdown without calling close() - so in case of binary update but also in case of Stellar-Core crash.

This commit fixes this bug by checking if stellarCoreRunner context was cancelled (meaning Stellar-Core is closed or closing but not as a result of close call). I also removed isClose method because it was simply checking close variable. All test changes are only adding an extra context() call mocks because isPrepared now calls it.

@bartekn bartekn requested a review from a team January 23, 2022 16:02
@bartekn bartekn marked this pull request as ready for review January 23, 2022 16:02
Comment on lines -629 to -631
func (c *CaptiveStellarCore) isClosed() bool {
return c.closed
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Could we simplify this to include the above condition, instead? In other words,

func (c *CaptiveStellarCore) isClosed() bool {
	return c.closed || c.stellarCoreRunner == nil || c.stellarCoreRunner.context().Err() != nil
}

Basically, is there a situation in which the instance would not be closed and the runner wouldn't exist? Intuitively seems like no, but I'm not strong on this part of the codebase.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Adding extra conditions to isClosed won't work. In #4088 we wanted to separate two cases:

  • CaptiveCoreBackend closed - means no usable, you need to create a new instance.
  • stellarCoreRunner closed - means it just needs to be restarted by calling PrepareRange.

Copy link
Contributor

Choose a reason for hiding this comment

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

Got it, thanks for clarifying! LGTM 👍

@Shaptic Shaptic requested a review from a team January 24, 2022 07:39
@bartekn bartekn merged commit a947f2f into stellar:master Jan 28, 2022
@bartekn bartekn deleted the fix-core-context-cancel-restart branch January 28, 2022 12:06
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.

2 participants