session: fix a performance regression (#6008)

firing lots of spurious events was leading to some problems Signed-off-by: Nick Santos <[email protected]> Signed-off-by: Nick Santos <[email protected]>
tilt-dev · Jan 9, 2023 · 72e0e98 · 72e0e98
1 parent 8d4e1b4
commit 72e0e98
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 21 deletions.
diff --git a/internal/controllers/core/session/reconciler.go b/internal/controllers/core/session/reconciler.go
@@ -63,7 +63,6 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 		return ctrl.Result{}, nil
 	}
 
-	r.st.Dispatch(sessions.NewSessionUpsertAction(session))
 	return r.maybeUpdateObjectStatus(ctx, session)
 }
 
@@ -88,7 +87,7 @@ func (r *Reconciler) maybeUpdateObjectStatus(ctx context.Context, session *v1alp
 	if err != nil {
 		return ctrl.Result{}, err
 	}
-	r.st.Dispatch(sessions.NewSessionUpsertAction(update))
+	r.st.Dispatch(sessions.NewSessionStatusUpdateAction(update))
 	return result, nil
 }
 

diff --git a/internal/engine/upper.go b/internal/engine/upper.go
@@ -160,8 +160,8 @@ func upperReducerFn(ctx context.Context, state *store.EngineState, action store.
 		handlePanicAction(state, action)
 	case store.LogAction:
 		handleLogAction(state, action)
-	case sessions.SessionUpsertAction:
-		sessions.HandleSessionUpsertAction(state, action)
+	case sessions.SessionStatusUpdateAction:
+		sessions.HandleSessionStatusUpdateAction(state, action)
 	case prompt.SwitchTerminalModeAction:
 		handleSwitchTerminalModeAction(state, action)
 	case server.OverrideTriggerModeAction:

diff --git a/internal/store/sessions/actions.go b/internal/store/sessions/actions.go
@@ -3,29 +3,21 @@ package sessions
 import (
 	"errors"
 
-	"k8s.io/apimachinery/pkg/types"
-
 	"github.com/tilt-dev/tilt/internal/store"
 	"github.com/tilt-dev/tilt/pkg/apis/core/v1alpha1"
 )
 
-type SessionUpsertAction struct {
+type SessionStatusUpdateAction struct {
 	Object *v1alpha1.Session
 }
 
-func (SessionUpsertAction) Action() {}
-
-var _ store.Summarizer = SessionUpsertAction{}
-
-func (a SessionUpsertAction) Summarize(summary *store.ChangeSummary) {
-	summary.Sessions.Add(types.NamespacedName{Namespace: a.Object.ObjectMeta.Namespace, Name: a.Object.ObjectMeta.Name})
-}
+func (SessionStatusUpdateAction) Action() {}
 
-func NewSessionUpsertAction(session *v1alpha1.Session) SessionUpsertAction {
-	return SessionUpsertAction{Object: session}
+func NewSessionStatusUpdateAction(session *v1alpha1.Session) SessionStatusUpdateAction {
+	return SessionStatusUpdateAction{Object: session}
 }
 
-func HandleSessionUpsertAction(state *store.EngineState, action SessionUpsertAction) {
+func HandleSessionStatusUpdateAction(state *store.EngineState, action SessionStatusUpdateAction) {
 	status := action.Object.Status
 	if status.Done {
 		state.ExitSignal = true

diff --git a/internal/store/summary.go b/internal/store/summary.go
@@ -57,9 +57,6 @@ type ChangeSummary struct {
 	// Cmds with their specs changed.
 	CmdSpecs ChangeSet
 
-	// Sessions that have changed.
-	Sessions ChangeSet
-
 	UISessions  ChangeSet
 	UIResources ChangeSet
 	UIButtons   ChangeSet
@@ -79,7 +76,6 @@ func (s *ChangeSummary) Add(other ChangeSummary) {
 	s.Legacy = s.Legacy || other.Legacy
 	s.Log = s.Log || other.Log
 	s.CmdSpecs.AddAll(other.CmdSpecs)
-	s.Sessions.AddAll(other.Sessions)
 	s.UISessions.AddAll(other.UISessions)
 	s.UIResources.AddAll(other.UIResources)
 	s.Clusters.AddAll(other.Clusters)