Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2025-02-16 20:01:35 +01:00
Code Issues Projects Releases Wiki Activity

fix(build): max idle and open conn settings for external db (#8854)

Browse Source 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
This commit is contained in:
He Weiwei 2019-08-29 15:04:10 +08:00 committed by GitHub
parent db5781bf78
commit e2a19d8ab9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
make/harbor.yml
View File

@ -107,6 +107,8 @@ _version: 1.9.0
# username: harbor_db_username # username: harbor_db_username
# password: harbor_db_password # password: harbor_db_password
# ssl_mode: disable # ssl_mode: disable
# max_idle_conns: 2
# max_open_conns: 0
# clair: # clair:
# host: clair_db_host # host: clair_db_host
# port: clair_db_port # port: clair_db_port

12
make/photon/prepare/utils/configs.py
View File

@ -2,6 +2,9 @@ import yaml
from g import versions_file_path from g import versions_file_path
from .misc import generate_random_string from .misc import generate_random_string
default_db_max_idle_conns = 2 # NOTE: https://golang.org/pkg/database/sql/#DB.SetMaxIdleConns
default_db_max_open_conns = 0 # NOTE: https://golang.org/pkg/database/sql/#DB.SetMaxOpenConns
def validate(conf, **kwargs): def validate(conf, **kwargs):
protocol = conf.get("protocol") protocol = conf.get("protocol")
if protocol != "https" and kwargs.get('notary_mode'): if protocol != "https" and kwargs.get('notary_mode'):
@ -112,11 +115,8 @@ def parse_yaml_config(config_file_path):
config_dict['harbor_db_username'] = 'postgres' config_dict['harbor_db_username'] = 'postgres'
config_dict['harbor_db_password'] = db_configs.get("password") or '' config_dict['harbor_db_password'] = db_configs.get("password") or ''
config_dict['harbor_db_sslmode'] = 'disable' config_dict['harbor_db_sslmode'] = 'disable'
config_dict['harbor_db_max_idle_conns'] = db_configs.get("max_idle_conns") or default_db_max_idle_conns
default_max_idle_conns = 2 # NOTE: https://golang.org/pkg/database/sql/#DB.SetMaxIdleConns config_dict['harbor_db_max_open_conns'] = db_configs.get("max_open_conns") or default_db_max_open_conns
default_max_open_conns = 0 # NOTE: https://golang.org/pkg/database/sql/#DB.SetMaxOpenConns
config_dict['harbor_db_max_idle_conns'] = db_configs.get("max_idle_conns") or default_max_idle_conns
config_dict['harbor_db_max_open_conns'] = db_configs.get("max_open_conns") or default_max_open_conns
# clari db # clari db
config_dict['clair_db_host'] = 'postgresql' config_dict['clair_db_host'] = 'postgresql'
config_dict['clair_db_port'] = 5432 config_dict['clair_db_port'] = 5432
@ -237,6 +237,8 @@ def parse_yaml_config(config_file_path):
config_dict['harbor_db_username'] = external_db_configs['harbor']['username'] config_dict['harbor_db_username'] = external_db_configs['harbor']['username']
config_dict['harbor_db_password'] = external_db_configs['harbor']['password'] config_dict['harbor_db_password'] = external_db_configs['harbor']['password']
config_dict['harbor_db_sslmode'] = external_db_configs['harbor']['ssl_mode'] config_dict['harbor_db_sslmode'] = external_db_configs['harbor']['ssl_mode']
config_dict['harbor_db_max_idle_conns'] = external_db_configs['harbor'].get("max_idle_conns") or default_db_max_idle_conns
config_dict['harbor_db_max_open_conns'] = external_db_configs['harbor'].get("max_open_conns") or default_db_max_open_conns
# clair db # clair db
config_dict['clair_db_host'] = external_db_configs['clair']['host'] config_dict['clair_db_host'] = external_db_configs['clair']['host']
config_dict['clair_db_port'] = external_db_configs['clair']['port'] config_dict['clair_db_port'] = external_db_configs['clair']['port']

2
tools/migration/cfg/migrator_1_9_0/harbor.yml.jinja
View File

@ -158,6 +158,8 @@ external_database:
username: {{ external_database.harbor.username }} username: {{ external_database.harbor.username }}
password: {{ external_database.harbor.password }} password: {{ external_database.harbor.password }}
ssl_mode: {{ external_database.harbor.ssl_mode }} ssl_mode: {{ external_database.harbor.ssl_mode }}
max_idle_conns: 2
max_open_conns: 0
clair: clair:
host: {{ external_database.clair.host }} host: {{ external_database.clair.host }}
port: {{ external_database.clair.port }} port: {{ external_database.clair.port }}