public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Spanner-related fixes (#102376)

Browse Source 
* Fix UNION syntax in resourcepermissions package.
* Fix migrations in usermig package to work with Spanner.
* Fix health query.
* Use more connections for integration tests.
* Add test-go-integration-spanner target to run integration tests against Spanner emulator.
* Add test for enterprise.
* Don't delete sequence number for migration_log.id column.

* Only bump max open connections to 20 for Spanner.
Lower integration test timeout.
This commit is contained in:
Peter Štibraný
2025-03-19 12:34:44 +01:00
committed by GitHub
parent 229f37edb0
commit 0c58d39e76
7 changed files with 50 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tests/testinfra/testinfra.go
+10 -2
View File
@@ -495,9 +495,17 @@ func CreateGrafDir(t *testing.T, opts GrafanaOpts) (string, string) {
require.NoError(t, err)
_, err = dbSection.NewKey("query_retries", fmt.Sprintf("%d", queryRetries))
require.NoError(t, err)
_, err = dbSection.NewKey("max_open_conn", "2")
if db.IsTestDBSpanner() {
_, err = dbSection.NewKey("max_open_conn", "20")
} else {
_, err = dbSection.NewKey("max_open_conn", "2")
}
require.NoError(t, err)
_, err = dbSection.NewKey("max_idle_conn", "2")
if db.IsTestDBSpanner() {
_, err = dbSection.NewKey("max_idle_conn", "20")
} else {
_, err = dbSection.NewKey("max_idle_conn", "2")
}
require.NoError(t, err)
cfgPath := filepath.Join(cfgDir, "test.ini")