Mishards 091 (#2462)

BossZou · web-flow · commit 21b61c7c27f0 · 2020-05-29T14:10:21.000+08:00
* Upgrade mishards for milvus 0.9.1 (#2461) Signed-off-by: Yhz <yinghao.zou@zilliz.com> * [skip ci]add allowed server version 0.9.0 Signed-off-by: Yhz <yinghao.zou@zilliz.com>
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -12,7 +12,7 @@
     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
@@ -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
