From 8250d69d7ce57926c2c11be35640579a372063f5 Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Fri, 4 Dec 2015 10:43:44 -0500 Subject: Fix possible race condition on when creating new channels --- store/sql_channel_store.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'store/sql_channel_store.go') diff --git a/store/sql_channel_store.go b/store/sql_channel_store.go index badaa4d13..2cbec705b 100644 --- a/store/sql_channel_store.go +++ b/store/sql_channel_store.go @@ -246,7 +246,8 @@ func (s SqlChannelStore) Get(id string) StoreChannel { go func() { result := StoreResult{} - if obj, err := s.GetReplica().Get(model.Channel{}, id); err != nil { + // reading from master due to expected race condition when creating channels + if obj, err := s.GetMaster().Get(model.Channel{}, id); err != nil { result.Err = model.NewAppError("SqlChannelStore.Get", "We encountered an error finding the channel", "id="+id+", "+err.Error()) } else if obj == nil { result.Err = model.NewAppError("SqlChannelStore.Get", "We couldn't find the existing channel", "id="+id) -- cgit v1.2.3-1-g7c22