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 ringpop services #5080

Merged

Conversation

tdeebswihart
Copy link
Contributor

What changed?

I merged the ringpop service with the membership monitor.

Why?

It's not a useful abstraction

How did you test it?

Potential risks

Is hotfix candidate?

No.

@tdeebswihart tdeebswihart requested a review from a team as a code owner November 6, 2023 19:16
@tdeebswihart tdeebswihart requested a review from dnr November 6, 2023 20:31
@tdeebswihart tdeebswihart changed the title Tdeebswihart/merge ringpop services merge ringpop services Nov 6, 2023
Copy link
Member

@dnr dnr left a comment

Choose a reason for hiding this comment

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

I think the submodule changes are unintentional?

And need to rebase on top of main?


rpo.initialized.Set(struct{}{}, nil)
}

// bootstrap ring pop service by discovering the bootstrap hosts and joining the ring pop cluster
func (rpo *monitor) bootstrapRingPop(
bootstrapHostPostRetriever func() ([]string, error),
Copy link
Member

Choose a reason for hiding this comment

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

this can be simplified more.. just call rpo.fetchCurrentBootstrapHostports directly and use healthyHostLastHeartbeatCutoff/2 for the backoff interval

@tdeebswihart
Copy link
Contributor Author

I think the submodule changes are unintentional?

And need to rebase on top of main?

Yeah probably, damnit. I have too much going on with this repo

@tdeebswihart tdeebswihart force-pushed the tdeebswihart/merge-ringpop-services branch from d874c60 to 6a40b71 Compare November 8, 2023 01:02
@tdeebswihart tdeebswihart requested a review from dnr November 8, 2023 01:02
@tdeebswihart tdeebswihart enabled auto-merge (squash) November 8, 2023 16:38
I don't know why this broke in ci on this branch.
@tdeebswihart tdeebswihart merged commit 1da93ba into temporalio:main Nov 8, 2023
8 checks passed
@@ -1,6 +1,4 @@
version: v1beta1
deps:
- buf.build/googleapis/googleapis
Copy link
Member

Choose a reason for hiding this comment

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

🙁 I think I needed to add this to get proto generation to work correctly on a branch

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That's weird: it broke suddenly in CI for me :/

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