Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix(activity): isolate subscriber payloads to prevent concurrent writes (#4159)
Kyle Mendell9fc00866b910
diff --git a/backend/internal/activity/service.go b/backend/internal/activity/service.goindex c7ba2d340..ea8a5c83f 100644--- a/backend/internal/activity/service.go+++ b/backend/internal/activity/service.go@@ -1382,7 +1382,13 @@ func (s *ActivityService) publishInternal(environmentID string, event activitytys.subscribersMu.RUnlock()for _, sub := range subs {- sub.enqueue(event)+ // Source labeling mutates activity fields independently for each subscriber.+ subscriberEvent := event+ if event.Activity != nil {+ subscriberEvent.Activity = new(*event.Activity)+ }+ subscriberEvent.Activities = slices.Clone(event.Activities)+ sub.enqueue(subscriberEvent)}}diff --git a/backend/internal/activity/service_test.go b/backend/internal/activity/service_test.goindex b00a68752..4034bd0aa 100644--- a/backend/internal/activity/service_test.go+++ b/backend/internal/activity/service_test.go@@ -103,6 +103,8 @@ func TestActivityServiceStreamFanoutInternal(t *testing.T) {events, _, unsubscribe := service.Subscribe("0")defer unsubscribe()+ otherEvents, _, unsubscribeOther := service.Subscribe("0")+ defer unsubscribeOther()created, err := service.StartActivity(ctx, StartActivityRequest{EnvironmentID: "0",@@ -115,6 +117,9 @@ func TestActivityServiceStreamFanoutInternal(t *testing.T) {require.Equal(t, "activity", first.Type)require.Equal(t, created.ID, first.ActivityID)require.NotNil(t, first.Activity)+ other := receiveActivityEventInternal(t, otherEvents)+ require.Equal(t, first, other)+ require.NotSame(t, first.Activity, other.Activity)_, err = service.AppendMessage(ctx, created.ID, AppendActivityMessageRequest{Level: activitytypes.MessageLevelInfo,@@ -129,6 +134,10 @@ func TestActivityServiceStreamFanoutInternal(t *testing.T) {require.Equal(t, activitytypes.TypeProjectDeploy, messageEvent.ActivityType)require.NotNil(t, messageEvent.Message)require.Equal(t, "Deploying services", messageEvent.Message.Message)+ require.Nil(t, messageEvent.Activity)+ require.Nil(t, messageEvent.Activities)+ require.Equal(t, messageEvent, receiveActivityEventInternal(t, otherEvents))+}func TestActivityServiceRetentionCleanupInternal(t *testing.T) {