Skip to content

Commit

Permalink
Merge branch 'v0.9.1' of github.com:zilliztech/milvus-docs into v0.9.1
Browse files Browse the repository at this point in the history
  • Loading branch information
nameczz committed Jun 5, 2020
2 parents 111842d + f4268bb commit df781e7
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 27 deletions.
10 changes: 2 additions & 8 deletions site/en/guides/get_started/install_milvus/cpu_milvus_docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ $ docker pull milvusdb/milvus:0.9.1-cpu-d052920-e04ed5
#### Step 3 Download configuration files

```shell
# Create Milvus file
$ mkdir -p /home/$USER/milvus/conf
$ cd /home/$USER/milvus/conf
$ wget https://raw.githubusercontent.com/milvus-io/milvus/v0.9.1/core/conf/demo/server_config.yaml
Expand All @@ -71,7 +70,6 @@ $ wget https://raw.githubusercontent.com/milvus-io/milvus/v0.9.1/core/conf/demo/
#### Step 4 Start Docker container

```shell
# Start Milvus
$ docker run -d --name milvus_cpu_0.9.1 \
-p 19530:19530 \
-p 19121:19121 \
Expand All @@ -93,16 +91,15 @@ The `docker run` options used in the above command are defined as follows:
Finally confirm Milvus running status by the following command:

```shell
# Confirm Milvus status
$ docker ps
```

If Milvus server is not successfully started, you can check the error logs by the following command.

```shell
# Get id of the container running Milvus
# Get the ID of the container running Milvus.
$ docker ps -a
# Check docker logs
# Check docker logs.
$ docker logs <milvus container id>
```

Expand All @@ -115,7 +112,6 @@ For Step 3, instead of using `wget` to obtain the files, it is suggested to crea
For Step 4, start the docker by mapping Milvus files to the right path. The following command is run in Windows Command shell:

```shell
# Start Milvus
$ docker run -d --name milvus_cpu_0.9.1 \
-p 19530:19530 \
-p 19121:19121 \
Expand All @@ -133,7 +129,6 @@ The procedures of installing Milvus on Windows are similar to the steps on Ubunt
For Step 3, the path has some minor differences:

```shell
# Create Milvus file
$ mkdir -p /Users/$USER/milvus/conf
$ cd /Users/$USER/milvus/conf
$ wget https://raw.githubusercontent.com/milvus-io/milvus/v0.9.1/core/conf/demo/server_config.yaml
Expand All @@ -142,7 +137,6 @@ $ wget https://raw.githubusercontent.com/milvus-io/milvus/v0.9.1/core/conf/demo/
For Step 4, start the docker by mapping Milvus files to the right path:

```shell
# Start Milvus
$ docker run -d --name milvus_cpu_0.9.1 \
-p 19530:19530 \
-p 19121:19121 \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ $ docker pull milvusdb/milvus:0.9.1-gpu-d052920-e04ed5
## Step 3 Download configuration files

```shell
# Create Milvus file
$ mkdir -p /home/$USER/milvus/conf
$ cd /home/$USER/milvus/conf
$ wget https://raw.githubusercontent.com/milvus-io/milvus/v0.9.1/core/conf/demo/server_config.yaml
Expand All @@ -70,7 +69,6 @@ $ wget https://raw.githubusercontent.com/milvus-io/milvus/v0.9.1/core/conf/demo/
Before starting the Docker container, you must set `enable` to `true` in `gpu_resource_config` section of `server_config.yaml`.

```shell
# Start Milvus
$ docker run -d --name milvus_gpu_0.9.1 --gpus all \
-p 19530:19530 \
-p 19121:19121 \
Expand All @@ -92,16 +90,15 @@ The `docker run` options used in the above command are defined as follows:
Confirm Milvus running status by the following command:

```shell
# Confirm Milvus status
$ docker ps
```

If Milvus server is not successfully started, you can check the error logs by the following command.

```shell
# Get id of the container running Milvus
# Get the ID of the container running Milvus.
$ docker ps -a
# Check docker logs
# Check docker logs.
$ docker logs <milvus container id>
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ $ docker pull milvusdb/milvus:0.9.1-cpu-d052920-e04ed5
#### 第三步 下载配置文件

