fix: enable faster db recovery

internal/openstack_helm/barbican.go

@@ -0,0 +1,5 @@
+package openstack_helm
+
+type BarbicanConf struct {
+	Database *DatabaseConf `yaml:"database,omitempty"`
+}

internal/openstack_helm/cinder.go

@@ -0,0 +1,5 @@
+package openstack_helm
+
+type CinderConf struct {
+	Database *DatabaseConf `yaml:"database,omitempty"`
+}

internal/openstack_helm/database.go

@@ -0,0 +1,7 @@
+package openstack_helm
+
+type DatabaseConf struct {
+	ConnectionRecycleTime int `yaml:"connection_recycle_time,omitempty"`
+	MaxPoolSize           int `yaml:"max_pool_size,omitempty"`
+	MaxRetries            int `yaml:"max_retries,omitempty"`
+}

internal/openstack_helm/designate.go

@@ -0,0 +1,5 @@
+package openstack_helm
+
+type DesignateConf struct {
+	Database *DatabaseConf `yaml:"database,omitempty"`
+}

internal/openstack_helm/glance.go

@@ -0,0 +1,5 @@
+package openstack_helm
+
+type GlanceConf struct {
+	Database *DatabaseConf `yaml:"database,omitempty"`
+}

internal/openstack_helm/heat.go

@@ -0,0 +1,5 @@
+package openstack_helm
+
+type HeatConf struct {
+	Database *DatabaseConf `yaml:"database,omitempty"`
+}

internal/openstack_helm/keystone.go

@@ -0,0 +1,5 @@
+package openstack_helm
+
+type KeystoneConf struct {
+	Database *DatabaseConf `yaml:"database,omitempty"`
+}

internal/openstack_helm/magnum.go

@@ -0,0 +1,5 @@
+package openstack_helm
+
+type MagnumConf struct {
+	Database *DatabaseConf `yaml:"database,omitempty"`
+}

internal/openstack_helm/manila.go

@@ -0,0 +1,5 @@
+package openstack_helm
+
+type ManilaConf struct {
+	Database *DatabaseConf `yaml:"database,omitempty"`
+}

internal/openstack_helm/neutron.go

@@ -0,0 +1,5 @@
+package openstack_helm
+
+type NeutronConf struct {
+	Database *DatabaseConf `yaml:"database,omitempty"`
+}

internal/openstack_helm/nova.go

@@ -0,0 +1,5 @@
+package openstack_helm
+
+type NovaConf struct {
+	Database *DatabaseConf `yaml:"database,omitempty"`
+}

internal/openstack_helm/octavia.go

@@ -0,0 +1,5 @@
+package openstack_helm
+
+type OctaviaConf struct {
+	Database *DatabaseConf `yaml:"database,omitempty"`
+}

internal/openstack_helm/openstack_helm.go

@@ -0,0 +1,79 @@
+package openstack_helm
+
+import (
+	"gopkg.in/yaml.v2"
+	"helm.sh/helm/v3/pkg/chart/loader"
+	"helm.sh/helm/v3/pkg/chartutil"
+)
+
+type HelmValues struct {
+	Conf `yaml:"conf"`
+}
+
+type Conf struct {
+	Barbican  *BarbicanConf  `yaml:"barbican,omitempty"`
+	Cinder    *CinderConf    `yaml:"cinder,omitempty"`
+	Designate *DesignateConf `yaml:"designate,omitempty"`
+	Glance    *GlanceConf    `yaml:"glance,omitempty"`
+	Heat      *HeatConf      `yaml:"heat,omitempty"`
+	Keystone  *KeystoneConf  `yaml:"keystone,omitempty"`
+	Magnum    *MagnumConf    `yaml:"magnum,omitempty"`
+	Manila    *ManilaConf    `yaml:"manila,omitempty"`
+	Neutron   *NeutronConf   `yaml:"neutron,omitempty"`
+	Nova      *NovaConf      `yaml:"nova,omitempty"`
+	Octavia   *OctaviaConf   `yaml:"octavia,omitempty"`
+	Placement *PlacementConf `yaml:"placement,omitempty"`
+	Senlin    *SenlinConf    `yaml:"senlin,omitempty"`
+	Staffeln  *StaffelnConf  `yaml:"staffeln,omitempty"`
+}
+
+func (h *HelmValues) YAML() ([]byte, error) {
+	return yaml.Marshal(h)
+}
+
+func (h *HelmValues) NativeHelmValues() (chartutil.Values, error) {
+	yamlData, err := h.YAML()
+	if err != nil {
+		return nil, err
+	}
+
+	return chartutil.ReadValues(yamlData)
+}
+
+func FromYAML(yamlData []byte) (*HelmValues, error) {
+	var helmValues HelmValues
+	err := yaml.Unmarshal(yamlData, &helmValues)
+	if err != nil {
+		return nil, err
+	}
+
+	return &helmValues, nil
+}
+
+func FromYAMLString(yamlString string) (*HelmValues, error) {
+	return FromYAML([]byte(yamlString))
+}
+
+func CoalescedHelmValues(name string, values *HelmValues) (*HelmValues, error) {
+	chart, err := loader.Load(name)
+	if err != nil {
+		return nil, err
+	}
+
+	releaseValues, err := values.NativeHelmValues()
+	if err != nil {
+		return nil, err
+	}
+
+	mergedValues, err := chartutil.CoalesceValues(chart, releaseValues)
+	if err != nil {
+		return nil, err
+	}
+
+	yamlData, err := mergedValues.YAML()
+	if err != nil {
+		return nil, err
+	}
+
+	return FromYAMLString(yamlData)
+}

