fix lock use

travisjeffery · Sep 23, 2017 · 1ad1648 · 1ad1648
1 parent 49dd62f
commit 1ad1648
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/broker/broker.go b/broker/broker.go
@@ -98,6 +98,7 @@ func (b *Broker) IsController() bool {
 // TopicPartitions is used to get the partitions for the given topic.
 func (b *Broker) TopicPartitions(topic string) (found []*jocko.Partition, err *jocko.Error) {
 	b.mu.RLock()
+	defer b.mu.RUnlock()
 	if p, ok := b.topics[topic]; !ok {
 		return nil, &jocko.Error{ErrorCode: protocol.ErrUnknownTopicOrPartition}
 	} else {

diff --git a/broker/replication_manager.go b/broker/replication_manager.go
@@ -19,7 +19,7 @@ func newReplicationManager() *replicationManager {
 
 func (rm *replicationManager) BecomeFollower(topic string, pid int32, command *protocol.PartitionState) error {
 	p, err := rm.Partition(topic, pid)
-	if err != nil {
+	if err != protocol.ErrNone {
 		return err
 	}
 	// stop replicator to current leader
@@ -43,7 +43,7 @@ func (rm *replicationManager) BecomeFollower(topic string, pid int32, command *p
 
 func (rm *replicationManager) BecomeLeader(topic string, pid int32, command *protocol.PartitionState) error {
 	p, err := rm.Partition(topic, pid)
-	if err != nil {
+	if err != protocol.ErrNone {
 		return err
 	}
 	if r, ok := rm.replicators[p]; ok {

diff --git a/examples/sarama/main.go b/examples/sarama/main.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/Shopify/sarama"
 	"github.com/travisjeffery/jocko/broker"
+	"github.com/travisjeffery/jocko/protocol"
 	"github.com/travisjeffery/jocko/raft"
 	"github.com/travisjeffery/jocko/serf"
 	"github.com/travisjeffery/jocko/server"
@@ -143,7 +144,7 @@ func setup() func() {
 	}
 
 	// creating/deleting topic directly since Sarama doesn't support it
-	if err := store.CreateTopic(topic, numPartitions, 1); err != nil && err != broker.ErrTopicExists {
+	ir err := store.CreateTopic(topic, numPartitions, 1); err != protocol.ErrNone {
 		panic(err)
 	}