grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove getLoadStatsStore method from LocalityStore 

Currently `LoadStatsStore` is create by `LocalityStore` and `LoadReportClient` retrieves `LoadStatsStore` from `LocalityStore.getLoadStatsStore()`.

But `LocalityStore` is create by EDS policy, whereas `LoadReportClient` and `LoadStatsStore` should be created by CDS (if not EDS-only), before `LocalityStore` is created. If `LoadReportClient` is embedded in `XdsClientImpl`, it need a `LoadStatsStore` which shouldn't be created by `LocalityStore`.

Instead, `LoadStatsStore` should be create before `LocalityStore` is created, and be passed to `LocalityStore`'s constructor. A getter is not needed.
This commit is contained in:
ZHANG Dapeng 2019-11-21 12:37:48 -08:00 committed by GitHub
parent eaf99cf7fe
commit 81efecd86a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
xds/src/main/java/io/grpc/xds/LocalityStore.java
View File

@ -76,15 +76,14 @@ interface LocalityStore {
void updateOobMetricsReportInterval(long reportIntervalNano); void updateOobMetricsReportInterval(long reportIntervalNano);
LoadStatsStore getLoadStatsStore();
@VisibleForTesting @VisibleForTesting
abstract class LocalityStoreFactory { abstract class LocalityStoreFactory {
private static final LocalityStoreFactory DEFAULT_INSTANCE = private static final LocalityStoreFactory DEFAULT_INSTANCE =
new LocalityStoreFactory() { new LocalityStoreFactory() {
@Override @Override
LocalityStore newLocalityStore(Helper helper, LoadBalancerRegistry lbRegistry) { LocalityStore newLocalityStore(
return new LocalityStoreImpl(helper, lbRegistry); Helper helper, LoadBalancerRegistry lbRegistry, LoadStatsStore loadStatsStore) {
return new LocalityStoreImpl(helper, lbRegistry, loadStatsStore);
} }
}; };
@ -92,7 +91,8 @@ interface LocalityStore {
return DEFAULT_INSTANCE; return DEFAULT_INSTANCE;
} }
abstract LocalityStore newLocalityStore(Helper helper, LoadBalancerRegistry lbRegistry); abstract LocalityStore newLocalityStore(
Helper helper, LoadBalancerRegistry lbRegistry, LoadStatsStore loadStatsStore);
} }
final class LocalityStoreImpl implements LocalityStore { final class LocalityStoreImpl implements LocalityStore {
@ -113,9 +113,10 @@ interface LocalityStore {
private List<DropOverload> dropOverloads = ImmutableList.of(); private List<DropOverload> dropOverloads = ImmutableList.of();
private long metricsReportIntervalNano = -1; private long metricsReportIntervalNano = -1;
LocalityStoreImpl(Helper helper, LoadBalancerRegistry lbRegistry) { LocalityStoreImpl(
Helper helper, LoadBalancerRegistry lbRegistry, LoadStatsStore loadStatsStore) {
this(helper, pickerFactoryImpl, lbRegistry, ThreadSafeRandom.ThreadSafeRandomImpl.instance, this(helper, pickerFactoryImpl, lbRegistry, ThreadSafeRandom.ThreadSafeRandomImpl.instance,
new LoadStatsStoreImpl(), OrcaPerRequestUtil.getInstance(), OrcaOobUtil.getInstance()); loadStatsStore, OrcaPerRequestUtil.getInstance(), OrcaOobUtil.getInstance());
} }
@VisibleForTesting @VisibleForTesting
@ -284,11 +285,6 @@ interface LocalityStore {
TimeUnit.MINUTES, helper.getScheduledExecutorService()); TimeUnit.MINUTES, helper.getScheduledExecutorService());
} }
@Override
public LoadStatsStore getLoadStatsStore() {
return loadStatsStore;
}
@Override @Override
public void updateOobMetricsReportInterval(long reportIntervalNano) { public void updateOobMetricsReportInterval(long reportIntervalNano) {
metricsReportIntervalNano = reportIntervalNano; metricsReportIntervalNano = reportIntervalNano;

6
xds/src/main/java/io/grpc/xds/LookasideLb.java
View File

@ -175,11 +175,13 @@ final class LookasideLb extends ForwardingLoadBalancer {
xdsClient = new XdsComms2( xdsClient = new XdsComms2(
channel, helper, new ExponentialBackoffPolicy.Provider(), channel, helper, new ExponentialBackoffPolicy.Provider(),
GrpcUtil.STOPWATCH_SUPPLIER, node); GrpcUtil.STOPWATCH_SUPPLIER, node);
localityStore = localityStoreFactory.newLocalityStore(helper, lbRegistry); LoadStatsStore loadStatsStore = new LoadStatsStoreImpl();
localityStore = localityStoreFactory.newLocalityStore(
helper, lbRegistry, loadStatsStore);
// TODO(zdapeng): Use XdsClient to do Lrs directly. // TODO(zdapeng): Use XdsClient to do Lrs directly.
lrsClient = loadReportClientFactory.createLoadReportClient( lrsClient = loadReportClientFactory.createLoadReportClient(
channel, helper, new ExponentialBackoffPolicy.Provider(), channel, helper, new ExponentialBackoffPolicy.Provider(),
localityStore.getLoadStatsStore()); loadStatsStore);
final LoadReportCallback lrsCallback = final LoadReportCallback lrsCallback =
new LoadReportCallback() { new LoadReportCallback() {
@Override @Override

5
xds/src/test/java/io/grpc/xds/LookasideLbTest.java
View File

@ -194,11 +194,10 @@ public class LookasideLbTest {
localityStoreFactory = new LocalityStoreFactory() { localityStoreFactory = new LocalityStoreFactory() {
@Override @Override
public LocalityStore newLocalityStore(Helper helper, LoadBalancerRegistry lbRegistry) { public LocalityStore newLocalityStore(
Helper helper, LoadBalancerRegistry lbRegistry, LoadStatsStore loadStatsStore) {
helpers.add(helper); helpers.add(helper);
LocalityStore localityStore = mock(LocalityStore.class); LocalityStore localityStore = mock(LocalityStore.class);
LoadStatsStore loadStatsStore = mock(LoadStatsStore.class);
doReturn(loadStatsStore).when(localityStore).getLoadStatsStore();
localityStores.add(localityStore); localityStores.add(localityStore);
return localityStore; return localityStore;
} }