diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac63295b399a90f1c85797c1a00e198b91d05a0d..20d53de145ab22d47bc71a26a573aba5178e7b18 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 cb9a1a81c5db2256035dc87a3afb823ee9d8ce99..5d515877eb224a956e4a0f5fa5006000f59661d8 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 64817699fb3753065b7ab6ed2f23b83992268ffb..ad4705e841681282930dee4f35016ce62c8588bb 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 fdec24c8c7219b4d5cbec4ee71f25acd2122f6b1..cbb4c330dc7617b03dd8e3589bdc9905c7c123d8 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 08369f3a1018833e5cb9aab334df7d33bd7acf53..fa298ccff0c6f3ef25d0ba29116af94cde1d4c07 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 c8116e8b4f514783b18faedcfd92090e2c32ff1f..c2c334a8648ea41b48d478d4eb763544b3736305 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 38c81138f0a9ad9ad8a0532f2b7d7306b76ac8d0..27bf76830181353b171618465481111235ec299e 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 98484854c70d403b864021f7b0560533b3e834fd..3777331566ca40530ba454c311f19b06b655e96b 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 6d1313331fd371305530c9201068369d25191941..95cb9006b37b0a361cca094da4daa8d1f5e31312 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 8ab5705e594aa27a2a2832d4fbb4885072b5aed7..3e4cba2b4803bf86485f83ff48474c0a091451d9 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 8fc8a381596d93cce27d48318d1fd4621fc9d0b4..05157d771d85636199f1960097cbf45a49e18225 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