Merge pull request #3357 from prometheus/revert-3339-3065-remote-read-bypass

Revert "Bypass the fanout storage merging if no remote storage is configured."
This commit is contained in:
Tom Wilkie 2017-10-26 16:15:50 +01:00 committed by GitHub
commit 323556b025

View file

@ -34,10 +34,6 @@ type fanout struct {
// NewFanout returns a new fan-out Storage, which proxies reads and writes // NewFanout returns a new fan-out Storage, which proxies reads and writes
// through to multiple underlying storages. // through to multiple underlying storages.
func NewFanout(logger log.Logger, primary Storage, secondaries ...Storage) Storage { func NewFanout(logger log.Logger, primary Storage, secondaries ...Storage) Storage {
if len(secondaries) == 0 {
return primary
}
return &fanout{ return &fanout{
logger: logger, logger: logger,
primary: primary, primary: primary,