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.

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

Jump to bottom

Port features from horizon-v2.28.2 into master #5210

Merged
merged 4 commits into from
Feb 15, 2024
Merged

Port features from horizon-v2.28.2 into master #5210

merged 4 commits into from
Feb 15, 2024

Conversation

Shaptic
Copy link
Contributor

@Shaptic Shaptic commented Feb 14, 2024 •
edited
Loading

What

I took the following steps:

git switch master
git pull upstream master   # sync to stellar/go
git checkout horizon-v2.28.2
git switch -C v2.28.2-rebase
git rebase -i master
# <resolve all conflicts>
# <resigned the commits>

The rationale is self-explanatory: we need the patch release changes back in master.

Why

Replaces #5206.

This was a bit of a precarious merge (lots of conflicts were resolved) so I'd appreciate multiple eyes on it for sanity checking.

urvisavla and others added 3 commits February 14, 2024 12:33
@urvisavla @Shaptic
services/horizon: Fix claimable balance query (stellar#5200)
6997dec 
* services/horizon: Fix claimable balance query
* Fix Soroban RPC image incompatibility
@Shaptic
services/horizon: Add cache toggle and use libary for on-disk caching (…
da575f0 
…stellar#5197)

* Add a `--history-archive-caching` flag (default=true) to toggle behavior
* Refactor to use a library: fscache
* Hook new metric into prometheus
* Add parallel read test to stress cache
* Add tests for deadlocking and other misc. scenarios
@urvisavla @Shaptic
Update CHANGELOG.md (stellar#5201)
a8fe5f0
@Shaptic Shaptic requested review from sreuland, urvisavla and a team February 14, 2024 20:38
@Shaptic Shaptic mentioned this pull request Feb 14, 2024
Closed
sreuland
sreuland approved these changes Feb 15, 2024
View reviewed changes
Copy link
Contributor

@sreuland sreuland left a comment

Choose a reason for hiding this comment

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

lgtm, might want to change the pr title to flip the direction of code, i.e. port 2.28.2 to master

@Shaptic Shaptic merged commit 1b0aa07 into stellar:master Feb 15, 2024
29 checks passed
@Shaptic Shaptic changed the title Merge upstream master into horizon-v2.28.2 to facilitate the back-merge Port features from horizon-v2.28.2 into master Feb 15, 2024
@Shaptic Shaptic deleted the v2.28.2-rebase branch February 15, 2024 18:45
@Shaptic Shaptic mentioned this pull request Mar 12, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sreuland sreuland sreuland approved these changes

@urvisavla urvisavla Awaiting requested review from urvisavla

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Shaptic @sreuland @urvisavla