From 21b61c7c27f0252044bb7f5eca4964490b71b1b3 Mon Sep 17 00:00:00 2001 From: BossZou <40255591+BossZou@users.noreply.github.com> Date: Fri, 29 May 2020 14:10:21 +0800 Subject: [PATCH] Mishards 091 (#2462) * Upgrade mishards for milvus 0.9.1 (#2461) Signed-off-by: Yhz * [skip ci]add allowed server version 0.9.0 Signed-off-by: Yhz --- CHANGELOG.md | 1 + shards/README.md | 2 +- shards/README_CN.md | 2 +- shards/all_in_one/all_in_one.yml | 4 ++-- shards/all_in_one/ro_server.yml | 4 ++-- shards/all_in_one/wr_server.yml | 4 ++-- shards/all_in_one_with_mysql/all_in_one.yml | 4 ++-- shards/all_in_one_with_mysql/ro_server.yml | 5 ++--- shards/all_in_one_with_mysql/wr_server.yml | 5 +++-- shards/mishards/settings.py | 2 +- shards/requirements.txt | 4 ++-- 11 files changed, 19 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ac63295b..20d53de1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ Please mark all change in change log and use the issue from GitHub - \#2353 Remove log_config from code and scripts - \#2370 Clean compile warning - \#2410 Logging build index progress +- \#2461 Upgrade mishards for milvus 0.9.1 ## Task diff --git a/shards/README.md b/shards/README.md index cb9a1a81..5d515877 100644 --- a/shards/README.md +++ b/shards/README.md @@ -54,7 +54,7 @@ Follow below steps to start a standalone Milvus instance with Mishards from sour 3. Start Milvus server. ```shell - $ sudo nvidia-docker run --rm -d -p 19530:19530 -v /tmp/milvus/db:/var/lib/milvus/db milvusdb/milvus:0.9.0-gpu-d051520-cb92b1 + $ sudo nvidia-docker run --rm -d -p 19530:19530 -v /tmp/milvus/db:/var/lib/milvus/db milvusdb/milvus:0.9.1-gpu-d052920-e04ed5 ``` 4. Update path permissions. diff --git a/shards/README_CN.md b/shards/README_CN.md index 64817699..ad4705e8 100644 --- a/shards/README_CN.md +++ b/shards/README_CN.md @@ -48,7 +48,7 @@ Python 版本为3.6及以上。 3. 启动 Milvus 服务。 ```shell - $ sudo nvidia-docker run --rm -d -p 19530:19530 -v /tmp/milvus/db:/var/lib/milvus/db milvusdb/milvus:0.9.0-gpu-d051520-cb92b1 + $ sudo nvidia-docker run --rm -d -p 19530:19530 -v /tmp/milvus/db:/var/lib/milvus/db milvusdb/milvus:0.9.1-gpu-d052920-e04ed5 ``` 4. 更改目录权限。 diff --git a/shards/all_in_one/all_in_one.yml b/shards/all_in_one/all_in_one.yml index fdec24c8..cbb4c330 100644 --- a/shards/all_in_one/all_in_one.yml +++ b/shards/all_in_one/all_in_one.yml @@ -3,7 +3,7 @@ services: milvus_wr: runtime: nvidia restart: always - image: milvusdb/milvus:0.9.0-gpu-d051520-cb92b1 + image: milvusdb/milvus:0.9.1-gpu-d052920-e04ed5 ports: - "0.0.0.0:19540:19530" volumes: @@ -13,7 +13,7 @@ services: milvus_ro: runtime: nvidia restart: always - image: milvusdb/milvus:0.9.0-gpu-d051520-cb92b1 + image: milvusdb/milvus:0.9.1-gpu-d052920-e04ed5 ports: - "0.0.0.0:19541:19530" volumes: diff --git a/shards/all_in_one/ro_server.yml b/shards/all_in_one/ro_server.yml index 08369f3a..fa298ccf 100644 --- a/shards/all_in_one/ro_server.yml +++ b/shards/all_in_one/ro_server.yml @@ -68,8 +68,8 @@ db_config: # secondary_path | A semicolon-separated list of secondary directories used | Path | | # | to save vector data and index data. | | | #----------------------+------------------------------------------------------------+------------+-----------------+ -# file_cleanup_timeout | time gap between soft-delete and hard-delete | Integer | 10 (s) | -# | range [0, 3600] | | | +# file_cleanup_timeout | The time gap between marking a file as 'deleted' and | Integer | 10 (s) | +# | physically deleting this file from disk, range [0, 3600] | | | #----------------------+------------------------------------------------------------+------------+-----------------+ storage_config: primary_path: /var/lib/milvus diff --git a/shards/all_in_one/wr_server.yml b/shards/all_in_one/wr_server.yml index c8116e8b..c2c334a8 100644 --- a/shards/all_in_one/wr_server.yml +++ b/shards/all_in_one/wr_server.yml @@ -68,8 +68,8 @@ db_config: # secondary_path | A semicolon-separated list of secondary directories used | Path | | # | to save vector data and index data. | | | #----------------------+------------------------------------------------------------+------------+-----------------+ -# file_cleanup_timeout | time gap between soft-delete and hard-delete | Integer | 10 (s) | -# | range [0, 3600] | | | +# file_cleanup_timeout | The time gap between marking a file as 'deleted' and | Integer | 10 (s) | +# | physically deleting this file from disk, range [0, 3600] | | | #----------------------+------------------------------------------------------------+------------+-----------------+ storage_config: primary_path: /var/lib/milvus diff --git a/shards/all_in_one_with_mysql/all_in_one.yml b/shards/all_in_one_with_mysql/all_in_one.yml index 38c81138..27bf7683 100644 --- a/shards/all_in_one_with_mysql/all_in_one.yml +++ b/shards/all_in_one_with_mysql/all_in_one.yml @@ -18,7 +18,7 @@ services: milvus_wr: runtime: nvidia restart: always - image: milvusdb/milvus:0.9.0-gpu-d051520-cb92b1 + image: milvusdb/milvus:0.9.1-gpu-d052920-e04ed5 volumes: - /tmp/milvus/db:/var/lib/milvus/db - ./wr_server.yml:/var/lib/milvus/conf/server_config.yaml @@ -29,7 +29,7 @@ services: milvus_ro: runtime: nvidia restart: always - image: milvusdb/milvus:0.9.0-gpu-d051520-cb92b1 + image: milvusdb/milvus:0.9.1-gpu-d052920-e04ed5 volumes: - /tmp/milvus/db:/var/lib/milvus/db - ./ro_server.yml:/var/lib/milvus/conf/server_config.yaml diff --git a/shards/all_in_one_with_mysql/ro_server.yml b/shards/all_in_one_with_mysql/ro_server.yml index 98484854..37773315 100644 --- a/shards/all_in_one_with_mysql/ro_server.yml +++ b/shards/all_in_one_with_mysql/ro_server.yml @@ -68,8 +68,8 @@ db_config: # secondary_path | A semicolon-separated list of secondary directories used | Path | | # | to save vector data and index data. | | | #----------------------+------------------------------------------------------------+------------+-----------------+ -# file_cleanup_timeout | time gap between soft-delete and hard-delete | Integer | 10 (s) | -# | range [0, 3600] | | | +# file_cleanup_timeout | The time gap between marking a file as 'deleted' and | Integer | 10 (s) | +# | physically deleting this file from disk, range [0, 3600] | | | #----------------------+------------------------------------------------------------+------------+-----------------+ storage_config: primary_path: /var/lib/milvus @@ -224,4 +224,3 @@ logs: max_log_file_size: 1024 log_rotate_num: 0 - diff --git a/shards/all_in_one_with_mysql/wr_server.yml b/shards/all_in_one_with_mysql/wr_server.yml index 6d131333..95cb9006 100644 --- a/shards/all_in_one_with_mysql/wr_server.yml +++ b/shards/all_in_one_with_mysql/wr_server.yml @@ -68,8 +68,8 @@ db_config: # secondary_path | A semicolon-separated list of secondary directories used | Path | | # | to save vector data and index data. | | | #----------------------+------------------------------------------------------------+------------+-----------------+ -# file_cleanup_timeout | time gap between soft-delete and hard-delete | Integer | 10 (s) | -# | range [0, 3600] | | | +# file_cleanup_timeout | The time gap between marking a file as 'deleted' and | Integer | 10 (s) | +# | physically deleting this file from disk, range [0, 3600] | | | #----------------------+------------------------------------------------------------+------------+-----------------+ storage_config: primary_path: /var/lib/milvus @@ -223,3 +223,4 @@ logs: path: /var/lib/milvus/logs max_log_file_size: 1024 log_rotate_num: 0 + diff --git a/shards/mishards/settings.py b/shards/mishards/settings.py index 8ab5705e..3e4cba2b 100644 --- a/shards/mishards/settings.py +++ b/shards/mishards/settings.py @@ -12,7 +12,7 @@ else: env.read_env() -SERVER_VERSIONS = ['0.9.0'] +SERVER_VERSIONS = ['0.9.0', '0.9.1'] DEBUG = env.bool('DEBUG', False) MAX_RETRY = env.int('MAX_RETRY', 3) diff --git a/shards/requirements.txt b/shards/requirements.txt index 8fc8a381..05157d77 100644 --- a/shards/requirements.txt +++ b/shards/requirements.txt @@ -14,8 +14,8 @@ py==1.8.0 pyasn1==0.4.7 pyasn1-modules==0.2.6 pylint==2.5.0 -#pymilvus==0.2.11 -pymilvus-test==0.3.17 +pymilvus==0.2.12 +#pymilvus-test==0.3.17 pyparsing==2.4.0 pytest==4.6.3 pytest-level==0.1.1 -- GitLab