internal/openstack_helm/placement.go

@@ -0,0 +1,5 @@
+package openstack_helm
+
+type PlacementConf struct {
+	Database *DatabaseConf `yaml:"database,omitempty"`
+}

internal/openstack_helm/senlin.go

@@ -0,0 +1,10 @@
+package openstack_helm
+
+type SenlinConf struct {
+	API      SenlinAPIConf `yaml:"senlin_api"`
+	Database *DatabaseConf `yaml:"database,omitempty"`
+}
+
+type SenlinAPIConf struct {
+	Workers int32 `yaml:"workers"`
+}

internal/openstack_helm/staffeln.go

@@ -0,0 +1,5 @@
+package openstack_helm
+
+type StaffelnConf struct {
+	Database *DatabaseConf `yaml:"database,omitempty"`
+}

internal/testutils/oslo_db.go

@@ -0,0 +1,15 @@
+package testutils
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"github.com/vexxhost/atmosphere/internal/openstack_helm"
+)
+
+func TestDatabaseConf(t *testing.T, config *openstack_helm.DatabaseConf) {
+	assert.Equal(t, 10, config.ConnectionRecycleTime)
+	assert.Equal(t, 1, config.MaxPoolSize)
+	assert.Equal(t, -1, config.MaxRetries)
+}

roles/barbican/vars/main.yml

@@ -23,6 +23,9 @@ _barbican_helm_values:
     barbican:
       DEFAULT:
         log_config_append: null
+      database:
+        connection_recycle_time: 10
+        max_pool_size: 1
       oslo_messaging_notifications:
         driver: noop
       simple_crypto_plugin:

roles/barbican/vars_test.go

@@ -0,0 +1,39 @@
+package barbican
+
+import (
+	_ "embed"
+	"os"
+	"testing"
+
+	"github.com/goccy/go-yaml"
+	"github.com/stretchr/testify/require"
+
+	"github.com/vexxhost/atmosphere/internal/openstack_helm"
+	"github.com/vexxhost/atmosphere/internal/testutils"
+)
+
+var (
+	//go:embed vars/main.yml
+	varsFile []byte
+	vars     Vars
+)
+
+type Vars struct {
+	openstack_helm.HelmValues `yaml:"_barbican_helm_values"`
+}
+
+func TestMain(m *testing.M) {
+	t := &testing.T{}
+	err := yaml.UnmarshalWithOptions(varsFile, &vars)
+	require.NoError(t, err)
+
+	code := m.Run()
+	os.Exit(code)
+}
+
+func TestHelmValues(t *testing.T) {
+	vals, err := openstack_helm.CoalescedHelmValues("../../charts/barbican", &vars.HelmValues)
+	require.NoError(t, err)
+
+	testutils.TestDatabaseConf(t, vals.Conf.Barbican.Database)
+}

roles/cinder/vars/main.yml

@@ -36,6 +36,9 @@ __cinder_helm_values:
         barbican_endpoint_type: internal
       cors:
         allowed_origins: "*"
+      database:
+        connection_recycle_time: 10
+        max_pool_size: 1
       oslo_messaging_notifications:
         driver: noop
   manifests:

