From 9e17fdb598e4ac4d2bf5f139a740cc70409d6cfe Mon Sep 17 00:00:00 2001 From: yukun Date: Wed, 22 Sep 2021 20:16:04 +0800 Subject: [PATCH] Improve rocksmq codecov (#8328) Signed-off-by: fishpenguin --- .../util/rocksmq/server/rocksmq/rocksmq_impl.go | 4 ---- .../rocksmq/server/rocksmq/rocksmq_impl_test.go | 13 +++++++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/internal/util/rocksmq/server/rocksmq/rocksmq_impl.go b/internal/util/rocksmq/server/rocksmq/rocksmq_impl.go index be05d2e553..1dcf1beec0 100644 --- a/internal/util/rocksmq/server/rocksmq/rocksmq_impl.go +++ b/internal/util/rocksmq/server/rocksmq/rocksmq_impl.go @@ -196,13 +196,11 @@ func (rmq *rocksmq) CreateTopic(topicName string) error { err := rmq.kv.Save(beginKey, "0") if err != nil { - log.Debug("RocksMQ: save " + beginKey + " failed.") return err } err = rmq.kv.Save(endKey, "0") if err != nil { - log.Debug("RocksMQ: save " + endKey + " failed.") return err } if _, ok := topicMu.Load(topicName); !ok { @@ -323,7 +321,6 @@ func (rmq *rocksmq) CreateConsumerGroup(topicName, groupName string) error { } err := rmq.kv.Save(key, DefaultMessageID) if err != nil { - log.Debug("RocksMQ: save " + key + " failed.") return err } @@ -362,7 +359,6 @@ func (rmq *rocksmq) DestroyConsumerGroup(topicName, groupName string) error { err := rmq.kv.Remove(key) if err != nil { - log.Debug("RocksMQ: remove " + key + " failed.") return err } if vals, ok := rmq.consumers.Load(topicName); ok { diff --git a/internal/util/rocksmq/server/rocksmq/rocksmq_impl_test.go b/internal/util/rocksmq/server/rocksmq/rocksmq_impl_test.go index 4d25b8ea5d..a4e3d205c9 100644 --- a/internal/util/rocksmq/server/rocksmq/rocksmq_impl_test.go +++ b/internal/util/rocksmq/server/rocksmq/rocksmq_impl_test.go @@ -119,6 +119,9 @@ func TestRocksmq_RegisterConsumer(t *testing.T) { } rmq.RegisterConsumer(consumer2) + topicMu.Delete(topicName) + topicMu.Store(topicName, topicName) + assert.Error(t, rmq.DestroyConsumerGroup(topicName, groupName)) err = rmq.DestroyConsumerGroup(topicName, groupName) assert.Error(t, err) } @@ -230,6 +233,16 @@ func TestRocksmq_Dummy(t *testing.T) { pMsgs := make([]ProducerMessage, 1) pMsgA := ProducerMessage{Payload: []byte(msgA)} pMsgs[0] = pMsgA + + topicMu.Delete(channelName) + _, err = rmq.Consume(channelName, groupName1, 1) + assert.Error(t, err) + topicMu.Store(channelName, channelName) + assert.Error(t, rmq.Produce(channelName, nil)) + + _, err = rmq.Consume(channelName, groupName1, 1) + assert.Error(t, err) + } func TestRocksmq_Loop(t *testing.T) {