From e2d775588f4c2dfa8f63e7d1fa9d6dc86ff36558 Mon Sep 17 00:00:00 2001
From: David Zhao <dz@livekit.io>
Date: Wed, 9 Nov 2022 23:47:41 -0800
Subject: [PATCH] Confirm room creation prior to returning from CreateRoom
 (#1157)

---
 pkg/service/roomservice.go | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkg/service/roomservice.go b/pkg/service/roomservice.go
index ce7539c66..9260cd195 100644
--- a/pkg/service/roomservice.go
+++ b/pkg/service/roomservice.go
@@ -72,6 +72,19 @@ func (s *RoomService) CreateRoom(ctx context.Context, req *livekit.CreateRoomReq
 	sink.Close()
 	source.Close()
 
+	// ensure it's created correctly
+	err = confirmExecution(func() error {
+		_, _, err := s.roomStore.LoadRoom(ctx, livekit.RoomName(req.Name), false)
+		if err != nil {
+			return ErrOperationFailed
+		} else {
+			return nil
+		}
+	})
+	if err != nil {
+		return nil, err
+	}
+
 	if req.Egress != nil && req.Egress.Room != nil {
 		egress := &livekit.StartEgressRequest{
 			Request: &livekit.StartEgressRequest_RoomComposite{