roles/cinder/vars_test.go

@@ -0,0 +1,39 @@
+package cinder
+
+import (
+	_ "embed"
+	"os"
+	"testing"
+
+	"github.com/goccy/go-yaml"
+	"github.com/stretchr/testify/require"
+
+	"github.com/vexxhost/atmosphere/internal/openstack_helm"
+	"github.com/vexxhost/atmosphere/internal/testutils"
+)
+
+var (
+	//go:embed vars/main.yml
+	varsFile []byte
+	vars     Vars
+)
+
+type Vars struct {
+	openstack_helm.HelmValues `yaml:"__cinder_helm_values"`
+}
+
+func TestMain(m *testing.M) {
+	t := &testing.T{}
+	err := yaml.UnmarshalWithOptions(varsFile, &vars)
+	require.NoError(t, err)
+
+	code := m.Run()
+	os.Exit(code)
+}
+
+func TestHelmValues(t *testing.T) {
+	vals, err := openstack_helm.CoalescedHelmValues("../../charts/cinder", &vars.HelmValues)
+	require.NoError(t, err)
+
+	testutils.TestDatabaseConf(t, vals.Conf.Cinder.Database)
+}

roles/designate/vars/main.yml

@@ -18,6 +18,9 @@ _designate_helm_values:
     tags: "{{ atmosphere_images | vexxhost.atmosphere.openstack_helm_image_tags('designate') }}"
   conf:
     designate:
+      database:
+        connection_recycle_time: 10
+        max_pool_size: 1
       service:central:
         managed_resource_tenant_id: "{{ _designate_project_info.openstack_projects[0].id }}"
     pools: "{{ designate_pools | to_yaml }}"

roles/designate/vars_test.go

@@ -0,0 +1,39 @@
+package designate
+
+import (
+	_ "embed"
+	"os"
+	"testing"
+
+	"github.com/goccy/go-yaml"
+	"github.com/stretchr/testify/require"
+
+	"github.com/vexxhost/atmosphere/internal/openstack_helm"
+	"github.com/vexxhost/atmosphere/internal/testutils"
+)
+
+var (
+	//go:embed vars/main.yml
+	varsFile []byte
+	vars     Vars
+)
+
+type Vars struct {
+	openstack_helm.HelmValues `yaml:"_designate_helm_values"`
+}
+
+func TestMain(m *testing.M) {
+	t := &testing.T{}
+	err := yaml.UnmarshalWithOptions(varsFile, &vars)
+	require.NoError(t, err)
+
+	code := m.Run()
+	os.Exit(code)
+}
+
+func TestHelmValues(t *testing.T) {
+	vals, err := openstack_helm.CoalescedHelmValues("../../charts/designate", &vars.HelmValues)
+	require.NoError(t, err)
+
+	testutils.TestDatabaseConf(t, vals.Conf.Designate.Database)
+}

roles/glance/vars/main.yml

@@ -43,6 +43,9 @@ _glance_helm_values:
         workers: 8
       cors:
         allowed_origins: "*"
+      database:
+        connection_recycle_time: 10
+        max_pool_size: 1
       image_format:
         disk_formats: "qcow2,raw"
       oslo_messaging_notifications:

roles/glance/vars_test.go

@@ -0,0 +1,39 @@
+package glance
+
+import (
+	_ "embed"
+	"os"
+	"testing"
+
+	"github.com/goccy/go-yaml"
+	"github.com/stretchr/testify/require"
+
+	"github.com/vexxhost/atmosphere/internal/openstack_helm"
+	"github.com/vexxhost/atmosphere/internal/testutils"
+)
+
+var (
+	//go:embed vars/main.yml
+	varsFile []byte
+	vars     Vars
+)
+
+type Vars struct {
+	openstack_helm.HelmValues `yaml:"_glance_helm_values"`
+}
+
+func TestMain(m *testing.M) {
+	t := &testing.T{}
+	err := yaml.UnmarshalWithOptions(varsFile, &vars)
+	require.NoError(t, err)
+
+	code := m.Run()
+	os.Exit(code)
+}
+
+func TestHelmValues(t *testing.T) {
+	vals, err := openstack_helm.CoalescedHelmValues("../../charts/glance", &vars.HelmValues)
+	require.NoError(t, err)
+
+	testutils.TestDatabaseConf(t, vals.Conf.Glance.Database)
+}