kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Optimize the agent grpc channel management. (#2198) 

* Optimize the grpc channel management.

* Rename old version concepts

* Notify when rebuild connection.

* Remove notify in new channel created.

* Remove println.
This commit is contained in:
吴晟 Wu Sheng 2019-01-24 00:09:09 +08:00 committed by GitHub
parent 2e0104e599
commit 4399299bd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 97 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Config.java
View File

@ -88,7 +88,7 @@ public class Config {
*/
public static long GRPC_CHANNEL_CHECK_INTERVAL = 30;
/**
* application and service registry check interval
* service and endpoint registry check interval
*/
public static long APP_AND_SERVICE_REGISTER_CHECK_INTERVAL = 3;
/**

29
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/GRPCChannelManager.java
View File

@ -39,6 +39,7 @@ public class GRPCChannelManager implements BootService, Runnable {
private Random random = new Random();
private List<GRPCChannelListener> listeners = Collections.synchronizedList(new LinkedList<GRPCChannelListener>());
private volatile List<String> grpcServers;
private volatile int selectedIdx = -1;
@Override
public void prepare() throws Throwable {
@ -87,25 +88,29 @@ public class GRPCChannelManager implements BootService, Runnable {
String server = "";
try {
int index = Math.abs(random.nextInt()) % grpcServers.size();
server = grpcServers.get(index);
String[] ipAndPort = server.split(":");
if (index != selectedIdx) {
selectedIdx = index;
managedChannel = GRPCChannel.newBuilder(ipAndPort[0], Integer.parseInt(ipAndPort[1]))
.addManagedChannelBuilder(new StandardChannelBuilder())
.addManagedChannelBuilder(new TLSChannelBuilder())
.addChannelDecorator(new AuthenticationDecorator())
.build();
server = grpcServers.get(index);
String[] ipAndPort = server.split(":");
if (managedChannel != null) {
managedChannel.shutdownNow();
}
managedChannel = GRPCChannel.newBuilder(ipAndPort[0], Integer.parseInt(ipAndPort[1]))
.addManagedChannelBuilder(new StandardChannelBuilder())
.addManagedChannelBuilder(new TLSChannelBuilder())
.addChannelDecorator(new AuthenticationDecorator())
.build();
if (!managedChannel.isShutdown() && !managedChannel.isTerminated()) {
reconnect = false;
notify(GRPCChannelStatus.CONNECTED);
} else {
notify(GRPCChannelStatus.DISCONNECT);
}
reconnect = false;
return;
} catch (Throwable t) {
logger.error(t, "Create channel to {} fail.", server);
notify(GRPCChannelStatus.DISCONNECT);
}
}

79
apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/remote/GRPCChannelManagerTest.java Normal file
View File

@ -0,0 +1,79 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package org.apache.skywalking.apm.agent.core.remote;
import io.grpc.Server;
import io.grpc.netty.NettyServerBuilder;
import io.grpc.stub.StreamObserver;
import java.net.InetSocketAddress;
import org.apache.skywalking.apm.agent.core.conf.Config;
import org.apache.skywalking.apm.network.register.v2.*;
import org.junit.*;
public class GRPCChannelManagerTest {
@BeforeClass
public static void setup() {
Config.Collector.BACKEND_SERVICE = "127.0.0.1:8080";
}
@AfterClass
public static void clear() {
Config.Collector.BACKEND_SERVICE = "";
}
//@Test
public void testConnected() throws Throwable {
GRPCChannelManager manager = new GRPCChannelManager();
manager.addChannelListener(new GRPCChannelListener() {
@Override public void statusChanged(GRPCChannelStatus status) {
}
});
manager.boot();
Thread.sleep(1000);
RegisterGrpc.RegisterBlockingStub stub = RegisterGrpc.newBlockingStub(manager.getChannel());
try {
stub.doServiceRegister(Services.newBuilder().addServices(Service.newBuilder().setServiceName("abc")).build());
} catch (Exception e) {
e.printStackTrace();
}
NettyServerBuilder nettyServerBuilder = NettyServerBuilder.forAddress(new InetSocketAddress("127.0.0.1", 8080));
nettyServerBuilder.addService(new RegisterGrpc.RegisterImplBase() {
@Override
public void doServiceRegister(Services request, StreamObserver<ServiceRegisterMapping> responseObserver) {
}
});
Server server = nettyServerBuilder.build();
server.start();
Thread.sleep(1000);
boolean registerSuccess = false;
try {
stub.doServiceRegister(Services.newBuilder().addServices(Service.newBuilder().setServiceName("abc")).build());
registerSuccess = true;
} catch (Exception e) {
e.printStackTrace();
}
Assert.assertTrue(registerSuccess);
server.shutdownNow();
}
}