Merge pull request #110 from FederatedAI/develop

forgivedengkai · web-flow · commit 3a81bc16f907 · 2021-06-28T10:31:45.000+08:00
Develop
diff --git a/fate-serving-admin-ui/pom.xml b/fate-serving-admin-ui/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>fate-serving</artifactId>
         <groupId>com.webank.ai.fate</groupId>
-        <version>2.0.4</version>
+        <version>2.0.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/fate-serving-admin/bin/service.sh b/fate-serving-admin/bin/service.sh
@@ -24,7 +24,7 @@ basepath=$(cd `dirname $0`;pwd)
 configpath=$(cd $basepath/conf;pwd)
 module=serving-admin
 main_class=com.webank.ai.fate.serving.admin.Bootstrap
-module_version=2.0.4
+module_version=2.0.5
 
 case "$1" in
     start)
diff --git a/fate-serving-admin/pom.xml b/fate-serving-admin/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>fate-serving</artifactId>
         <groupId>com.webank.ai.fate</groupId>
-        <version>2.0.4</version>
+        <version>2.0.5</version>
     </parent>
 
     <artifactId>fate-serving-admin</artifactId>
@@ -36,19 +36,19 @@
         <dependency>
             <groupId>com.webank.ai.fate</groupId>
             <artifactId>fate-serving-core</artifactId>
-            <version>2.0.4</version>
+            <version>2.0.5</version>
         </dependency>
 
         <dependency>
             <groupId>com.webank.ai.fate</groupId>
             <artifactId>fate-serving-register</artifactId>
-            <version>2.0.4</version>
+            <version>2.0.5</version>
         </dependency>
 
         <dependency>
             <groupId>com.webank.ai.fate</groupId>
             <artifactId>fate-serving-admin-ui</artifactId>
-            <version>2.0.4</version>
+            <version>2.0.5</version>
         </dependency>
 
         <!--<dependency>
@@ -118,7 +118,7 @@
         <dependency>
             <groupId>com.webank.ai.fate</groupId>
             <artifactId>fate-serving-common</artifactId>
-            <version>2.0.4</version>
+            <version>2.0.5</version>
         </dependency>
 
     </dependencies>
diff --git a/fate-serving-common/pom.xml b/fate-serving-common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>fate-serving</artifactId>
         <groupId>com.webank.ai.fate</groupId>
-        <version>2.0.4</version>
+        <version>2.0.5</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>com.webank.ai.fate</groupId>
             <artifactId>fate-serving-core</artifactId>
-            <version>2.0.4</version>
+            <version>2.0.5</version>
         </dependency>
         <dependency>
             <groupId>com.lmax</groupId>
diff --git a/fate-serving-core/pom.xml b/fate-serving-core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>fate-serving</artifactId>
         <groupId>com.webank.ai.fate</groupId>
-        <version>2.0.4</version>
+        <version>2.0.5</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/fate-serving-core/src/main/java/com/webank/ai/fate/serving/core/bean/GrpcConnectionPool.java b/fate-serving-core/src/main/java/com/webank/ai/fate/serving/core/bean/GrpcConnectionPool.java
@@ -18,6 +18,7 @@
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
+import com.webank.ai.fate.serving.core.rpc.router.RouterInfo;
 import io.grpc.ConnectivityState;
 import io.grpc.ManagedChannel;
 import io.grpc.netty.shaded.io.grpc.netty.GrpcSslContexts;
@@ -130,6 +131,20 @@ private boolean needAddChannel(ChannelResource channelResource) {
         }
     }
 
