Make ClusterControl.membershipSnapshot async property#969
Merged
ktoso merged 6 commits intoapple:mainfrom Jun 13, 2022
Merged
Conversation
yim-lee
commented
Jun 10, 2022
| self.membershipSnapshotLock.lock() | ||
| defer { self.membershipSnapshotLock.unlock() } | ||
| self._membershipSnapshotHolder.membership = snapshot | ||
| Task { |
Member
Author
There was a problem hiding this comment.
Not sure about usages of Task.
ktoso
approved these changes
Jun 10, 2022
| try self.joinNodes(node: first, with: second, ensureMembers: .up) | ||
| try self.joinNodes(node: thirdNeverDownSystem, with: second, ensureMembers: .up) | ||
| try await self.joinNodes(node: first, with: second, ensureMembers: .up) | ||
| try await self.joinNodes(node: thirdNeverDownSystem, with: second, ensureMembers: .up) |
Member
There was a problem hiding this comment.
Sweet :) nice to see the progressive asyncification of the test kit
| get async throws { | ||
| try await self._membershipSnapshotHolder.get() | ||
| } | ||
| } |
| self._membershipSnapshotHolder.membership = snapshot | ||
| Task { | ||
| try await self._membershipSnapshotHolder.update(snapshot) | ||
| } |
Member
There was a problem hiding this comment.
Yeah that's probably fine to be honest
| private let membershipSnapshotLock: Lock | ||
| private let _membershipSnapshotHolder: MembershipHolder | ||
| private class MembershipHolder { | ||
| internal distributed actor MembershipHolder { |
Member
There was a problem hiding this comment.
Maybe as just an actor, no need to for distribution in this one after all?
Samples/Sources/SampleDiningPhilosophers/DistributedDiningPhilosophers.swift
Show resolved
Hide resolved
| if let myselfMember = try await self.cluster.membershipSnapshot.uniqueMember(self.cluster.uniqueNode) { | ||
| self.cluster.down(member: myselfMember) | ||
| } | ||
| } |
Member
There was a problem hiding this comment.
This probably is enough to use the cluster.down(node:) API, so then we don't need the task and async await dance 👍
Member
Author
|
Test failure: #970 @swift-server-bot test this please |
Member
Author
|
Test failure: #971 @swift-server-bot test this please |
Member
|
Thanks for logging the failures, will investigate 👍 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Resolves #949