Merge branch 'main' into vk/debug/nmap-both

client/internal/peer/worker_ice.go

@@ -411,7 +411,7 @@ func (w *WorkerICE) onConnectionStateChange(agent *icemaker.ThreadSafeAgent, dia
 
 func (w *WorkerICE) turnAgentDial(ctx context.Context, agent *icemaker.ThreadSafeAgent, remoteOfferAnswer *OfferAnswer) (*ice.Conn, error) {
 	if isController(w.config) {
-		return w.agent.Dial(ctx, remoteOfferAnswer.IceCredentials.UFrag, remoteOfferAnswer.IceCredentials.Pwd)
+		return agent.Dial(ctx, remoteOfferAnswer.IceCredentials.UFrag, remoteOfferAnswer.IceCredentials.Pwd)
 	} else {
 		return agent.Accept(ctx, remoteOfferAnswer.IceCredentials.UFrag, remoteOfferAnswer.IceCredentials.Pwd)
 	}

management/server/store/sql_store.go

@@ -2914,6 +2914,23 @@ func (s *SqlStore) ExecuteInTransaction(ctx context.Context, operation func(stor
 	if tx.Error != nil {
 		return tx.Error
 	}
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+			panic(r)
+		}
+	}()
+
+	if s.storeEngine == types.PostgresStoreEngine {
+		if err := tx.Exec("SET LOCAL statement_timeout = '1min'").Error; err != nil {
+			tx.Rollback()
+			return fmt.Errorf("failed to set statement timeout: %w", err)
+		}
+		if err := tx.Exec("SET LOCAL lock_timeout = '1min'").Error; err != nil {
+			tx.Rollback()
+			return fmt.Errorf("failed to set lock timeout: %w", err)
+		}
+	}
 
 	// For MySQL, disable FK checks within this transaction to avoid deadlocks
 	// This is session-scoped and doesn't require SUPER privileges