+    public  ManagedChannel getManagedChannel(RouterInfo  routerInfo){
+        NettyServerInfo nettyServerInfo = null;
+        if (routerInfo.isUseSSL()) {
+            nettyServerInfo = new NettyServerInfo(NegotiationType.TLS.toString(),
+                    MetaInfo.PROPERTY_PROXY_GRPC_INTER_CLIENT_CERTCHAIN_FILE,
+                    MetaInfo.PROPERTY_PROXY_GRPC_INTER_CLIENT_PRIVATEKEY_FILE,
+                    MetaInfo.PROPERTY_PROXY_GRPC_INTER_CA_FILE);
+        } else {
+            nettyServerInfo = new NettyServerInfo();
+        }
+        String key = new StringBuilder().append(routerInfo.getHost()).append(":").append(routerInfo.getPort()).toString();
+        return getAManagedChannel(key,nettyServerInfo);
+    }
+
     public ManagedChannel getManagedChannel(String key) {
         return getAManagedChannel(key, new NettyServerInfo());
     }
@@ -185,9 +200,7 @@ private synchronized ManagedChannel createInner(String key, NettyServerInfo nett
 
     public synchronized ManagedChannel createManagedChannel(String ip, int port, NettyServerInfo nettyServerInfo) {
         try {
-            if (logger.isDebugEnabled()) {
-                logger.debug("create ManagedChannel");
-            }
+            logger.info("create channel ip {} port {} server info {}",ip,port,nettyServerInfo);
 
             NettyChannelBuilder channelBuilder = NettyChannelBuilder
                     .forAddress(ip, port)
@@ -223,7 +236,6 @@ public synchronized ManagedChannel createManagedChannel(String ip, int port, Net
         }
         catch (Exception e) {
             logger.error("create channel error : " ,e);
-            //e.printStackTrace();
         }
         return null;
     }
diff --git a/fate-serving-core/src/main/java/com/webank/ai/fate/serving/core/bean/NettyServerInfo.java b/fate-serving-core/src/main/java/com/webank/ai/fate/serving/core/bean/NettyServerInfo.java
@@ -1,9 +1,11 @@
 package com.webank.ai.fate.serving.core.bean;
 
+import com.webank.ai.fate.serving.core.utils.JsonUtil;
 import io.grpc.netty.shaded.io.grpc.netty.NegotiationType;
 
 public class NettyServerInfo {
 
+
     public NettyServerInfo() {
         this.negotiationType = NegotiationType.PLAINTEXT;
     }
@@ -54,4 +56,7 @@ public String getTrustCertCollectionFilePath() {
     public void setTrustCertCollectionFilePath(String trustCertCollectionFilePath) {
         this.trustCertCollectionFilePath = trustCertCollectionFilePath;
     }
+    public String  toString(){
+        return JsonUtil.object2Json(this);
+    }
 }
diff --git a/fate-serving-extension/pom.xml b/fate-serving-extension/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>fate-serving</artifactId>
         <groupId>com.webank.ai.fate</groupId>
-        <version>2.0.4</version>
+        <version>2.0.5</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>com.webank.ai.fate</groupId>
             <artifactId>fate-serving-core</artifactId>
-            <version>2.0.4</version>
+            <version>2.0.5</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>com.webank.ai.fate</groupId>
             <artifactId>fate-serving-common</artifactId>
-            <version>2.0.4</version>
+            <version>2.0.5</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/fate-serving-federatedml/pom.xml b/fate-serving-federatedml/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>fate-serving</artifactId>
         <groupId>com.webank.ai.fate</groupId>
-        <version>2.0.4</version>
+        <version>2.0.5</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -31,19 +31,19 @@
         <dependency>
             <groupId>com.webank.ai.fate</groupId>
             <artifactId>fate-serving-core</artifactId>
-            <version>2.0.4</version>
+            <version>2.0.5</version>
         </dependency>
 
         <dependency>
             <groupId>com.webank.ai.fate</groupId>
             <artifactId>fate-serving-common</artifactId>
-            <version>2.0.4</version>
+            <version>2.0.5</version>
         </dependency>
 
         <dependency>
             <groupId>com.webank.ai.fate</groupId>
             <artifactId>fate-serving-register</artifactId>
-            <version>2.0.4</version>
+            <version>2.0.5</version>
         </dependency>
     </dependencies>
 
diff --git a/fate-serving-proxy/bin/service.sh b/fate-serving-proxy/bin/service.sh
@@ -24,7 +24,7 @@ basepath=$(cd `dirname $0`;pwd)
 configpath=$(cd $basepath/conf;pwd)
 module=serving-proxy
 main_class=com.webank.ai.fate.serving.proxy.bootstrap.Bootstrap
-module_version=2.0.4
+module_version=2.0.5
 
 
 case "$1" in
diff --git a/fate-serving-proxy/pom.xml b/fate-serving-proxy/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>fate-serving</artifactId>
         <groupId>com.webank.ai.fate</groupId>
-        <version>2.0.4</version>
+        <version>2.0.5</version>
     </parent>
 
     <packaging>jar</packaging>
@@ -76,7 +76,7 @@
         <dependency>
             <groupId>com.webank.ai.fate</groupId>
             <artifactId>fate-serving-common</artifactId>
-            <version>2.0.4</version>
+            <version>2.0.5</version>
         </dependency>
 
     </dependencies>
diff --git a/fate-serving-proxy/src/main/java/com/webank/ai/fate/serving/proxy/rpc/services/InferenceService.java b/fate-serving-proxy/src/main/java/com/webank/ai/fate/serving/proxy/rpc/services/InferenceService.java
@@ -66,7 +66,7 @@ public Map doService(Context context, InboundPackage<Map> data, OutboundPackage<
         String resultString = null;
         ListenableFuture<InferenceServiceProto.InferenceMessage> resultFuture;
         try {
-            managedChannel = this.grpcConnectionPool.getManagedChannel(routerInfo.getHost(), routerInfo.getPort());
+            managedChannel = this.grpcConnectionPool.getManagedChannel(routerInfo);
         } catch (Exception e) {
             logger.error("get grpc channel error", e);
             throw new RemoteRpcException("remote rpc exception");
diff --git a/fate-serving-proxy/src/main/java/com/webank/ai/fate/serving/proxy/rpc/services/UnaryCallService.java b/fate-serving-proxy/src/main/java/com/webank/ai/fate/serving/proxy/rpc/services/UnaryCallService.java
@@ -72,19 +72,9 @@ public Proxy.Packet doService(Context context, InboundPackage<Proxy.Packet> data
 
         try {
             NettyServerInfo nettyServerInfo;
-            if (routerInfo.isUseSSL()) {
-                nettyServerInfo = new NettyServerInfo(MetaInfo.PROPERTY_PROXY_GRPC_INTER_NEGOTIATIONTYPE,
-                        MetaInfo.PROPERTY_PROXY_GRPC_INTER_CLIENT_CERTCHAIN_FILE,
-                        MetaInfo.PROPERTY_PROXY_GRPC_INTER_CLIENT_PRIVATEKEY_FILE,
-                        MetaInfo.PROPERTY_PROXY_GRPC_INTER_CA_FILE);
-            } else {
-                nettyServerInfo = new NettyServerInfo();
-            }
-
-            ManagedChannel managedChannel = grpcConnectionPool.getManagedChannel(routerInfo.getHost(), routerInfo.getPort(), nettyServerInfo);
+            ManagedChannel managedChannel = grpcConnectionPool.getManagedChannel(routerInfo);
             DataTransferServiceGrpc.DataTransferServiceFutureStub stub1 = DataTransferServiceGrpc.newFutureStub(managedChannel);
             stub1.withDeadlineAfter(timeout, TimeUnit.MILLISECONDS);
-
             context.setDownstreamBegin(System.currentTimeMillis());
             ListenableFuture<Proxy.Packet> future = stub1.unaryCall(sourcePackage);
             Proxy.Packet packet = future.get(timeout, TimeUnit.MILLISECONDS);
diff --git a/fate-serving-register/pom.xml b/fate-serving-register/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>fate-serving</artifactId>
         <groupId>com.webank.ai.fate</groupId>
-        <version>2.0.4</version>
+        <version>2.0.5</version>
     </parent>
 
     <packaging>jar</packaging>
diff --git a/fate-serving-sdk/pom.xml b/fate-serving-sdk/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>fate-serving</artifactId>
         <groupId>com.webank.ai.fate</groupId>
-        <version>2.0.4</version>
+        <version>2.0.5</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -31,13 +31,13 @@
         <dependency>
             <groupId>com.webank.ai.fate</groupId>
             <artifactId>fate-serving-core</artifactId>
-            <version>2.0.4</version>
+            <version>2.0.5</version>
         </dependency>
 
         <dependency>
             <groupId>com.webank.ai.fate</groupId>
             <artifactId>fate-serving-register</artifactId>
-            <version>2.0.4</version>
+            <version>2.0.5</version>
         </dependency>
     </dependencies>
 
diff --git a/fate-serving-server/bin/service.sh b/fate-serving-server/bin/service.sh
@@ -24,7 +24,7 @@ basepath=$(cd `dirname $0`;pwd)
 configpath=$(cd $basepath/conf;pwd)
 module=serving-server
 main_class=com.webank.ai.fate.serving.Bootstrap
-module_version=2.0.4
+module_version=2.0.5
 
 
 case "$1" in
diff --git a/fate-serving-server/pom.xml b/fate-serving-server/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>fate-serving</artifactId>
         <groupId>com.webank.ai.fate</groupId>
-        <version>2.0.4</version>
+        <version>2.0.5</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -31,25 +31,25 @@
         <dependency>
             <groupId>com.webank.ai.fate</groupId>
             <artifactId>fate-serving-core</artifactId>
-            <version>2.0.4</version>
+            <version>2.0.5</version>
         </dependency>
 
         <dependency>
             <groupId>com.webank.ai.fate</groupId>
             <artifactId>fate-serving-federatedml</artifactId>
-            <version>2.0.4</version>
+            <version>2.0.5</version>
         </dependency>
 
         <dependency>
             <groupId>com.webank.ai.fate</groupId>
             <artifactId>fate-serving-register</artifactId>
-            <version>2.0.4</version>
+            <version>2.0.5</version>
         </dependency>
 
         <dependency>
             <groupId>com.webank.ai.fate</groupId>
             <artifactId>fate-serving-extension</artifactId>
-            <version>2.0.4</version>
+            <version>2.0.5</version>
         </dependency>
 
 
diff --git a/pom.xml b/pom.xml
@@ -19,7 +19,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <groupId>com.webank.ai.fate</groupId>
     <artifactId>fate-serving</artifactId>
-    <version>2.0.4</version>
+    <version>2.0.5</version>
 
     <packaging>pom</packaging>
     <modelVersion>4.0.0</modelVersion>
@@ -38,7 +38,7 @@
     </modules>
 
     <properties>
-        <fate.version>2.0.4</fate.version>
+        <fate.version>2.0.5</fate.version>
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,11 @@`
`1`	`1`	`package com.webank.ai.fate.serving.core.bean;`
`2`	`2`
	`3`	`+import com.webank.ai.fate.serving.core.utils.JsonUtil;`
`3`	`4`	`import io.grpc.netty.shaded.io.grpc.netty.NegotiationType;`
`4`	`5`
`5`	`6`	`public class NettyServerInfo {`
`6`	`7`
	`8`	`+`
`7`	`9`	`public NettyServerInfo() {`
`8`	`10`	`this.negotiationType = NegotiationType.PLAINTEXT;`
`9`	`11`	`}`
`@@ -54,4 +56,7 @@ public String getTrustCertCollectionFilePath() {`
`54`	`56`	`public void setTrustCertCollectionFilePath(String trustCertCollectionFilePath) {`
`55`	`57`	`this.trustCertCollectionFilePath = trustCertCollectionFilePath;`
`56`	`58`	`}`
	`59`	`+ public String toString(){`
	`60`	`+ return JsonUtil.object2Json(this);`
	`61`	`+ }`
`57`	`62`	`}`