Skip to content

Commit 8e9a690

Browse files
committed
PMM-14324 Fix QAN schema migration params
1 parent 87ec23e commit 8e9a690

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

qan-api2/migrations/migrations.go

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ import (
1616

1717
const (
1818
metricsEngineSimple = "MergeTree"
19-
metricsEngineCluster = "ReplicatedMergeTree('/clickhouse/tables/{shard}/metrics', '{replica}')"
20-
schemaMigrationsEngineCluster = "ReplicatedMergeTree('/clickhouse/tables/{shard}/schema_migrations', '{replica}') ORDER BY version"
19+
metricsEngineCluster = "ReplicatedMergeTree"
20+
schemaMigrationsEngineCluster = "ReplicatedMergeTree"
2121
)
2222

2323
//go:embed sql/*.sql
2424
var migrationFS embed.FS
2525

2626
func IsClickhouseCluster(dsn string, clusterName string) (bool, error) {
27-
var args []interface{}
27+
var args []any
2828
sql := "SELECT sum(is_local = 0) AS remote_hosts FROM system.clusters"
2929
if clusterName != "" {
3030
sql = fmt.Sprintf("%s WHERE cluster = ?", sql)
@@ -68,13 +68,9 @@ func addClusterSchemaMigrationsParams(dsn string, clusterName string) (string, e
6868
logrus.Infof("Using ClickHouse cluster name: %s", clusterName)
6969
q.Set("x-cluster-name", clusterName)
7070
}
71+
q.Set("x-migrations-table-engine", schemaMigrationsEngineCluster)
7172

72-
encoded := q.Encode()
73-
if encoded != "" {
74-
u.RawQuery = encoded + "&x-migrations-table-engine=" + schemaMigrationsEngineCluster
75-
} else {
76-
u.RawQuery = "x-migrations-table-engine=" + schemaMigrationsEngineCluster
77-
}
73+
u.RawQuery = q.Encode()
7874
logrus.Debugf("ClickHouse cluster detected, setting schema_migrations table engine to: %s", schemaMigrationsEngineCluster)
7975

8076
return u.String(), nil

0 commit comments

Comments
 (0)