diff --git a/RELEASE.md b/RELEASE.md index 88e5a96f..4dc7a35d 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,3 +1,7 @@ +# Release 2.1.1 +## Major Features and Improvements +* Fix the bug that the serving-server service fails to start when zookeeper is not used as the service registration and coordination center. + # Release 2.1.0 ## Major Features and Improvements * Support multi-host algorithm model online prediction,currently, the supported multi-host algorithms include HeteroLR and HeteroSecureBoost. diff --git a/document/docs/config/proxy.md b/document/docs/config/proxy.md index db47c848..bfc3386a 100644 --- a/document/docs/config/proxy.md +++ b/document/docs/config/proxy.md @@ -125,45 +125,43 @@ ```yaml { "route_table": { - "default": { + "default": { // 使用此处的default配置就能向对方发送请求,能满足大部分需求。 "default": [ - // 此处用于配置serving-proxy默认对外转发地址， - // 切记不能配置成serving-proxy自己的ip端口，会形成回环 - { - "ip": "127.0.0.1", - "port": 9999 + { // 此处用于配置serving-proxy默认对外转发地址， 切记不能配置成serving-proxy自己的ip端口，会形成回环 + "ip": "192.168.1.1", + "port": 8869 } ] }, - // 向对方发送请求使用上面的default配置就能满足大部分需求。 - // 以下是路由中己方部分说明： + + // 以下是路由中己方部分的配置说明： + （提示：如果使用zk的话，己方的配置其实是可以省略的，因为路由信息在服务启动的时候全注册到zk了，系统会在zk上拿到想要的信息； + 如果部署时候选择的是无zk方案，那么下面的配置不能缺少） //己方的serving-proxy 在收到grpc unaryCall接口的请求后，会根据请求中的目的partyId尝试匹配。 - 比如请求中目的partId为10000，则会在路由表中查找是否存在10000的配置 - //此处的10000表示目的partId 为10000时的路由，匹配到10000之后，再根据请求中的角色信息role。 - 比如请求中role 为serving则会继续匹配下面是否有serving的配置 + 比如请求中目的partId为10000，则会在路由表中查找是否存在10000的配置 + //此处的10000表示目的partId 为10000时的路由，匹配到10000之后再根据请求中的角色信息role， + 比如请求role为serving，则会继续往下面匹配serving的配置 "10000": { - // 在未找到对应role的路由地址时，会使用default的配置 - "default": [ + "default": [ //可以给出一个默认值， 在未找到对应role的路由地址时，会使用default的配置 { "ip": "127.0.0.1", - "port": 8889 + "port": 8879 } ], "serving": [ - // 当已经匹配到role为serving，则代表请求为发给serving-server的请求，这时检查是否启用了ZK为注册中心， - 如果已启用ZK则优先从ZK中获取目标地址，未找到时使用以下地址 + // 当匹配到role为serving，则代表请求为发给serving-server的请求，这时检查是否启用了ZK为注册中心， + 如果启用ZK则优先从ZK中获取目标地址，未找到时使用以下地址 - { // 此处配置己端对应serving服务地址列表，ip和port对应serving-server所启动的grpc服务地址 + { // 此处配置己端对应serving服务地址列表，ip和port对应serving-server所启动的grpc服务地址 "ip": "127.0.0.1", - "port": 8080 + "port": 8000 } ] } }, - // 此处配置当前路由表规则开启/关闭 "permission": { - "default_allow": true + "default_allow": true // 此处配置当前路由表规则开启/关闭 } } ``` @@ -181,9 +179,8 @@ }, ...... }, - // 此处配置当前路由表规则开启/关闭 "permission": { - "default_allow": true + "default_allow": true // 此处配置当前路由表规则开启/关闭 } } diff --git a/document/docs/config/security.md b/document/docs/config/security.md index 4dfaa03e..796bb1f0 100644 --- a/document/docs/config/security.md +++ b/document/docs/config/security.md @@ -58,8 +58,8 @@ proxy.grpc.inter.client.privateKey.file=/data/projects/fate-serving/serving-prox "port": 9999, "useSSL": true # 配置对外节点时，需要将useSSL配置成true，client端请求时将携带证书 "negotiationType": "TLS", - "certChainFile": "/data/projects/fate-serving/serving-proxy/conf/ssl/server.crt ", - "privateKeyFile": "/data/projects/fate-serving/serving-proxy/conf/ssl/server.pem", + "certChainFile": "/data/projects/fate-serving/serving-proxy/conf/ssl/client.crt ", + "privateKeyFile": "/data/projects/fate-serving/serving-proxy/conf/ssl/client.pem", "caFile": "/data/projects/fate-serving/serving-proxy/conf/ssl/ca.crt" } ] diff --git a/document/docs/config/server.md b/document/docs/config/server.md index 4879a1a5..a866ddd3 100644 --- a/document/docs/config/server.md +++ b/document/docs/config/server.md @@ -149,8 +149,8 @@ proxy - 离线路由proxy地址，建议通过zookeeper来获取地址，不建议直接配置 - 127.0.0.1:8000 + proxy服务的地址，建议通过启用zookeeper自动获取地址，当不启用zk时需要直接在此处配置 + 127.0.0.1:8879 zk.url diff --git a/document/docs/quickstart/quickstart.md b/document/docs/quickstart/quickstart.md index bcf65b6c..a0246ede 100644 --- a/document/docs/quickstart/quickstart.md +++ b/document/docs/quickstart/quickstart.md @@ -15,9 +15,9 @@ $ mvn clean package 随后拷贝，比如 serving-server/target/fate-serving-server-{version}-release.zip 到想要部署的路径下，并解压。（version为当前版本号） 用户也可选择下载已编译好的版本，链接如下: -• [fate-serving-server-2.1.0-release.zip](https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/fate-serving-server-2.1.0-release.zip) -• [fate-serving-proxy-2.1.0-release.zip](https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/fate-serving-proxy-2.1.0-release.zip) -• [fate-serving-admin-2.1.0-release.zip](https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/fate-serving-admin-2.1.0-release.zip) +• [fate-serving-server-2.1.1-release.zip](https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/fate-serving-server-2.1.1-release.zip) +• [fate-serving-proxy-2.1.1-release.zip](https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/fate-serving-proxy-2.1.1-release.zip) +• [fate-serving-admin-2.1.1-release.zip](https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/fate-serving-admin-2.1.1-release.zip) ### zookeeper部署 diff --git a/document/docs/release/change_log.md b/document/docs/release/change_log.md index 71d39709..3f90b700 100644 --- a/document/docs/release/change_log.md +++ b/document/docs/release/change_log.md @@ -1,4 +1,9 @@ -## FATE-SERVING 2.1 新增特性 +## FATE-SERVING 2.1.1 +```text +1.修复不使用zookeeper作为服务注册和协调中心的情况下，serving-server服务启动失败的BUG。 +``` + +## FATE-SERVING 2.1.0 新增特性 ```text 1.支持多host算法模型在线预测，目前支持的多host算法有：纵向LR、纵向SBT。 2.支持在admin页面以pipeline方式展示模型信息。 @@ -11,7 +16,7 @@ 9.新增一个通用的httpAdaptor用于host获取特征。 ``` -## FATE-SERVING 2.0 新增特性 +## FATE-SERVING 2.0.0 新增特性 ```text 1.单笔预测，2.0.*版本guest方与host方将并行计算，从而降低了耗时。 diff --git a/document/docs/service/client.md b/document/docs/service/client.md index 31f53194..e12d8ca2 100644 --- a/document/docs/service/client.md +++ b/document/docs/service/client.md @@ -1,12 +1,12 @@ FATE-Serving提供了fate-serving-client工具 ### 下载对应版本的fate-serving-client ->linux版本：[fate-serving-client-2.1.0-linux.tar.gz](https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/fate-serving-client-2.1.0-linux.tar.gz ) ->mac版本：[fate-serving-client-2.1.0-darwin.tar.gz](https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/fate-serving-client-2.1.0-darwin.tar.gz) +>linux版本：[fate-serving-client-2.1.1-linux.tar.gz](https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/fate-serving-client-2.1.1-linux.tar.gz ) +>mac版本：[fate-serving-client-2.1.1-darwin.tar.gz](https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/fate-serving-client-2.1.1-darwin.tar.gz) -需要先确认下载解压出来的文件有没有可执行权限，没有权限就执行 `chmod +777 fate-serving-client-2.1.0-linux`授权。 +需要先确认下载解压出来的文件有没有可执行权限，没有权限就执行 `chmod +777 fate-serving-client-2.1.1-linux`授权。 ### 启动client -在终端中使用`./fate-serving-client`启动client +在终端中使用`./fate-serving-client-2.1.1-linux`启动client ![connect](../img/client-connect.jpg) ### 提供了以下几种指令 diff --git a/fate-serving-admin-ui/package.json b/fate-serving-admin-ui/package.json old mode 100755 new mode 100644 index 762d7ff2..879ad2d2 --- a/fate-serving-admin-ui/package.json +++ b/fate-serving-admin-ui/package.json @@ -1,6 +1,6 @@ { "name": "FATE-Serving", - "version": "2.0.0", + "version": "2.1.1", "private": true, "author": "FATE Serving", "scripts": { diff --git a/fate-serving-admin-ui/pom.xml b/fate-serving-admin-ui/pom.xml index 24d26243..5393e18d 100644 --- a/fate-serving-admin-ui/pom.xml +++ b/fate-serving-admin-ui/pom.xml @@ -21,7 +21,7 @@ fate-serving com.webank.ai.fate - 2.1.0 + ${fate.version} 4.0.0 diff --git a/fate-serving-admin/bin/service.sh b/fate-serving-admin/bin/service.sh index e75dcc7e..794dfb66 100644 --- 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.1.0 +module_version=2.1.1 case "$1" in start) diff --git a/fate-serving-admin/pom.xml b/fate-serving-admin/pom.xml index e1a8831d..d3235ee8 100755 --- a/fate-serving-admin/pom.xml +++ b/fate-serving-admin/pom.xml @@ -20,7 +20,7 @@ fate-serving com.webank.ai.fate - 2.1.0 + ${fate.version} fate-serving-admin @@ -36,19 +36,19 @@ com.webank.ai.fate fate-serving-core - 2.1.0 + ${fate.version} com.webank.ai.fate fate-serving-register - 2.1.0 + ${fate.version} com.webank.ai.fate fate-serving-admin-ui - 2.1.0 + ${fate.version}