Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Add cluster lock around data permissions updates (#66960)

John Swansone6f72603219e
diff --git a/.clj-kondo/config/modules/config.edn b/.clj-kondo/config/modules/config.edn
index 6884cdbff73..1f728d6971a 100644
--- a/.clj-kondo/config/modules/config.edn
+++ b/.clj-kondo/config/modules/config.edn
@@ -916,6 +916,7 @@
{:team "UX West"
:api #{metabase.permissions-rest.api}
:uses #{api
+ app-db
audit-app
events
permissions
diff --git a/src/metabase/permissions_rest/data_permissions/graph.clj b/src/metabase/permissions_rest/data_permissions/graph.clj
index b9450ba2d31..a9e82ac68d3 100644
--- a/src/metabase/permissions_rest/data_permissions/graph.clj
+++ b/src/metabase/permissions_rest/data_permissions/graph.clj
@@ -9,6 +9,7 @@
(:require
[clojure.string :as str]
[medley.core :as m]
+ [metabase.app-db.cluster-lock :as cluster-lock]
[metabase.audit-app.core :as audit]
[metabase.permissions-rest.schema :as permissions-rest.schema]
[metabase.permissions.core :as perms]
@@ -432,12 +433,13 @@
impersonations and sandboxes are consistent if necessary."
([graph-updates :- ::permissions-rest.schema/data-permissions-graph]
(when (seq graph-updates)
- (let [group-updates (:groups graph-updates)]
- (check-audit-db-permissions group-updates)
- (t2/with-transaction [_conn]
- (update-data-perms-graph!* group-updates)
- (delete-impersonations-if-needed-after-permissions-change! group-updates)
- (delete-gtaps-if-needed-after-permissions-change! group-updates)))))
+ (cluster-lock/with-cluster-lock ::update-data-perms-graph
+ (let [group-updates (:groups graph-updates)]
+ (check-audit-db-permissions group-updates)
+ (t2/with-transaction [_conn]
+ (update-data-perms-graph!* group-updates)
+ (delete-impersonations-if-needed-after-permissions-change! group-updates)
+ (delete-gtaps-if-needed-after-permissions-change! group-updates))))))
;; The following arity is provided soley for convenience for tests/REPL usage
([ks :- [:vector :any] new-value]