[skip ci] Upgrade mishards for v0.9.0 (#2358) (#2359)

Signed-off-by: yhz <[email protected]>
milvus-io · May 15, 2020 · ab4bc07 · ab4bc07
1 parent 2056ffe
commit ab4bc07
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 42 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -67,6 +67,7 @@ Please mark all change in change log and use the issue from GitHub
 -   \#2311 Update mishards methods 
 -   \#2330 Change url for behavior 'get_entities_by_id'
 -   \#2347 Update http document for v0.9.0
+-   \#2358 Upgrade mishards for v0.9.0 
 
 ## 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:/opt/milvus/db milvusdb/milvus:0.8.0-gpu-d041520-464400
+   $ 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
    ```
 
 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:/opt/milvus/db milvusdb/milvus:0.8.0-gpu-d041520-464400
+   $ 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
    ```
 
 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.8.0-gpu-d041520-464400
+        image: milvusdb/milvus:0.9.0-gpu-d051520-cb92b1
         ports:
             - "0.0.0.0:19540:19530"
         volumes:
@@ -13,7 +13,7 @@ services:
     milvus_ro:
         runtime: nvidia
         restart: always
-        image: milvusdb/milvus:0.8.0-gpu-d041520-464400
+        image: milvusdb/milvus:0.9.0-gpu-d051520-cb92b1
         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
@@ -206,14 +206,12 @@ wal_config:
 #----------------------+------------------------------------------------------------+------------+-----------------+
 # fatal.enable         | Whether to enable fatal level logging in Milvus.           | Boolean    | true            |
 #----------------------+------------------------------------------------------------+------------+-----------------+
-# path                 | Location of logs files.                                    | String     |                 |
+# path                 | Absolute path to the folder holding the log files.         | String     |                 |
 #----------------------+------------------------------------------------------------+------------+-----------------+
-# max_log_file_size    | Max size of a single log file. After exceeding this value, | Integer    | 256 (MB)        |
-#                      | rename this file to xxx.log.n, means the nth file.         |            |                 |
+# max_log_file_size    | The maximum size of each log file, size range [512, 4096]  | Integer    | 1024 (MB)       |
 #----------------------+------------------------------------------------------------+------------+-----------------+
-# delete_exceeds       | Milvus will keep up to ${delete_exceeds} log files per     | Integer    | 10              |
-#                      | level. For example, after xxx.log.11 file is generated,    |            |                 |
-#                      | the xxx.log.1 file will be deleted.                        |            |                 |
+# log_rotate_num       | The maximum number of log files that Milvus keeps for each | Integer    | 0               |
+#                      | logging level, num range [0, 1024], 0 means unlimited.     |            |                 |
 #----------------------+------------------------------------------------------------+------------+-----------------+
 logs:
   trace.enable: true
@@ -223,6 +221,6 @@ logs:
   error.enable: true
   fatal.enable: true
   path: /var/lib/milvus/logs
-  max_log_file_size: 256
-  delete_exceeds: 10
+  max_log_file_size: 1024
+  log_rotate_num: 0
 
diff --git a/shards/all_in_one/wr_server.yml b/shards/all_in_one/wr_server.yml
@@ -206,14 +206,12 @@ wal_config:
 #----------------------+------------------------------------------------------------+------------+-----------------+
 # fatal.enable         | Whether to enable fatal level logging in Milvus.           | Boolean    | true            |
 #----------------------+------------------------------------------------------------+------------+-----------------+
-# path                 | Location of logs files.                                    | String     |                 |
+# path                 | Absolute path to the folder holding the log files.         | String     |                 |
 #----------------------+------------------------------------------------------------+------------+-----------------+
-# max_log_file_size    | Max size of a single log file. After exceeding this value, | Integer    | 256 (MB)        |
-#                      | rename this file to xxx.log.n, means the nth file.         |            |                 |
+# max_log_file_size    | The maximum size of each log file, size range [512, 4096]  | Integer    | 1024 (MB)       |
 #----------------------+------------------------------------------------------------+------------+-----------------+
-# delete_exceeds       | Milvus will keep up to ${delete_exceeds} log files per     | Integer    | 10              |
-#                      | level. For example, after xxx.log.11 file is generated,    |            |                 |
-#                      | the xxx.log.1 file will be deleted.                        |            |                 |
+# log_rotate_num       | The maximum number of log files that Milvus keeps for each | Integer    | 0               |
+#                      | logging level, num range [0, 1024], 0 means unlimited.     |            |                 |
 #----------------------+------------------------------------------------------------+------------+-----------------+
 logs:
   trace.enable: true
@@ -223,6 +221,7 @@ logs:
   error.enable: true
   fatal.enable: true
   path: /var/lib/milvus/logs
-  max_log_file_size: 256
-  delete_exceeds: 10
+  max_log_file_size: 1024
+  log_rotate_num: 0
+
 
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.8.0-gpu-d041520-464400
+        image: milvusdb/milvus:0.9.0-gpu-d051520-cb92b1
         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.8.0-gpu-d041520-464400
+        image: milvusdb/milvus:0.9.0-gpu-d051520-cb92b1
         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
@@ -206,14 +206,12 @@ wal_config:
 #----------------------+------------------------------------------------------------+------------+-----------------+
 # fatal.enable         | Whether to enable fatal level logging in Milvus.           | Boolean    | true            |
 #----------------------+------------------------------------------------------------+------------+-----------------+
-# path                 | Location of logs files.                                    | String     |                 |
+# path                 | Absolute path to the folder holding the log files.         | String     |                 |
 #----------------------+------------------------------------------------------------+------------+-----------------+
-# max_log_file_size    | Max size of a single log file. After exceeding this value, | Integer    | 256 (MB)        |
-#                      | rename this file to xxx.log.n, means the nth file.         |            |                 |
+# max_log_file_size    | The maximum size of each log file, size range [512, 4096]  | Integer    | 1024 (MB)       |
 #----------------------+------------------------------------------------------------+------------+-----------------+
-# delete_exceeds       | Milvus will keep up to ${delete_exceeds} log files per     | Integer    | 10              |
-#                      | level. For example, after xxx.log.11 file is generated,    |            |                 |
-#                      | the xxx.log.1 file will be deleted.                        |            |                 |
+# log_rotate_num       | The maximum number of log files that Milvus keeps for each | Integer    | 0               |
+#                      | logging level, num range [0, 1024], 0 means unlimited.     |            |                 |
 #----------------------+------------------------------------------------------------+------------+-----------------+
 logs:
   trace.enable: true
@@ -223,6 +221,7 @@ logs:
   error.enable: true
   fatal.enable: true
   path: /var/lib/milvus/logs
-  max_log_file_size: 256
-  delete_exceeds: 10
+  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
@@ -206,14 +206,12 @@ wal_config:
 #----------------------+------------------------------------------------------------+------------+-----------------+
 # fatal.enable         | Whether to enable fatal level logging in Milvus.           | Boolean    | true            |
 #----------------------+------------------------------------------------------------+------------+-----------------+
-# path                 | Location of logs files.                                    | String     |                 |
+# path                 | Absolute path to the folder holding the log files.         | String     |                 |
 #----------------------+------------------------------------------------------------+------------+-----------------+
-# max_log_file_size    | Max size of a single log file. After exceeding this value, | Integer    | 256 (MB)        |
-#                      | rename this file to xxx.log.n, means the nth file.         |            |                 |
+# max_log_file_size    | The maximum size of each log file, size range [512, 4096]  | Integer    | 1024 (MB)       |
 #----------------------+------------------------------------------------------------+------------+-----------------+
-# delete_exceeds       | Milvus will keep up to ${delete_exceeds} log files per     | Integer    | 10              |
-#                      | level. For example, after xxx.log.11 file is generated,    |            |                 |
-#                      | the xxx.log.1 file will be deleted.                        |            |                 |
+# log_rotate_num       | The maximum number of log files that Milvus keeps for each | Integer    | 0               |
+#                      | logging level, num range [0, 1024], 0 means unlimited.     |            |                 |
 #----------------------+------------------------------------------------------------+------------+-----------------+
 logs:
   trace.enable: true
@@ -223,6 +221,5 @@ logs:
   error.enable: true
   fatal.enable: true
   path: /var/lib/milvus/logs
-  max_log_file_size: 256
-  delete_exceeds: 10
-
+  max_log_file_size: 1024
+  log_rotate_num: 0
diff --git a/shards/mishards/service_handler.py b/shards/mishards/service_handler.py
@@ -282,7 +282,7 @@ def CreateIndex(self, request, context):
                                  reason=_status.message)
 
     def _add_vectors(self, param, metadata=None):
-        return self.router.connection(metadata=metadata).add_vectors(
+        return self.router.connection(metadata=metadata).insert(
             None, None, insert_param=param)
 
     @mark_grpc_method

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.10
-pymilvus-test==0.3.15
+#pymilvus==0.2.11
+pymilvus-test==0.3.17
 pyparsing==2.4.0
 pytest==4.6.3
 pytest-level==0.1.1