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: Make stellar core database URL optional if captive core is enabled. #3150

Merged
merged 1 commit into from
Oct 22, 2020

Conversation

abuiles
Copy link
Contributor

@abuiles abuiles commented Oct 21, 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

Disable stellar core database URL validation if captive core is enabled.

Why

Fix #3129

Known limitations

[TODO or N/A]

@abuiles abuiles requested a review from bartekn October 21, 2020 20:57
@cla-bot cla-bot bot added the cla: yes label Oct 21, 2020
@abuiles abuiles changed the title Make stellar core database URL optional if captive core is enabled. services/horizon: Make stellar core database URL optional if captive core is enabled. Oct 21, 2020
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! I think we should simplify ingest.System init in the future by passing a LedgerBackend implementation to it.

CoreSession: mustNewDBSession(
app.config.StellarCoreDatabaseURL, ingest.MaxDBConnections, ingest.MaxDBConnections,
),
CoreSession: coreSession,
Copy link
Contributor

Choose a reason for hiding this comment

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

Have you made sure that nothing breaks when this is nil? (unfortunately successful integration tests don't help at this point because they run without captive core).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@2opremio yes, I check the different code paths and we are now only using this value if CaptiveCore is disabled.

@abuiles abuiles force-pushed the optional-stellar-core-db-url branch from cf6e512 to b509f3c Compare October 22, 2020 14:16
@abuiles abuiles merged commit 30679f3 into stellar:master Oct 22, 2020
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.

Remove STELLAR_CORE_DATABASE_URL requirement when ENABLE_CAPTIVE_CORE is set
3 participants