```shell
# Create Milvus file
$ mkdir -p /home/$USER/milvus/conf
$ cd /home/$USER/milvus/conf
$ wget https://raw.githubusercontent.com/milvus-io/milvus/v0.9.1/core/conf/demo/server_config.yaml
Expand All @@ -70,7 +69,6 @@ $ wget https://raw.githubusercontent.com/milvus-io/milvus/v0.9.1/core/conf/demo/
#### 第四步 启动 Milvus Docker 容器

```shell
# Start Milvus
$ docker run -d --name milvus_cpu_0.9.1 \
-p 19530:19530 \
-p 19121:19121 \
Expand All @@ -91,16 +89,15 @@ milvusdb/milvus:0.9.1-cpu-d052920-e04ed5
最后,确认 Milvus 运行状态:

```shell
# Confirm Milvus status
$ docker ps
```

如果 Milvus 服务没有正常启动,您可以执行以下命令查询错误日志。

```shell
# Get id of the container running Milvus
# 获得运行 Milvus 的 container ID。
$ docker ps -a
# Check docker logs
# 检查 docker 日志。
$ docker logs <milvus container id>
```

Expand All @@ -113,7 +110,6 @@ $ docker logs <milvus container id>
第四步,启动 Docker 容器,将 Milvus 文件映射到您本地的文件路径。下面的命令是在命令提示符中运行的:

```shell
# Start Milvus
$ docker run -d --name milvus_cpu_0.9.1 \
-p 19530:19530 \
-p 19121:19121 \
Expand All @@ -131,7 +127,6 @@ milvusdb/milvus:0.9.1-cpu-d052920-e04ed5
第三步,安装路径有细微差别:

```shell
# Create Milvus file
$ mkdir -p /Users/$USER/milvus/conf
$ cd /Users/$USER/milvus/conf
$ wget https://raw.githubusercontent.com/milvus-io/milvus/v0.9.1/core/conf/demo/server_config.yaml
Expand All @@ -140,7 +135,6 @@ $ wget https://raw.githubusercontent.com/milvus-io/milvus/v0.9.1/core/conf/demo/
第四步,启动 Docker 容器,将 Milvus 文件映射到您本地的文件路径:

```shell
# Start Milvus
$ docker run -d --name milvus_cpu_0.9.1 \
-p 19530:19530 \
-p 19121:19121 \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ $ docker pull milvusdb/milvus:0.9.1-gpu-d052920-e04ed5
您可以使用以下方法下载配置文件:

```shell
# Create Milvus file
$ mkdir -p /home/$USER/milvus/conf
$ cd /home/$USER/milvus/conf
$ wget https://raw.githubusercontent.com/milvus-io/milvus/v0.9.1/core/conf/demo/server_config.yaml
Expand All @@ -72,7 +71,6 @@ $ wget https://raw.githubusercontent.com/milvus-io/milvus/v0.9.1/core/conf/demo/
## 第四步 启动 Milvus Docker 容器

```shell
# Start Milvus
$ docker run -d --name milvus_gpu_0.9.1 --gpus all \
-p 19530:19530 \
-p 19121:19121 \
Expand All @@ -94,16 +92,15 @@ milvusdb/milvus:0.9.1-gpu-d052920-e04ed5
最后,确认 Milvus 运行状态:

```shell
# Confirm Milvus status
$ docker ps
```

如果 Milvus 服务没有正常启动,您可以执行以下命令查询错误日志。

```shell
# Get id of the container running Milvus
# 获得运行 Milvus 的 container ID。
$ docker ps -a
# Check docker logs
# 检查 docker 日志。
$ docker logs <milvus container id>
```

Expand Down
2 changes: 1 addition & 1 deletion site/zh-CN/reference/monitoring_metrics.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Milvus 面板提供系统和数据库设置的具体信息。通过监控以下
| 指标 | 说明 |
| ------------------------- | ------------------------------------------------------------ |
| **Insert per Second** | 每秒钟插入的向量数量(实时显示)。 |
| **Queries per Minute** | 每秒钟运行的查询数量(实时显示)。 |
| **Queries per Minute** | 每分钟运行的查询数量(实时显示)。 |
| **Query Time per Vector** | 单条向量查询时间 = 查询使用时间 / 向量数量 |
| **Query Service Level** | 查询服务级别 = 一定时间阈值内的查询数量/总查询数量 <br/>一般建议设置3个时间阈值来跟踪查询服务基本。 |
| **Uptime** | Milvus服务器正常运行的时长(分钟)。 |
Expand Down

0 comments on commit df781e7

Please sign in to comment.