Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
doodoocoder
prometheus
提交
fb79f515
P
prometheus
项目概览
doodoocoder
/
prometheus
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
prometheus
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
fb79f515
编写于
2月 10, 2020
作者:
B
Bartlomiej Plotka
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixed second bug.
Signed-off-by:
N
Bartlomiej Plotka
<
bwplotka@gmail.com
>
上级
aadffd13
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
26 addition
and
9 deletion
+26
-9
storage/remote/codec.go
storage/remote/codec.go
+0
-1
tsdb/db_test.go
tsdb/db_test.go
+1
-0
util/teststorage/storage.go
util/teststorage/storage.go
+4
-4
web/api/v1/api.go
web/api/v1/api.go
+9
-2
web/api/v1/api_test.go
web/api/v1/api_test.go
+12
-2
未找到文件。
storage/remote/codec.go
浏览文件 @
fb79f515
...
...
@@ -221,7 +221,6 @@ func StreamChunkedReadResponses(
if
len
(
chks
)
==
0
{
break
}
b
,
err
:=
proto
.
Marshal
(
&
prompb
.
ChunkedReadResponse
{
ChunkedSeries
:
[]
*
prompb
.
ChunkedSeries
{
{
...
...
tsdb/db_test.go
浏览文件 @
fb79f515
...
...
@@ -64,6 +64,7 @@ func openTestDB(t testing.TB, opts *Options, rngs []int64) (db *DB, close func()
// Do not close the test database by default as it will deadlock on test failures.
return
db
,
func
()
{
testutil
.
Ok
(
t
,
db
.
Close
())
testutil
.
Ok
(
t
,
os
.
RemoveAll
(
tmpdir
))
}
}
...
...
util/teststorage/storage.go
浏览文件 @
fb79f515
...
...
@@ -34,10 +34,10 @@ func New(t testutil.T) storage.Storage {
// Tests just load data for a series sequentially. Thus we
// need a long appendable window.
db
,
err
:=
tsdb
.
Open
(
dir
,
nil
,
nil
,
&
tsdb
.
Options
{
MinBlockDuration
:
model
.
Duration
(
24
*
time
.
Hour
),
MaxBlockDuration
:
model
.
Duration
(
24
*
time
.
Hour
),
}
)
opts
:=
tsdb
.
DefaultOptions
()
opts
.
MinBlockDuration
=
model
.
Duration
(
24
*
time
.
Hour
)
opts
.
MaxBlockDuration
=
model
.
Duration
(
24
*
time
.
Hour
)
db
,
err
:=
tsdb
.
Open
(
dir
,
nil
,
nil
,
opts
)
if
err
!=
nil
{
t
.
Fatalf
(
"Opening test storage failed: %s"
,
err
)
}
...
...
web/api/v1/api.go
浏览文件 @
fb79f515
...
...
@@ -1189,11 +1189,19 @@ func (api *API) remoteRead(w http.ResponseWriter, r *http.Request) {
for
i
,
query
:=
range
req
.
Queries
{
err
:=
api
.
remoteReadQuery
(
ctx
,
query
,
externalLabels
,
func
(
querier
storage
.
Querier
,
selectParams
*
storage
.
SelectParams
,
filteredMatchers
[]
*
labels
.
Matcher
)
error
{
// The streaming API provides sorted series.
set
,
_
,
err
:=
querier
.
SelectSorted
(
selectParams
,
filteredMatchers
...
)
set
,
ws
,
err
:=
querier
.
SelectSorted
(
selectParams
,
filteredMatchers
...
)
if
err
!=
nil
{
return
err
}
if
len
(
ws
)
>
0
{
msg
:=
""
for
_
,
w
:=
range
ws
{
msg
+=
w
.
Error
()
+
";"
}
level
.
Warn
(
api
.
logger
)
.
Log
(
"remote read warnings"
,
"warnings"
,
msg
)
}
return
remote
.
StreamChunkedReadResponses
(
remote
.
NewChunkedWriter
(
w
,
f
),
int64
(
i
),
...
...
@@ -1305,7 +1313,6 @@ func (api *API) remoteReadQuery(ctx context.Context, query *prompb.Query, extern
level
.
Warn
(
api
.
logger
)
.
Log
(
"msg"
,
"error on querier close"
,
"err"
,
err
.
Error
())
}
}()
return
seriesHandleFn
(
querier
,
selectParams
,
filteredMatchers
)
}
...
...
web/api/v1/api_test.go
浏览文件 @
fb79f515
...
...
@@ -1713,10 +1713,20 @@ func TestStreamReadEndpoint(t *testing.T) {
matcher3
,
err
:=
labels
.
NewMatcher
(
labels
.
MatchEqual
,
"foo"
,
"bar1"
)
testutil
.
Ok
(
t
,
err
)
query1
,
err
:=
remote
.
ToQuery
(
0
,
14400001
,
[]
*
labels
.
Matcher
{
matcher1
,
matcher2
},
&
storage
.
SelectParams
{
Step
:
0
,
Func
:
"avg"
})
query1
,
err
:=
remote
.
ToQuery
(
0
,
14400001
,
[]
*
labels
.
Matcher
{
matcher1
,
matcher2
},
&
storage
.
SelectParams
{
Step
:
1
,
Func
:
"avg"
,
Start
:
0
,
End
:
14400001
,
})
testutil
.
Ok
(
t
,
err
)
query2
,
err
:=
remote
.
ToQuery
(
0
,
14400001
,
[]
*
labels
.
Matcher
{
matcher1
,
matcher3
},
&
storage
.
SelectParams
{
Step
:
0
,
Func
:
"avg"
})
query2
,
err
:=
remote
.
ToQuery
(
0
,
14400001
,
[]
*
labels
.
Matcher
{
matcher1
,
matcher3
},
&
storage
.
SelectParams
{
Step
:
1
,
Func
:
"avg"
,
Start
:
0
,
End
:
14400001
,
})
testutil
.
Ok
(
t
,
err
)
req
:=
&
prompb
.
ReadRequest
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录