milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#1531 remove S3 related config (#1534) 

Signed-off-by: yudong.cai <yudong.cai@zilliz.com>
pull/1543/head
Cai Yudong 2020-03-06 13:33:35 +08:00 committed by GitHub
parent df47fad78c
commit d28d1db907
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 1 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -59,6 +59,7 @@ Please mark all change in change log and use the issue from GitHub
- \#1302 Get all record IDs in a segment by given a segment id - \#1302 Get all record IDs in a segment by given a segment id
- \#1461 Add crud APIs and segments APIs into http module - \#1461 Add crud APIs and segments APIs into http module
- \#1463 Update config version to 0.2 - \#1463 Update config version to 0.2
- \#1531 Remove S3 related config
## Improvement ## Improvement
- \#738 Use Openblas / lapack from apt install - \#738 Use Openblas / lapack from apt install

18
core/conf/demo/server_config.yaml
View File

@ -64,27 +64,9 @@ db_config:
# secondary_path | A semicolon-separated list of secondary directories used | Path | | # secondary_path | A semicolon-separated list of secondary directories used | Path | |
# | to save vector data and index data. | | | # | to save vector data and index data. | | |
#----------------------+------------------------------------------------------------+------------+-----------------+ #----------------------+------------------------------------------------------------+------------+-----------------+
# s3_enable | Enable Simple Storage Service or not. | Boolean | false |
#----------------------+------------------------------------------------------------+------------+-----------------+
# s3_address | Simple Storage Service IP address. | IP | 127.0.0.1 |
#----------------------+------------------------------------------------------------+------------+-----------------+
# s3_port | Simple Storage Service port. Port range (1024, 65535) | Integer | 9000 |
#----------------------+------------------------------------------------------------+------------+-----------------+
# s3_access_key | Simple Storage Service access key. | String | minioadmin |
#----------------------+------------------------------------------------------------+------------+-----------------+
# s3_secret_key | Simple Storage Service secret key. | String | minioadmin |
#----------------------+------------------------------------------------------------+------------+-----------------+
# s3_bucket | Simple Storage Service bucket name. | String | milvus-bucket |
#----------------------+------------------------------------------------------------+------------+-----------------+
storage_config: storage_config:
primary_path: /var/lib/milvus primary_path: /var/lib/milvus
secondary_path: secondary_path:
s3_enable: false
s3_address: 127.0.0.1
s3_port: 9000
s3_access_key: minioadmin
s3_secret_key: minioadmin
s3_bucket: milvus-bucket
#----------------------+------------------------------------------------------------+------------+-----------------+ #----------------------+------------------------------------------------------------+------------+-----------------+
# Metric Config | Description | Type | Default | # Metric Config | Description | Type | Default |

18
core/conf/server_cpu_config.template
View File

@ -64,27 +64,9 @@ db_config:
# secondary_path | A semicolon-separated list of secondary directories used | Path | | # secondary_path | A semicolon-separated list of secondary directories used | Path | |
# | to save vector data and index data. | | | # | to save vector data and index data. | | |
#----------------------+------------------------------------------------------------+------------+-----------------+ #----------------------+------------------------------------------------------------+------------+-----------------+
# s3_enable | Enable Simple Storage Service or not. | Boolean | false |
#----------------------+------------------------------------------------------------+------------+-----------------+
# s3_address | Simple Storage Service IP address. | IP | 127.0.0.1 |
#----------------------+------------------------------------------------------------+------------+-----------------+
# s3_port | Simple Storage Service port. Port range (1024, 65535) | Integer | 9000 |
#----------------------+------------------------------------------------------------+------------+-----------------+
# s3_access_key | Simple Storage Service access key. | String | minioadmin |
#----------------------+------------------------------------------------------------+------------+-----------------+
# s3_secret_key | Simple Storage Service secret key. | String | minioadmin |
#----------------------+------------------------------------------------------------+------------+-----------------+
# s3_bucket | Simple Storage Service bucket name. | String | milvus-bucket |
#----------------------+------------------------------------------------------------+------------+-----------------+
storage_config: storage_config:
primary_path: @MILVUS_DB_PATH@ primary_path: @MILVUS_DB_PATH@
secondary_path: secondary_path:
s3_enable: false
s3_address: 127.0.0.1
s3_port: 9000
s3_access_key: minioadmin
s3_secret_key: minioadmin
s3_bucket: milvus-bucket
#----------------------+------------------------------------------------------------+------------+-----------------+ #----------------------+------------------------------------------------------------+------------+-----------------+
# Metric Config | Description | Type | Default | # Metric Config | Description | Type | Default |

18
core/conf/server_gpu_config.template
View File

@ -64,27 +64,9 @@ db_config:
# secondary_path | A semicolon-separated list of secondary directories used | Path | | # secondary_path | A semicolon-separated list of secondary directories used | Path | |
# | to save vector data and index data. | | | # | to save vector data and index data. | | |
#----------------------+------------------------------------------------------------+------------+-----------------+ #----------------------+------------------------------------------------------------+------------+-----------------+
# s3_enable | Enable Simple Storage Service or not. | Boolean | false |
#----------------------+------------------------------------------------------------+------------+-----------------+
# s3_address | Simple Storage Service IP address. | IP | 127.0.0.1 |
#----------------------+------------------------------------------------------------+------------+-----------------+
# s3_port | Simple Storage Service port. Port range (1024, 65535) | Integer | 9000 |
#----------------------+------------------------------------------------------------+------------+-----------------+
# s3_access_key | Simple Storage Service access key. | String | minioadmin |
#----------------------+------------------------------------------------------------+------------+-----------------+
# s3_secret_key | Simple Storage Service secret key. | String | minioadmin |
#----------------------+------------------------------------------------------------+------------+-----------------+
# s3_bucket | Simple Storage Service bucket name. | String | milvus-bucket |
#----------------------+------------------------------------------------------------+------------+-----------------+
storage_config: storage_config:
primary_path: @MILVUS_DB_PATH@ primary_path: @MILVUS_DB_PATH@
secondary_path: secondary_path:
s3_enable: false
s3_address: 127.0.0.1
s3_port: 9000
s3_access_key: minioadmin
s3_secret_key: minioadmin
s3_bucket: milvus-bucket
#----------------------+------------------------------------------------------------+------------+-----------------+ #----------------------+------------------------------------------------------------+------------+-----------------+
# Metric Config | Description | Type | Default | # Metric Config | Description | Type | Default |