nsqd: retry sub to ephemeral topic/channel which is Exiting

quick hacky fix, instead of "proper" locking
nsqio · May 8, 2017 · 19da9a4 · 19da9a4
1 parent 71734e9
commit 19da9a4
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/nsqd/protocol_v2.go b/nsqd/protocol_v2.go
@@ -615,10 +615,19 @@ func (p *protocolV2) SUB(client *clientV2, params [][]byte) ([]byte, error) {
 		return nil, err
 	}
 
-	topic := p.ctx.nsqd.GetTopic(topicName)
-	channel := topic.GetChannel(channelName)
-	channel.AddClient(client.ID, client)
+	var channel *Channel
+	for {
+		topic := p.ctx.nsqd.GetTopic(topicName)
+		channel = topic.GetChannel(channelName)
+		channel.AddClient(client.ID, client)
 
+		if (channel.ephemeral && channel.Exiting()) || (topic.ephemeral && topic.Exiting()) {
+			channel.RemoveClient(client.ID)
+			time.Sleep(1 * time.Millisecond)
+			continue
+		}
+		break
+	}
 	atomic.StoreInt32(&client.State, stateSubscribed)
 	client.Channel = channel
 	// update message pump