diff --git a/Makefile b/Makefile index 63dd03108..a5d6d90f0 100644 --- a/Makefile +++ b/Makefile @@ -14,10 +14,10 @@ build-docker-image: $(call sub_make, ${K8S-DEPLOY}, build-docker-image) zip: - tar -czvf kubefate-docker-compose.tar.gz ./docker-deploy/* ./docker-deploy/.env + tar -czvf kubefate-docker-compose-${RELEASE_VERSION}.tar.gz ./docker-deploy/* ./docker-deploy/.env release: zip ${call sub_make, ${K8S-DEPLOY}, release RELEASE_VERSION=${RELEASE_VERSION}} && mv ${K8S-DEPLOY}/kubefate-k8s-${RELEASE_VERSION}.tar.gz ./ && curl -LJO https://federatedai.github.io/KubeFATE/package/fate-${RELEASE_VERSION}.tgz clean: - rm kubefate-docker-compose.tar.gz kubefate-k8s-*.tar.gz fate-*.tgz && $(call sub_make, ${K8S-DEPLOY}, clean) \ No newline at end of file + rm kubefate-docker-compose-*.tar.gz kubefate-k8s-*.tar.gz fate-*.tgz && $(call sub_make, ${K8S-DEPLOY}, clean) \ No newline at end of file diff --git a/docker-deploy/.env b/docker-deploy/.env index 03088eb4b..4046c8701 100644 --- a/docker-deploy/.env +++ b/docker-deploy/.env @@ -1,7 +1,7 @@ PREFIX=federatedai RegistryURI= -TAG=1.4.3-release -SERVING_TAG=1.2.4-release +TAG=1.4.4-release +SERVING_TAG=2.0.0-release # PREFIX: namespace on the registry's server. # RegistryURI: address of the local registry diff --git a/docker-deploy/README.md b/docker-deploy/README.md index 44af0a293..1f2a25fc9 100644 --- a/docker-deploy/README.md +++ b/docker-deploy/README.md @@ -389,7 +389,7 @@ $ curl -X POST -H 'Content-Type: application/json' -i 'http://192.168.7.1:8059/f "x6": -0.485934, "x7": 0.347072, "x8": -0.287570, - "x9": -0.733474, + "x9": -0.733474 }, "sendToRemoteFeatureData": { "id": "123" diff --git a/docker-deploy/serving_template/docker-serving/serving-proxy/conf/application.properties b/docker-deploy/serving_template/docker-serving/serving-proxy/conf/application.properties index 009a84aaf..ec2571557 100644 --- a/docker-deploy/serving_template/docker-serving/serving-proxy/conf/application.properties +++ b/docker-deploy/serving_template/docker-serving/serving-proxy/conf/application.properties @@ -1,40 +1,47 @@ -# same as partyid -coordinator=partyid +# +# Copyright 2019 The FATE Authors. All Rights Reserved. +# +# Licensed 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. +# +# coordinator same as Party ID +#coordinator=9999 server.port=8059 #inference.service.name=serving -## actuator -#management.server.port=10087 -#management.endpoints.web.exposure.include=health,info,metrics - #random, consistent #routeType=random - #route.table=/data/projects/fate-serving/serving-proxy/conf/route_table.json #auth.file=/data/projects/fate-serving/serving-proxy/conf/auth_config.json - +# zk router +#useZkRouter=true +useRegister=false useZkRouter=false -zk.url=zookeeper://localhost:2181 - +#zk.url=localhost:2181,localhost:2182,localhost:2183 # zk acl #acl.enable=false #acl.username= #acl.password= - # intra-partyid port -proxy.grpc.intra.port=8879 +#proxy.grpc.intra.port=8879 # inter-partyid port -proxy.grpc.inter.port=8869 - +#proxy.grpc.inter.port=8869 +# grpc #proxy.grpc.inference.timeout=3000 #proxy.grpc.inference.async.timeout=1000 #proxy.grpc.unaryCall.timeout=3000 - - - #proxy.grpc.threadpool.coresize=50 #proxy.grpc.threadpool.maxsize=100 #proxy.grpc.threadpool.queuesize=10 - #proxy.async.timeout=5000 #proxy.async.coresize=10 #proxy.async.maxsize=100 +#proxy.grpc.batch.inference.timeout=10000 \ No newline at end of file diff --git a/docker-deploy/serving_template/docker-serving/serving-server/conf/serving-server.properties b/docker-deploy/serving_template/docker-serving/serving-server/conf/serving-server.properties index 6844602a0..4d001dfc6 100644 --- a/docker-deploy/serving_template/docker-serving/serving-server/conf/serving-server.properties +++ b/docker-deploy/serving_template/docker-serving/serving-server/conf/serving-server.properties @@ -8,48 +8,41 @@ # 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, +# 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. # -ip=127.0.0.1 port=8000 -proxy=serving-proxy:8879 #serviceRoleName=serving -#inferenceWorkerThreadNum=10 # cache -#remoteModelInferenceResultCacheSwitch=true -# in-process cache -#modelCacheMaxSize=100 -#remoteModelInferenceResultCacheTTL=300 -#remoteModelInferenceResultCacheMaxSize=10000 -#inferenceResultCacheTTL=30 -#inferenceResultCacheCacheMaxSize=1000 +#remoteModelInferenceResultCacheSwitch=false +#cache.type=local +#model.cache.path= +# local cache +#local.cache.maxsize=10000 +#local.cache.expire=30 +#local.cache.interval=3 # external cache redis.ip= redis.port= +### configure this parameter to use cluster mode +#redis.cluster.nodes=127.0.0.1:6379,127.0.0.1:6380,127.0.0.1:6381,127.0.0.1:6382,127.0.0.1:6383,127.0.0.1:6384 +### this password is common in stand-alone mode and cluster mode redis.password= #redis.timeout=10 +#redis.expire=3000 #redis.maxTotal=100 #redis.maxIdle=100 -#external.remoteModelInferenceResultCacheTTL=86400 -#external.remoteModelInferenceResultCacheDBIndex=0 -#external.inferenceResultCacheTTL=300 -#external.inferenceResultCacheDBIndex=0 -#canCacheRetcode=0,102 -#external.processCacheDBIndex=0 - -# adapter -OnlineDataAccessAdapter=MockAdapter -InferencePostProcessingAdapter=PassPostProcessing -InferencePreProcessingAdapter=PassPreProcessing # external subsystem - +proxy=serving-proxy:8879 +# adapter +feature.single.adaptor=com.webank.ai.fate.serving.adaptor.dataaccess.MockAdapter +feature.batch.adaptor=com.webank.ai.fate.serving.adaptor.dataaccess.MockBatchAdapter # model transfer model.transfer.url=http://127.0.0.1:9380/v1/model/transfer # zk router -zk.url=zookeeper://localhost:2181?backup=localhost:2182,localhost:2183 +zk.url=localhost:2181,localhost:2182,localhost:2183 useRegister=false useZkRouter=false # zk acl