The one central sample ingestion channel has caused a variety of trouble. This commit removes it. Targets and rule evaluation call an Append method directly now. To incorporate multiple storage backends (like OpenTSDB), storage.Tee forks the Append into two different appenders. Note that the tsdb queue manager had its own queue anyway. It was a queue after a queue... Much queue, so overhead... Targets have their own little buffer (implemented as a channel) to avoid stalling during an http scrape. But a new scrape will only be started once the old one is fully ingested. The contraption of three pipelined ingesters was removed. A Target is an ingester itself now. Despite more logic in Target, things should be less confusing now. Also, remove lint and vet warnings in ast.go.pull/596/head
beorn7
10 years ago
parent
0056eaeb4f
commit
be11cb2b07
@ -1,71 +0,0 @@ |
||||
// Copyright 2013 The Prometheus Authors
|
||||
// Licensed 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 retrieval |
||||
|
||||
import ( |
||||
"errors" |
||||
"time" |
||||
|
||||
"github.com/prometheus/client_golang/extraction" |
||||
|
||||
clientmodel "github.com/prometheus/client_golang/model" |
||||
) |
||||
|
||||
const ingestTimeout = 100 * time.Millisecond // TODO(beorn7): Adjust this to a fraction of the actual HTTP timeout.
|
||||
|
||||
var errIngestChannelFull = errors.New("ingestion channel full") |
||||
|
||||
// MergeLabelsIngester merges a labelset ontop of a given extraction result and
|
||||
// passes the result on to another ingester. Label collisions are avoided by
|
||||
// appending a label prefix to any newly merged colliding labels.
|
||||
type MergeLabelsIngester struct { |
||||
Labels clientmodel.LabelSet |
||||
CollisionPrefix clientmodel.LabelName |
||||
|
||||
Ingester extraction.Ingester |
||||
} |
||||
|
||||
// Ingest ingests the provided extraction result by merging in i.Labels and then
|
||||
// handing it over to i.Ingester.
|
||||
func (i *MergeLabelsIngester) Ingest(samples clientmodel.Samples) error { |
||||
for _, s := range samples { |
||||
s.Metric.MergeFromLabelSet(i.Labels, i.CollisionPrefix) |
||||
} |
||||
|
||||
return i.Ingester.Ingest(samples) |
||||
} |
||||
|
||||
// ChannelIngester feeds results into a channel without modifying them.
|
||||
type ChannelIngester chan<- clientmodel.Samples |
||||
|
||||
// Ingest ingests the provided extraction result by sending it to its channel.
|
||||
// If the channel was not able to receive the samples within the ingestTimeout,
|
||||
// an error is returned. This is important to fail fast and to not pile up
|
||||
// ingestion requests in case of overload.
|
||||
func (i ChannelIngester) Ingest(s clientmodel.Samples) error { |
||||
// Since the regular case is that i is ready to receive, first try
|
||||
// without setting a timeout so that we don't need to allocate a timer
|
||||
// most of the time.
|
||||
select { |
||||
case i <- s: |
||||
return nil |
||||
default: |
||||
select { |
||||
case i <- s: |
||||
return nil |
||||
case <-time.After(ingestTimeout): |
||||
return errIngestChannelFull |
||||
} |
||||
} |
||||
} |
||||
@ -0,0 +1,38 @@ |
||||
// Copyright 2015 The Prometheus Authors
|
||||
// Licensed 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 storage |
||||
|
||||
import ( |
||||
clientmodel "github.com/prometheus/client_golang/model" |
||||
) |
||||
|
||||
// SampleAppender is the interface to append samples to both, local and remote
|
||||
// storage.
|
||||
type SampleAppender interface { |
||||
Append(*clientmodel.Sample) |
||||
} |
||||
|
||||
// Tee is a SampleAppender that appends every sample to two other
|
||||
// SampleAppenders.
|
||||
type Tee struct { |
||||
Appender1, Appender2 SampleAppender |
||||
} |
||||
|
||||
// Append implements SampleAppender. It appends the provided sample first
|
||||
// to Appender1, then to Appender2, waiting for each to return before
|
||||
// proceeding.
|
||||
func (t Tee) Append(s *clientmodel.Sample) { |
||||
t.Appender1.Append(s) |
||||
t.Appender2.Append(s) |
||||
} |
||||
Loading…
Reference in new issue