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

Remove usage of Optional from SimpleLoadBalancer #946

Merged
merged 4 commits into from
Nov 28, 2023
Merged

Remove usage of Optional from SimpleLoadBalancer #946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
631a19f
Remove usage of Optional from SimpleLoadBalancer
PapaCharlie Nov 27, 2023
5bf35f7
Merge remote-tracking branch 'origin/master' into pchesnai/optionals
PapaCharlie Nov 28, 2023
f7894b4
Bump gradle.properties and changelog
PapaCharlie Nov 28, 2023
f5db507
Merge remote-tracking branch 'origin/master' into pchesnai/optionals
PapaCharlie Nov 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ When updating the changelog, remember to be very clear about what behavior has c
and what APIs have changed, if applicable.

## [Unreleased]

## [29.48.2] - 2023-11-27
- Remove usage of Optional from SimpleLoadBalancer

## [29.48.1] - 2023-11-27
- Update SimpleLoadBalancer to use for loop instead of Map

Expand Down Expand Up @@ -5565,7 +5569,8 @@ patch operations can re-use these classes for generating patch messages.

## [0.14.1]

[Unreleased]: https://github.com/linkedin/rest.li/compare/v29.48.1...master
[Unreleased]: https://github.com/linkedin/rest.li/compare/v29.48.2...master
[29.48.2]: https://github.com/linkedin/rest.li/compare/v29.48.1...v29.48.2
[29.48.1]: https://github.com/linkedin/rest.li/compare/v29.48.0...v29.48.1
[29.48.0]: https://github.com/linkedin/rest.li/compare/v29.47.0...v29.48.0
[29.47.0]: https://github.com/linkedin/rest.li/compare/v29.46.9...v29.47.0
Expand Down
22 changes: 11 additions & 11 deletions d2/src/main/java/com/linkedin/d2/balancer/simple/SimpleLoadBalancer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@
import com.linkedin.d2.balancer.properties.UriProperties;
import com.linkedin.d2.balancer.strategies.LoadBalancerStrategy;
import com.linkedin.d2.balancer.subsetting.SubsettingState;
import com.linkedin.d2.balancer.util.CustomAffinityRoutingURIProvider;
import com.linkedin.d2.balancer.util.ClientFactoryProvider;
import com.linkedin.d2.balancer.util.ClusterInfoProvider;
import com.linkedin.d2.balancer.util.CustomAffinityRoutingURIProvider;
import com.linkedin.d2.balancer.util.HostOverrideList;
import com.linkedin.d2.balancer.util.HostToKeyMapper;
import com.linkedin.d2.balancer.util.KeysAndHosts;
Expand Down Expand Up @@ -72,7 +72,6 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Random;
import java.util.Set;
import java.util.TreeMap;
Expand All @@ -88,9 +87,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import static com.linkedin.d2.discovery.util.LogUtil.debug;
import static com.linkedin.d2.discovery.util.LogUtil.info;
import static com.linkedin.d2.discovery.util.LogUtil.warn;
import static com.linkedin.d2.discovery.util.LogUtil.*;

public class SimpleLoadBalancer implements LoadBalancer, HashRingProvider, ClientFactoryProvider, PartitionInfoProvider, WarmUpService,
ClusterInfoProvider
Expand Down Expand Up @@ -950,10 +947,10 @@ private Map<URI, TrackerClient> getPotentialClientsSubsetting(String serviceName
{
possibleTrackerClient.setSubsetWeight(partitionId, weightedSubset.get(possibleUri));
}
return Optional.of(possibleTrackerClient);
return possibleTrackerClient;
}
}
return Optional.empty();
return null;
});
}

Expand All @@ -962,22 +959,25 @@ private Map<URI, TrackerClient> getPotentialClientsNotSubsetting(String serviceN
ClusterProperties clusterProperties,
Set<URI> possibleUris) {
return getPotentialClients(serviceProperties, clusterProperties, possibleUris,
possibleUri -> Optional.ofNullable(_state.getClient(serviceName, possibleUri)));
possibleUri -> _state.getClient(serviceName, possibleUri));
}

private Map<URI, TrackerClient> getPotentialClients(ServiceProperties serviceProperties,
ClusterProperties clusterProperties,
Set<URI> possibleUris,
Function<URI, Optional<TrackerClient>> trackerClientFinder)
Function<URI, TrackerClient> trackerClientFinder)
{
Map<URI, TrackerClient> clientsToLoadBalance = new HashMap<>(possibleUris.size());
for (URI possibleUri : possibleUris)
{
// don't pay attention to this uri if it's banned
if (!serviceProperties.isBanned(possibleUri) && !clusterProperties.isBanned(possibleUri))
{
trackerClientFinder.apply(possibleUri)
.ifPresent(trackerClient -> clientsToLoadBalance.put(possibleUri, trackerClient));
TrackerClient trackerClient = trackerClientFinder.apply(possibleUri);
if (trackerClient != null)
{
clientsToLoadBalance.put(possibleUri, trackerClient);
}
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version=29.48.1
version=29.48.2
group=com.linkedin.pegasus
org.gradle.configureondemand=true
org.gradle.parallel=true
Expand Down
Loading