From 6c1d5e86997ab18ba6994b95aecf4e55c68ec50b Mon Sep 17 00:00:00 2001 From: Benjamin Pracht Date: Thu, 11 Jul 2024 17:50:30 -0700 Subject: [PATCH] Do not create room in UpdateRoomMetadata (#2854) --- pkg/service/roomservice.go | 35 ++--------------------------------- 1 file changed, 2 insertions(+), 33 deletions(-) diff --git a/pkg/service/roomservice.go b/pkg/service/roomservice.go index 233a82313..d7b7b9d7e 100644 --- a/pkg/service/roomservice.go +++ b/pkg/service/roomservice.go @@ -305,47 +305,16 @@ func (s *RoomService) UpdateRoomMetadata(ctx context.Context, req *livekit.Updat return nil, twirpAuthError(err) } - room, internal, err := s.roomStore.LoadRoom(ctx, livekit.RoomName(req.Room), false) + room, _, err := s.roomStore.LoadRoom(ctx, livekit.RoomName(req.Room), false) if err != nil { return nil, err } - // no one has joined the room, would not have been created on an RTC node. - // in this case, we'd want to run create again - room, created, err := s.roomAllocator.CreateRoom(ctx, &livekit.CreateRoomRequest{ - Name: req.Room, - Metadata: req.Metadata, - }) + room, err = s.roomClient.UpdateRoomMetadata(ctx, s.topicFormatter.RoomTopic(ctx, livekit.RoomName(req.Room)), req) if err != nil { return nil, err } - _, err = s.roomClient.UpdateRoomMetadata(ctx, s.topicFormatter.RoomTopic(ctx, livekit.RoomName(req.Room)), req) - if err != nil { - return nil, err - } - - err = s.confirmExecution(ctx, func() error { - room, _, err = s.roomStore.LoadRoom(ctx, livekit.RoomName(req.Room), false) - if err != nil { - return err - } - if room.Metadata != req.Metadata { - return ErrOperationFailed - } - return nil - }) - if err != nil { - return nil, err - } - - if created { - err = s.launchAgents(ctx, room, internal.AgentDispatches) - if err != nil { - return nil, err - } - } - return room, nil }