Merge pull request FederatedAI#1993 from FederatedAI/develop

Release v1.4.5

.gitmodules

@@ -5,4 +5,4 @@
 [submodule "eggroll"]
 	path = eggroll
 	url = https://github.com/WeBankFinTech/eggroll.git
-	branch = v2.0.1
+	branch = v2.0.2

.travis.yml

@@ -14,9 +14,9 @@ matrix:
     - env: OS='centos:7'
 
 script:
-  - wget https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/standalone-fate-master-1.4.4.tar.gz
-  - tar -xzf  standalone-fate-master-1.4.4.tar.gz 
-  - cd standalone-fate-master-1.4.4
+  - wget https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/standalone-fate-master-1.4.5.tar.gz
+  - tar -xzf  standalone-fate-master-1.4.5.tar.gz
+  - cd standalone-fate-master-1.4.5
   - sed -i.bak "s/sh  service.sh/bash service.sh/g" init.sh
   - source init.sh init
   - ls -alh

RELEASE.md

@@ -1,3 +1,8 @@
+# Release 1.4.5
+## Major Features and Improvements
+> EggRoll
+* RollSite supports the communication certificates
+
 # Release 1.4.4
 ## Major Features and Improvements
 > FATE-Flow

arch/api/impl/based_2x/federation.py

@@ -135,10 +135,18 @@ def done_callback(fut):
             except Exception as e:
                 import os
                 import signal
+                import traceback
+                import logging
+                import sys
+                exc_info = sys.exc_info()
+                traceback.print_exception(*exc_info)
                 pid = os.getpid()
                 LOGGER.exception(f"remote fail, terminating process(pid={pid})")
-                os.kill(pid, signal.SIGTERM)
-                raise e
+                try:
+                    logging.shutdown()
+                finally:
+                    os.kill(pid, signal.SIGTERM)
+                    raise e
 
         for future in futures:
             future.add_done_callback(done_callback)

cluster-deploy/README.md

@@ -199,10 +199,10 @@ Execute under the app user of the target server (192.168.0.1 has an external net
 ```
 mkdir -p /data/projects/install
 cd /data/projects/install
-wget https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/python-env-1.4.3-release.tar.gz
+wget https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/python-env-1.4.5-release.tar.gz
 wget https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/jdk-8u192-linux-x64.tar.gz
-wget https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/mysql-1.4.3-release.tar.gz
-wget https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/FATE_install_1.4.3-release.tar.gz
+wget https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/mysql-1.4.5-release.tar.gz
+wget https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/FATE_install_1.4.5-release.tar.gz
 
 #Send to 192.168.0.2和192.168.0.3
 scp *.tar.gz app@192.168.0.2:/data/projects/install
@@ -355,7 +355,7 @@ sh Miniconda3-4.5.4-Linux-x86_64.sh -b -p /data/projects/fate/common/miniconda3
 tar xvf pip-packages-fate-*.tar.gz
 source /data/projects/fate/common/python/venv/bin/activate
 pip install setuptools-42.0.2-py2.py3-none-any.whl
-pip install -r pip-packages-fate-1.4.3/requirements.txt -f ./pip-packages-fate-1.4.3 --no-index
+pip install -r pip-packages-fate-1.4.5/requirements.txt -f ./pip-packages-fate-1.4.5 --no-index
 pip list | wc -l
 #The result should be 161
 ```

cluster-deploy/README.rst

@@ -239,10 +239,10 @@ external network environment):
 
     mkdir -p /data/projects/install
     cd /data/projects/install
-    wget https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/python-env-1.4.3-release.tar.gz
+    wget https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/python-env-1.4.5-release.tar.gz
     wget https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/jdk-8u192-linux-x64.tar.gz
-    wget https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/mysql-1.4.3-release.tar.gz
-    wget https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/FATE_install_1.4.3-release.tar.gz
+    wget https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/mysql-1.4.5-release.tar.gz
+    wget https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/FATE_install_1.4.5-release.tar.gz
 
     #Send to 192.168.0.2和192.168.0.3
     scp *.tar.gz app@192.168.0.2:/data/projects/install
@@ -400,7 +400,7 @@ external network environment):
     tar xvf pip-packages-fate-*.tar.gz
     source /data/projects/fate/common/python/venv/bin/activate
     pip install setuptools-42.0.2-py2.py3-none-any.whl
-    pip install -r pip-packages-fate-1.4.3/requirements.txt -f ./pip-packages-fate-1.4.3 --no-index
+    pip install -r pip-packages-fate-1.4.5/requirements.txt -f ./pip-packages-fate-1.4.5 --no-index
     pip list | wc -l
     #The result should be 161
 

cluster-deploy/build.sh

