Skip to content

Add max_retries and retry_interval to [(api_)database] conf #1129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
melwitt wants to merge 1 commit into
base: main
Choose a base branch
from
+21 −17
Open

Add max_retries and retry_interval to [(api_)database] conf #1129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions templates/nova/nova.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,12 +241,16 @@ cpu_power_management=false

{{if (index . "cell_db_address")}}
[database]
max_retries = 30
retry_interval = 1
connection = mysql+pymysql://{{ .cell_db_user }}:{{ .cell_db_password}}@{{ .cell_db_address }}/{{ .cell_db_name }}?read_default_file=/etc/my.cnf
{{end}}


{{if (index . "api_db_address")}}
[api_database]
max_retries = 30
retry_interval = 1
connection = mysql+pymysql://{{ .api_db_user }}:{{ .api_db_password }}@{{ .api_db_address }}/{{ .api_db_name }}?read_default_file=/etc/my.cnf
{{end}}

Expand Down
18 changes: 9 additions & 9 deletions test/functional/nova/multicell_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ var _ = Describe("Nova multi cell", func() {
Expect(configData).To(
ContainSubstring(
fmt.Sprintf(
"[database]\nconnection = mysql+pymysql://%s:%s@hostname-for-%s.%s.svc/nova_cell0?read_default_file=/etc/my.cnf",
"[database]\nmax_retries = 30\nretry_interval = 1\nconnection = mysql+pymysql://%s:%s@hostname-for-%s.%s.svc/nova_cell0?read_default_file=/etc/my.cnf",
cell0Account.Spec.UserName, cell0Secret.Data[mariadbv1.DatabasePasswordSelector],
cell0.MariaDBDatabaseName.Name, novaNames.Namespace)),
)
Expand All @@ -167,7 +167,7 @@ var _ = Describe("Nova multi cell", func() {
Expect(configData).To(
ContainSubstring(
fmt.Sprintf(
"[api_database]\nconnection = mysql+pymysql://%s:%s@hostname-for-%s.%s.svc/nova_api?read_default_file=/etc/my.cnf",
"[api_database]\nmax_retries = 30\nretry_interval = 1\nconnection = mysql+pymysql://%s:%s@hostname-for-%s.%s.svc/nova_api?read_default_file=/etc/my.cnf",
apiAccount.Spec.UserName, apiSecret.Data[mariadbv1.DatabasePasswordSelector],
novaNames.APIMariaDBDatabaseName.Name, novaNames.Namespace)),
)
Expand Down Expand Up @@ -229,7 +229,7 @@ var _ = Describe("Nova multi cell", func() {
Expect(configData).To(
ContainSubstring(
fmt.Sprintf(
"[database]\nconnection = mysql+pymysql://%s:%s@hostname-for-%s.%s.svc/nova_cell0?read_default_file=/etc/my.cnf",
"[database]\nmax_retries = 30\nretry_interval = 1\nconnection = mysql+pymysql://%s:%s@hostname-for-%s.%s.svc/nova_cell0?read_default_file=/etc/my.cnf",
cell0Account.Spec.UserName, cell0Secret.Data[mariadbv1.DatabasePasswordSelector],
cell0.MariaDBDatabaseName.Name, novaNames.Namespace)),
)
Expand All @@ -240,7 +240,7 @@ var _ = Describe("Nova multi cell", func() {
Expect(configData).To(
ContainSubstring(
fmt.Sprintf(
"[api_database]\nconnection = mysql+pymysql://%s:%s@hostname-for-%s.%s.svc/nova_api?read_default_file=/etc/my.cnf",
"[api_database]\nmax_retries = 30\nretry_interval = 1\nconnection = mysql+pymysql://%s:%s@hostname-for-%s.%s.svc/nova_api?read_default_file=/etc/my.cnf",
apiAccount.Spec.UserName, apiSecret.Data[mariadbv1.DatabasePasswordSelector],
novaNames.APIMariaDBDatabaseName.Name, novaNames.Namespace)),
)
Expand Down Expand Up @@ -354,7 +354,7 @@ var _ = Describe("Nova multi cell", func() {
Expect(configData).To(
ContainSubstring(
fmt.Sprintf(
"[database]\nconnection = mysql+pymysql://%s:%s@hostname-for-%s.%s.svc/nova_cell1?read_default_file=/etc/my.cnf",
"[database]\nmax_retries = 30\nretry_interval = 1\nconnection = mysql+pymysql://%s:%s@hostname-for-%s.%s.svc/nova_cell1?read_default_file=/etc/my.cnf",
cell1Account.Spec.UserName, cell1Secret.Data[mariadbv1.DatabasePasswordSelector],
cell1.MariaDBDatabaseName.Name, novaNames.Namespace)),
)
Expand All @@ -365,7 +365,7 @@ var _ = Describe("Nova multi cell", func() {
Expect(configData).To(
ContainSubstring(
fmt.Sprintf(
"[api_database]\nconnection = mysql+pymysql://%s:%s@hostname-for-%s.%s.svc/nova_api?read_default_file=/etc/my.cnf",
"[api_database]\nmax_retries = 30\nretry_interval = 1\nconnection = mysql+pymysql://%s:%s@hostname-for-%s.%s.svc/nova_api?read_default_file=/etc/my.cnf",
apiAccount.Spec.UserName, apiSecret.Data[mariadbv1.DatabasePasswordSelector],
novaNames.APIMariaDBDatabaseName.Name, novaNames.Namespace)),
)
Expand Down Expand Up @@ -477,7 +477,7 @@ var _ = Describe("Nova multi cell", func() {
Expect(configData).To(
ContainSubstring(
fmt.Sprintf(
"[database]\nconnection = mysql+pymysql://%s:%s@hostname-for-%s.%s.svc/nova_cell2?read_default_file=/etc/my.cnf",
"[database]\nmax_retries = 30\nretry_interval = 1\nconnection = mysql+pymysql://%s:%s@hostname-for-%s.%s.svc/nova_cell2?read_default_file=/etc/my.cnf",
cell2Account.Spec.UserName, cell2Secret.Data[mariadbv1.DatabasePasswordSelector],
cell2.MariaDBDatabaseName.Name, novaNames.Namespace)),
)
Expand Down Expand Up @@ -512,7 +512,7 @@ var _ = Describe("Nova multi cell", func() {
Expect(configData).To(
ContainSubstring(
fmt.Sprintf(
"[database]\nconnection = mysql+pymysql://%s:%s@hostname-for-%s.%s.svc/nova_cell2?read_default_file=/etc/my.cnf",
"[database]\nmax_retries = 30\nretry_interval = 1\nconnection = mysql+pymysql://%s:%s@hostname-for-%s.%s.svc/nova_cell2?read_default_file=/etc/my.cnf",
cell2Account.Spec.UserName, cell2Secret.Data[mariadbv1.DatabasePasswordSelector],
cell2.MariaDBDatabaseName.Name, novaNames.Namespace)),
)
Expand All @@ -523,7 +523,7 @@ var _ = Describe("Nova multi cell", func() {
Expect(configData).To(
ContainSubstring(
fmt.Sprintf(
"[api_database]\nconnection = mysql+pymysql://%s:%s@hostname-for-%s.%s.svc/nova_api?read_default_file=/etc/my.cnf",
"[api_database]\nmax_retries = 30\nretry_interval = 1\nconnection = mysql+pymysql://%s:%s@hostname-for-%s.%s.svc/nova_api?read_default_file=/etc/my.cnf",
apiAccount.Spec.UserName, apiSecret.Data[mariadbv1.DatabasePasswordSelector],
novaNames.APIMariaDBDatabaseName.Name, novaNames.Namespace)),
)
Expand Down
16 changes: 8 additions & 8 deletions test/functional/nova/nova_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,7 @@ var _ = Describe("Nova controller", func() {
cell0Secret := th.GetSecret(types.NamespacedName{Name: cell0Account.Spec.Secret, Namespace: cell0.MariaDBAccountName.Namespace})

Expect(configData).To(
ContainSubstring(fmt.Sprintf("[database]\nconnection = mysql+pymysql://%s:%s@hostname-for-openstack.%s.svc/nova_cell0?read_default_file=/etc/my.cnf",
ContainSubstring(fmt.Sprintf("[database]\nmax_retries = 30\nretry_interval = 1\nconnection = mysql+pymysql://%s:%s@hostname-for-openstack.%s.svc/nova_cell0?read_default_file=/etc/my.cnf",
cell0Account.Spec.UserName, cell0Secret.Data[mariadbv1.DatabasePasswordSelector],
novaNames.Namespace)),
)
Expand All @@ -669,7 +669,7 @@ var _ = Describe("Nova controller", func() {
apiSecret := th.GetSecret(types.NamespacedName{Name: apiAccount.Spec.Secret, Namespace: novaNames.APIMariaDBDatabaseAccount.Namespace})

Expect(configData).To(
ContainSubstring(fmt.Sprintf("[api_database]\nconnection = mysql+pymysql://%s:%s@hostname-for-openstack.%s.svc/nova_api?read_default_file=/etc/my.cnf",
ContainSubstring(fmt.Sprintf("[api_database]\nmax_retries = 30\nretry_interval = 1\nconnection = mysql+pymysql://%s:%s@hostname-for-openstack.%s.svc/nova_api?read_default_file=/etc/my.cnf",
apiAccount.Spec.UserName, apiSecret.Data[mariadbv1.DatabasePasswordSelector], novaNames.Namespace)),
)
// NOTE(gibi): cell mapping for cell0 should not have transport_url
Expand Down Expand Up @@ -1044,7 +1044,7 @@ var _ = Describe("Nova controller", func() {
Expect(configData).To(
ContainSubstring(
fmt.Sprintf(
"[database]\nconnection = mysql+pymysql://%s:%s@hostname-for-%s.%s.svc/nova_cell0?read_default_file=/etc/my.cnf",
"[database]\nmax_retries = 30\nretry_interval = 1\nconnection = mysql+pymysql://%s:%s@hostname-for-%s.%s.svc/nova_cell0?read_default_file=/etc/my.cnf",
cell0Account.Spec.UserName, cell0Secret.Data[mariadbv1.DatabasePasswordSelector],
cell0.MariaDBDatabaseName.Name, novaNames.Namespace)),
)
Expand All @@ -1055,7 +1055,7 @@ var _ = Describe("Nova controller", func() {
Expect(configData).To(
ContainSubstring(
fmt.Sprintf(
"[api_database]\nconnection = mysql+pymysql://%s:%s@hostname-for-%s.%s.svc/nova_api?read_default_file=/etc/my.cnf",
"[api_database]\nmax_retries = 30\nretry_interval = 1\nconnection = mysql+pymysql://%s:%s@hostname-for-%s.%s.svc/nova_api?read_default_file=/etc/my.cnf",
apiAccount.Spec.UserName, apiSecret.Data[mariadbv1.DatabasePasswordSelector],
novaNames.APIMariaDBDatabaseName.Name, novaNames.Namespace)),
)
Expand All @@ -1072,14 +1072,14 @@ var _ = Describe("Nova controller", func() {
Expect(configData).To(
ContainSubstring(
fmt.Sprintf(
"[database]\nconnection = mysql+pymysql://%s:%s@hostname-for-%s.%s.svc/nova_cell0?read_default_file=/etc/my.cnf",
"[database]\nmax_retries = 30\nretry_interval = 1\nconnection = mysql+pymysql://%s:%s@hostname-for-%s.%s.svc/nova_cell0?read_default_file=/etc/my.cnf",
cell0Account.Spec.UserName, cell0Secret.Data[mariadbv1.DatabasePasswordSelector],
cell0.MariaDBDatabaseName.Name, novaNames.Namespace)),
)
Expect(configData).To(
ContainSubstring(
fmt.Sprintf(
"[api_database]\nconnection = mysql+pymysql://%s:%s@hostname-for-%s.%s.svc/nova_api?read_default_file=/etc/my.cnf",
"[api_database]\nmax_retries = 30\nretry_interval = 1\nconnection = mysql+pymysql://%s:%s@hostname-for-%s.%s.svc/nova_api?read_default_file=/etc/my.cnf",
apiAccount.Spec.UserName, apiSecret.Data[mariadbv1.DatabasePasswordSelector],
novaNames.APIMariaDBDatabaseName.Name, novaNames.Namespace)),
)
Expand All @@ -1091,14 +1091,14 @@ var _ = Describe("Nova controller", func() {
Expect(configData).To(
ContainSubstring(
fmt.Sprintf(
"[database]\nconnection = mysql+pymysql://%s:%s@hostname-for-%s.%s.svc/nova_cell0?read_default_file=/etc/my.cnf",
"[database]\nmax_retries = 30\nretry_interval = 1\nconnection = mysql+pymysql://%s:%s@hostname-for-%s.%s.svc/nova_cell0?read_default_file=/etc/my.cnf",
cell0Account.Spec.UserName, cell0Secret.Data[mariadbv1.DatabasePasswordSelector],
cell0.MariaDBDatabaseName.Name, novaNames.Namespace)),
)
Expect(configData).To(
ContainSubstring(
fmt.Sprintf(
"[api_database]\nconnection = mysql+pymysql://%s:%s@hostname-for-%s.%s.svc/nova_api?read_default_file=/etc/my.cnf",
"[api_database]\nmax_retries = 30\nretry_interval = 1\nconnection = mysql+pymysql://%s:%s@hostname-for-%s.%s.svc/nova_api?read_default_file=/etc/my.cnf",
apiAccount.Spec.UserName, apiSecret.Data[mariadbv1.DatabasePasswordSelector],
novaNames.APIMariaDBDatabaseName.Name, novaNames.Namespace)),
)
Expand Down