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

xds: verify and fix presubmit lints errors (#9036)

This commit is contained in:
yifeizhuang 2022-03-31 12:07:44 -07:00 committed by GitHub
parent 40c929e39f
commit 7572afb32b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xds/src/main/java/io/grpc/xds/OrcaOobService.java
View File

@ -20,6 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.annotations.VisibleForTesting; import com.google.common.annotations.VisibleForTesting;
import io.grpc.BindableService; import io.grpc.BindableService;
import io.grpc.ExperimentalApi;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -30,7 +31,7 @@ import java.util.concurrent.TimeUnit;
* for periodic load reports. A user should use the public set-APIs to update the server machine's * for periodic load reports. A user should use the public set-APIs to update the server machine's
* utilization metrics data. * utilization metrics data.
*/ */
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/9006") @ExperimentalApi("https://github.com/grpc/grpc-java/issues/9006")
public final class OrcaOobService { public final class OrcaOobService {
/** /**
* Empty or invalid (non-positive) minInterval config in will be treated to this default value. * Empty or invalid (non-positive) minInterval config in will be treated to this default value.

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

@ -59,7 +59,6 @@ final class OrcaServiceImpl extends OpenRcaServiceGrpc.OpenRcaServiceImplBase {
} }
private final class OrcaClient implements Runnable { private final class OrcaClient implements Runnable {
final OrcaLoadReportRequest request;
final ServerCallStreamObserver<OrcaLoadReport> responseObserver; final ServerCallStreamObserver<OrcaLoadReport> responseObserver;
SynchronizationContext.ScheduledHandle periodicReportTimer; SynchronizationContext.ScheduledHandle periodicReportTimer;
final long reportIntervalNanos; final long reportIntervalNanos;
@ -72,9 +71,8 @@ final class OrcaServiceImpl extends OpenRcaServiceGrpc.OpenRcaServiceImplBase {
}); });
OrcaClient(OrcaLoadReportRequest request, StreamObserver<OrcaLoadReport> responseObserver) { OrcaClient(OrcaLoadReportRequest request, StreamObserver<OrcaLoadReport> responseObserver) {
this.request = checkNotNull(request); this.reportIntervalNanos = Math.max(Durations.toNanos(
this.reportIntervalNanos = Math.max(Durations.toNanos(request.getReportInterval()), checkNotNull(request).getReportInterval()), minReportIntervalNanos);
minReportIntervalNanos);
this.responseObserver = (ServerCallStreamObserver<OrcaLoadReport>) responseObserver; this.responseObserver = (ServerCallStreamObserver<OrcaLoadReport>) responseObserver;
this.responseObserver.setOnCancelHandler(new Runnable() { this.responseObserver.setOnCancelHandler(new Runnable() {
@Override @Override

9
xds/src/test/java/io/grpc/xds/OrcaServiceImplTest.java
View File

@ -41,7 +41,6 @@ import io.grpc.inprocess.InProcessServerBuilder;
import io.grpc.internal.FakeClock; import io.grpc.internal.FakeClock;
import io.grpc.testing.GrpcCleanupRule; import io.grpc.testing.GrpcCleanupRule;
import java.util.Iterator; import java.util.Iterator;
import java.util.Map;
import java.util.Random; import java.util.Random;
import java.util.concurrent.CyclicBarrier; import java.util.concurrent.CyclicBarrier;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -53,12 +52,15 @@ import org.junit.runner.RunWith;
import org.junit.runners.JUnit4; import org.junit.runners.JUnit4;
import org.mockito.ArgumentCaptor; import org.mockito.ArgumentCaptor;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
@RunWith(JUnit4.class) @RunWith(JUnit4.class)
public class OrcaServiceImplTest { public class OrcaServiceImplTest {
@Rule @Rule
public final GrpcCleanupRule grpcCleanup = new GrpcCleanupRule(); public final GrpcCleanupRule grpcCleanup = new GrpcCleanupRule();
@Rule
public final MockitoRule mocks = MockitoJUnit.rule();
private ManagedChannel channel; private ManagedChannel channel;
private Server oobServer; private Server oobServer;
private final FakeClock fakeClock = new FakeClock(); private final FakeClock fakeClock = new FakeClock();
@ -69,7 +71,6 @@ public class OrcaServiceImplTest {
@Before @Before
public void setup() throws Exception { public void setup() throws Exception {
MockitoAnnotations.initMocks(this);
defaultTestService = new OrcaOobService(1, TimeUnit.SECONDS, defaultTestService = new OrcaOobService(1, TimeUnit.SECONDS,
fakeClock.getScheduledExecutorService()); fakeClock.getScheduledExecutorService());
startServerAndGetChannel(defaultTestService.getService()); startServerAndGetChannel(defaultTestService.getService());
@ -234,7 +235,7 @@ public class OrcaServiceImplTest {
@Test @Test
public void testApis() throws Exception { public void testApis() throws Exception {
Map<String, Double> firstUtilization = ImmutableMap.of("util", 0.1); ImmutableMap<String, Double> firstUtilization = ImmutableMap.of("util", 0.1);
OrcaLoadReport goldenReport = OrcaLoadReport.newBuilder() OrcaLoadReport goldenReport = OrcaLoadReport.newBuilder()
.setCpuUtilization(random.nextDouble()) .setCpuUtilization(random.nextDouble())
.setMemUtilization(random.nextDouble()) .setMemUtilization(random.nextDouble())