Skip to content
This repository was archived by the owner on Aug 23, 2023. It is now read-only.

Fix points return measurement overflow #953

Merged
merged 3 commits into from
Jun 28, 2018
Merged

Fix points return measurement overflow #953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
33f53a2
update end2end to work with latest grafana.
Jun 22, 2018
a009b02
fix overflow in pointsReturn calculation
Dieterbe Jun 27, 2018
d59f8dd
trace the number of reqs. why not?
Dieterbe Jun 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions api/graphite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,6 +754,7 @@ func (s *Server) executePlan(ctx context.Context, orgId uint32, plan expr.Plan)
return nil, err
}
span := opentracing.SpanFromContext(ctx)
span.SetTag("num_reqs", len(reqs))
span.SetTag("points_fetch", pointsFetch)
span.SetTag("points_return", pointsReturn)

Expand Down
2 changes: 1 addition & 1 deletion api/query_engine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ func alignRequests(now, from, to uint32, reqs []models.Req) ([]models.Req, uint3
reqRenderChosenArchive.Value(req.Archive)
}

pointsReturn := uint32(len(reqs)) * tsRange / interval
pointsReturn := uint32(len(reqs)) * (tsRange / interval)
reqRenderPointsFetched.ValueUint32(pointsFetch)
reqRenderPointsReturned.ValueUint32(pointsReturn)

Expand Down
2 changes: 1 addition & 1 deletion stacktest/tests/end2end_carbon/end2end_carbon_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ func TestStartup(t *testing.T) {
matchers := []track.Matcher{
{Str: "metrictank.*metricIndex initialized.*starting data consumption$"},
{Str: "metrictank.*carbon-in: listening on.*2003"},
{Str: "grafana.*Initializing HTTP Server.*:3000"},
{Str: "grafana.*HTTP Server Listen.*:3000"},
}
select {
case <-tracker.Match(matchers):
Expand Down