From 7367cfc0a34a7cc7de2fec6adb33137e509b4997 Mon Sep 17 00:00:00 2001 From: Serge Zaitsev Date: Mon, 10 May 2021 17:54:13 +0200 Subject: [PATCH] Add isolation level db configuration parameter (#33830) * add isolation level db configuration parameter * add isolation_level to default.ini and sample.ini * add note that only mysql supports isolation levels for now * mention isolation_level in the documentation * Update docs/sources/administration/configuration.md Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com> Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com> --- conf/defaults.ini | 6 ++++++ conf/sample.ini | 6 ++++++ docs/sources/administration/configuration.md | 4 ++++ pkg/services/sqlstore/sqlstore.go | 6 ++++++ 4 files changed, 22 insertions(+) diff --git a/conf/defaults.ini b/conf/defaults.ini index d5c221c4957..6bd3ed06a09 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -105,6 +105,12 @@ log_queries = # For "mysql", use either "true", "false", or "skip-verify". ssl_mode = disable +# Database drivers may support different transaction isolation levels. +# Currently, only "mysql" driver supports isolation levels. +# If the value is empty - driver's default isolation level is applied. +# For "mysql" use "READ-UNCOMMITTED", "READ-COMMITTED", "REPEATABLE-READ" or "SERIALIZABLE". +isolation_level = + ca_cert_path = client_key_path = client_cert_path = diff --git a/conf/sample.ini b/conf/sample.ini index 7a1cec43997..50cbfc4f0f7 100644 --- a/conf/sample.ini +++ b/conf/sample.ini @@ -94,6 +94,12 @@ # For "postgres" only, either "disable", "require" or "verify-full" ;ssl_mode = disable +# Database drivers may support different transaction isolation levels. +# Currently, only "mysql" driver supports isolation levels. +# If the value is empty - driver's default isolation level is applied. +# For "mysql" use "READ-UNCOMMITTED", "READ-COMMITTED", "REPEATABLE-READ" or "SERIALIZABLE". +;isolation_level = + ;ca_cert_path = ;client_key_path = ;client_cert_path = diff --git a/docs/sources/administration/configuration.md b/docs/sources/administration/configuration.md index 704dedcef67..e8a808f4607 100644 --- a/docs/sources/administration/configuration.md +++ b/docs/sources/administration/configuration.md @@ -329,6 +329,10 @@ Set to `true` to log the sql calls and execution times. For Postgres, use either `disable`, `require` or `verify-full`. For MySQL, use either `true`, `false`, or `skip-verify`. +### isolation_level + +Only the MySQL driver supports isolation levels in Grafana. In case the value is empty, the driver's default isolation level is applied. Available options are "READ-UNCOMMITTED", "READ-COMMITTED", "REPEATABLE-READ" or "SERIALIZABLE". + ### ca_cert_path The path to the CA certificate to use. On many Linux systems, certs can be found in `/etc/ssl/certs`. diff --git a/pkg/services/sqlstore/sqlstore.go b/pkg/services/sqlstore/sqlstore.go index 57dac9fd86b..05ec397bf27 100644 --- a/pkg/services/sqlstore/sqlstore.go +++ b/pkg/services/sqlstore/sqlstore.go @@ -235,6 +235,10 @@ func (ss *SQLStore) buildConnectionString() (string, error) { cnnstr += "&tls=custom" } + if isolation := ss.dbCfg.IsolationLevel; isolation != "" { + cnnstr += "&tx_isolation=" + isolation + } + cnnstr += ss.buildExtraConnectionString('&') case migrator.Postgres: addr, err := util.SplitHostPortDefault(ss.dbCfg.Host, "127.0.0.1", "5432") @@ -384,6 +388,7 @@ func (ss *SQLStore) readConfig() error { ss.dbCfg.ClientCertPath = sec.Key("client_cert_path").String() ss.dbCfg.ServerCertName = sec.Key("server_cert_name").String() ss.dbCfg.Path = sec.Key("path").MustString("data/grafana.db") + ss.dbCfg.IsolationLevel = sec.Key("isolation_level").String() ss.dbCfg.CacheMode = sec.Key("cache_mode").MustString("private") ss.dbCfg.SkipMigrations = sec.Key("skip_migrations").MustBool() @@ -537,6 +542,7 @@ type DatabaseConfig struct { ClientCertPath string ServerCertName string ConnectionString string + IsolationLevel string MaxOpenConn int MaxIdleConn int ConnMaxLifetime int