Fix unsubscribe with subscription not exist (#18042)

Signed-off-by: xiaofan-luan <xiaofan.luan@zilliz.com>
This commit is contained in:
Xiaofan 2022-07-05 10:12:20 +08:00 committed by GitHub
parent 39ac5881d3
commit b31f937301
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 49 additions and 2 deletions

View File

@ -18,8 +18,7 @@ package msgstream
import (
"context"
"go.uber.org/zap"
"strings"
"github.com/apache/pulsar-client-go/pulsar"
"github.com/milvus-io/milvus/internal/log"
@ -29,8 +28,11 @@ import (
rmqwrapper "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper/rmq"
"github.com/milvus-io/milvus/internal/util/paramtable"
"github.com/milvus-io/milvus/internal/util/retry"
"github.com/streamnative/pulsarctl/pkg/cli"
"github.com/streamnative/pulsarctl/pkg/cmdutils"
"github.com/streamnative/pulsarctl/pkg/pulsar/utils"
"go.uber.org/zap"
)
// PmsFactory is a pulsar msgstream factory that implemented Factory interface(msgstream.go)
@ -87,6 +89,13 @@ func (f *PmsFactory) NewMsgStreamDisposer(ctx context.Context) func([]string, st
}
err = admin.Subscriptions().Delete(*topic, subname, true)
if err != nil {
pulsarErr, ok := err.(cli.Error)
if ok {
// subscription not found, ignore error
if strings.Contains(pulsarErr.Reason, "Subscription not found") {
return nil
}
}
log.Warn("failed to clean up subscriptions", zap.String("pulsar web", f.PulsarWebAddress),
zap.String("topic", channel), zap.Any("subname", subname), zap.Error(err))
// fallback to original way

View File

@ -0,0 +1,38 @@
// Licensed to the LF AI & Data foundation under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package msgstream
import (
"context"
"testing"
"github.com/stretchr/testify/assert"
)
func TestPulsarMsgUtil(t *testing.T) {
pmsFactory := NewPmsFactory(&Params.PulsarCfg)
ctx := context.Background()
msgStream, err := pmsFactory.NewMsgStream(ctx)
assert.Nil(t, err)
defer msgStream.Close()
// create a topic
msgStream.AsProducer([]string{"test"})
UnsubscribeChannels(ctx, pmsFactory, "sub", []string{"test"})
}