Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
milvus
milvus
提交
b31f9373
M
milvus
项目概览
milvus
/
milvus
大约 1 年 前同步成功
通知
261
Star
22476
Fork
2472
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
milvus
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
b31f9373
编写于
7月 05, 2022
作者:
X
Xiaofan
提交者:
GitHub
7月 05, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix unsubscribe with subscription not exist (#18042)
Signed-off-by:
N
xiaofan-luan
<
xiaofan.luan@zilliz.com
>
上级
39ac5881
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
49 addition
and
2 deletion
+49
-2
internal/mq/msgstream/mq_factory.go
internal/mq/msgstream/mq_factory.go
+11
-2
internal/mq/msgstream/msgstream_util_test.go
internal/mq/msgstream/msgstream_util_test.go
+38
-0
未找到文件。
internal/mq/msgstream/mq_factory.go
浏览文件 @
b31f9373
...
@@ -18,8 +18,7 @@ package msgstream
...
@@ -18,8 +18,7 @@ package msgstream
import
(
import
(
"context"
"context"
"strings"
"go.uber.org/zap"
"github.com/apache/pulsar-client-go/pulsar"
"github.com/apache/pulsar-client-go/pulsar"
"github.com/milvus-io/milvus/internal/log"
"github.com/milvus-io/milvus/internal/log"
...
@@ -29,8 +28,11 @@ import (
...
@@ -29,8 +28,11 @@ import (
rmqwrapper
"github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper/rmq"
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/paramtable"
"github.com/milvus-io/milvus/internal/util/retry"
"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/cmdutils"
"github.com/streamnative/pulsarctl/pkg/pulsar/utils"
"github.com/streamnative/pulsarctl/pkg/pulsar/utils"
"go.uber.org/zap"
)
)
// PmsFactory is a pulsar msgstream factory that implemented Factory interface(msgstream.go)
// 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
...
@@ -87,6 +89,13 @@ func (f *PmsFactory) NewMsgStreamDisposer(ctx context.Context) func([]string, st
}
}
err
=
admin
.
Subscriptions
()
.
Delete
(
*
topic
,
subname
,
true
)
err
=
admin
.
Subscriptions
()
.
Delete
(
*
topic
,
subname
,
true
)
if
err
!=
nil
{
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
),
log
.
Warn
(
"failed to clean up subscriptions"
,
zap
.
String
(
"pulsar web"
,
f
.
PulsarWebAddress
),
zap
.
String
(
"topic"
,
channel
),
zap
.
Any
(
"subname"
,
subname
),
zap
.
Error
(
err
))
zap
.
String
(
"topic"
,
channel
),
zap
.
Any
(
"subname"
,
subname
),
zap
.
Error
(
err
))
// fallback to original way
// fallback to original way
...
...
internal/mq/msgstream/msgstream_util_test.go
0 → 100644
浏览文件 @
b31f9373
// 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"
})
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录