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

Merge 2.28.0 back to mainline #5183

Merged
merged 17 commits into from
Jan 29, 2024
Merged

Merge 2.28.0 back to mainline #5183

merged 17 commits into from
Jan 29, 2024

Conversation

sreuland
Copy link
Contributor

@sreuland sreuland commented Jan 29, 2024

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

merging 2.28.0 back to mainline, it has a few material changes that were done solely on release branch to start such as #5171 and #5175. And there was a significant conflict in histoaryarchive package between the branches as master had taken a refactoring from lighthorizin and 2.28. had a somewhat partial/different refactoring in the same package. i updated all to be consistent to the historyarchive package from master.

Why

part of post release steps

Known limitations

tamirms and others added 16 commits January 26, 2024 17:52
…dger to be different phrase to avoid conflict with existing 'Processed ledger' log output from fsm (stellar#5155)
…ellar#5171)

* go mod tidy
* Add double-close protection
* Add request tracking when cache invokes upstream download
* Add cache hit tracking
* Move stat tracking to a separate file
* Modify test to track stats+integrity after caching
* Stop double-closing identical XDR stream readers
…lar#5178)

* Change logging provider to Horizon's default rather than logrus
Copy link
Contributor

@Shaptic Shaptic left a comment

Choose a reason for hiding this comment

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

looks like a clean merge to me - thanks for resolving all of the conflicts!! 👏

historyarchive/archive_pool.go Show resolved Hide resolved
historyarchive/archive_pool.go Outdated Show resolved Hide resolved
@sreuland sreuland merged commit c33317d into stellar:master Jan 29, 2024
29 checks passed
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.

None yet

4 participants