Skip to content

Agent Mesh

fix(storage, node): address PR review comments for database teardown, postgres locks, and event context

Antonio Ojea9e24c9a32fd9
diff --git a/internal/node/node.go b/internal/node/node.go
index ab4c4180..9ecd257a 100644
--- a/internal/node/node.go
+++ b/internal/node/node.go
@@ -1133,7 +1133,7 @@ func (n *SamNode) listenForHubEvents(ctx context.Context) {
case api.MeshEvent_POLICY_UPDATE:
logger.Infof("[Mesh Event] Received POLICY_UPDATE event from %s, triggering sync", msg.ReceivedFrom)
go func() {
- if err := n.syncMeshPolicy(context.Background()); err != nil {
+ if err := n.syncMeshPolicy(ctx); err != nil {
logger.Warnf("Failed to sync mesh policy after event: %v", err)
}
}()
diff --git a/internal/storage/sql_store.go b/internal/storage/sql_store.go
index e446e8a0..13ca82a1 100644
--- a/internal/storage/sql_store.go
+++ b/internal/storage/sql_store.go
@@ -267,16 +267,6 @@ var migrations = []migration{
}
func (s *SQLStore) initSchema() error {
- if s.isPostgres() {
- // Acquire an advisory lock to serialize migrations across concurrent replicas
- if _, err := s.db.Exec("SELECT pg_advisory_lock(7345892)"); err != nil {
- return fmt.Errorf("failed to acquire migration advisory lock: %w", err)
- }
- defer func() {
- _, _ = s.db.Exec("SELECT pg_advisory_unlock(7345892)")
- }()
- }
-
// Create schema_migrations table
createMigrationsTable := `CREATE TABLE IF NOT EXISTS schema_migrations (version INTEGER PRIMARY KEY)`
if _, err := s.db.Exec(createMigrationsTable); err != nil {
@@ -301,6 +291,12 @@ func (s *SQLStore) initSchema() error {
}
defer func() { _ = tx.Rollback() }()
+ if s.isPostgres() {
+ if _, err := tx.Exec("SELECT pg_advisory_xact_lock(7345892)"); err != nil {
+ return fmt.Errorf("failed to acquire migration advisory lock: %w", err)
+ }
+ }
+
queries := m.sqlite
if s.isPostgres() {
queries = m.postgres
@@ -601,6 +597,12 @@ func (s *SQLStore) SaveMeshPolicy(ctx context.Context, roles []*api.PolicyRole,
defer func() { _ = tx.Rollback() }()
// For simplicity in replacing policy, we clear all and insert new.
+ if _, err := tx.ExecContext(ctx, "DELETE FROM role_permissions"); err != nil {
+ return err
+ }
+ if _, err := tx.ExecContext(ctx, "DELETE FROM role_bindings"); err != nil {
+ return err
+ }
if _, err := tx.ExecContext(ctx, "DELETE FROM roles"); err != nil {
return err
}