@@ -49,7 +49,7 @@ cp -r arch/transfer_variables ${package_dir}/python/arch/
 cp -r arch/standalone ${package_dir}/python/arch/
 cp fate.env requirements.txt RELEASE.md ${package_dir}/python/
 cp -r examples federatedml fate_flow ${package_dir}/python/
-cp -r bin  ${package_dir}/
+cp -r bin tools ${package_dir}/
 echo "[INFO] Package fate done"
 
 echo "[INFO] Package fateboard start"

cluster-deploy/doc/Fate-allinone_deployment_guide_install_zh.md

@@ -255,8 +255,8 @@ Swap:        131071           0      131071
 
 ```
 cd /data/projects/
-wget https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/fate-cluster-install-1.4.4-release-c7-u18.tar.gz
-tar xzf fate-cluster-install-1.4.4-release-c7-u18.tar.gz
+wget https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/fate-cluster-install-1.4.5-release-c7-u18.tar.gz
+tar xzf fate-cluster-install-1.4.5-release-c7-u18.tar.gz
 ```
 
 ## 5.2 部署前检查
@@ -292,7 +292,7 @@ vi fate-cluster-install/allInone/conf/setup.conf
 | 配置项           | 配置项值                                      | 说明                                                         |
 | ---------------- | --------------------------------------------- | ------------------------------------------------------------ |
 | roles            | 默认："host" "guest"                          | 部署的角色，有HOST端、GUEST端                                |
-| version          | 默认：1.4.4                                   | Fate 版本号                                                  |
+| version          | 默认：1.4.5                                   | Fate 版本号                                                  |
 | pbase            | 默认： /data/projects                         | 项目根目录                                                   |
 | lbase            | 默认：/data/logs                              | 保持默认不要修改                                             |
 | ssh_user         | 默认：app                                     | ssh连接目标机器的用户，也是部署后文件的属主                  |
@@ -321,7 +321,7 @@ vi fate-cluster-install/allInone/conf/setup.conf
 #to install role
 roles=( "host" "guest" )
 
-version="1.4.4"
+version="1.4.5"
 #project base
 pbase="/data/projects"
 
@@ -377,7 +377,7 @@ basemodules=( "base" "java" "python" "eggroll" "fate" )
 #to install role
 roles=( "host" )
 
-version="1.4.4"
+version="1.4.5"
 #project base
 pbase="/data/projects"
 

cluster-deploy/doc/Fate-allinone_deployment_guide_install_zh.rst

@@ -275,8 +275,8 @@ ssh app@192.168.0.2
 ::
 
     cd /data/projects/
-    wget https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/fate-cluster-install-1.4.4-release-c7-u18.tar.gz
-    tar xzf fate-cluster-install-1.4.4-release-c7-u18.tar.gz
+    wget https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/fate-cluster-install-1.4.5-release-c7-u18.tar.gz
+    tar xzf fate-cluster-install-1.4.5-release-c7-u18.tar.gz
 
 5.2 部署前检查
 --------------
@@ -314,7 +314,7 @@ ssh app@192.168.0.2
 +======================+=================================================+==============================================================================+
 | roles                | 默认："host" "guest"                            | 部署的角色，有HOST端、GUEST端                                                |
 +----------------------+-------------------------------------------------+------------------------------------------------------------------------------+
-| version              | 默认：1.4.4                                     | Fate 版本号                                                                  |
+| version              | 默认：1.4.5                                     | Fate 版本号                                                                  |
 +----------------------+-------------------------------------------------+------------------------------------------------------------------------------+
 | pbase                | 默认： /data/projects                           | 项目根目录                                                                   |
 +----------------------+-------------------------------------------------+------------------------------------------------------------------------------+
@@ -366,7 +366,7 @@ ssh app@192.168.0.2
     #to install role
     roles=( "host" "guest" )
 
-    version="1.4.4"
+    version="1.4.5"
     #project base
     pbase="/data/projects"
 
@@ -421,7 +421,7 @@ ssh app@192.168.0.2
     #to install role
     roles=( "host" )
 
-    version="1.4.4"
+    version="1.4.5"
     #project base
     pbase="/data/projects"
 

cluster-deploy/doc/Fate-exchange_deployment_guide_zh.md

@@ -146,7 +146,7 @@ fi
 ```
 cd /data/projects/install
 wget https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/jdk-8u192-linux-x64.tar.gz
-wget https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/FATE_install_1.4.4-release.tar.gz
+wget https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/FATE_install_1.4.5-release.tar.gz
 ```
 
 ## 5.2 操作系统参数检查

cluster-deploy/doc/Fate-exchange_deployment_guide_zh.rst

@@ -160,7 +160,7 @@ ufw status
 
     cd /data/projects/install
     wget https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/jdk-8u192-linux-x64.tar.gz
-    wget https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/FATE_install_1.4.4-release.tar.gz
+    wget https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/FATE_install_1.4.5-release.tar.gz
 
 5.2 操作系统参数检查
 --------------------