johanels/akvorado
1
0
Fork 0
mirror of https://github.com/akvorado/akvorado.git synced 2025-12-11 22:14:02 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

common/clickhousedb: turn into a complete component

Browse Source 
This enables us to mock it.
This commit is contained in:
Vincent Bernat
2022-04-12 15:15:37 +02:00
parent 270e54dea7
commit b44836aa97
17 changed files with 378 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
orchestrator/clickhouse/migrations.go
View File

@@ -4,7 +4,6 @@ import (
"context"
"fmt"
"net"
"strings"
"github.com/ClickHouse/clickhouse-go/v2"
@@ -23,25 +22,14 @@ type migrationStep struct {
// migrateDatabase execute database migration
func (c *Component) migrateDatabase() error {
if c.config.OrchestratorURL == "" {
baseURL, err := c.getHTTPBaseURL(c.config.Servers[0])
baseURL, err := c.getHTTPBaseURL("1.1.1.1:80")
if err != nil {
return err
}
c.config.OrchestratorURL = baseURL
}
l := c.r.With().
Str("server", strings.Join(c.config.Servers, ",")).
Str("database", c.config.Database).
Str("username", c.config.Username).
Logger()
ctx := c.t.Context(context.Background())
conn, err := c.config.Configuration.Open(ctx)
if err != nil {
l.Err(err).Msg("unable to connect to ClickHouse")
return fmt.Errorf("unable to connect to ClickHouse: %w", err)
}
ctx := c.t.Context(nil)
steps := []struct {
Description string
Step func(context.Context, reporter.Logger, clickhouse.Conn) migrationStep
@@ -59,10 +47,10 @@ func (c *Component) migrateDatabase() error {
total := 0
for _, step := range steps {
total++
l := l.With().Str("step", step.Description).Logger()
l := c.r.Logger.With().Str("step", step.Description).Logger()
l.Debug().Msg("checking migration step")
step := step.Step(ctx, l, conn)
rows, err := conn.Query(ctx, step.CheckQuery, step.Args...)
step := step.Step(ctx, l, c.d.ClickHouse)
rows, err := c.d.ClickHouse.Query(ctx, step.CheckQuery, step.Args...)
if err != nil {
l.Err(err).Msg("cannot execute check")
return fmt.Errorf("cannot execute check: %w", err)
@@ -90,9 +78,9 @@ func (c *Component) migrateDatabase() error {
}
if count == 0 {
l.Debug().Msg("no migration needed")
c.r.Debug().Msg("no migration needed")
} else {
l.Info().Msg("migrations done")
c.r.Info().Msg("migrations done")
}
close(c.migrationsDone)
c.metrics.migrationsRunning.Set(0)