RepoMirrors
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Close DB in Agent tests (#9630) 

* Close agent db in tests

Signed-off-by: Levi Harrison <git@leviharrison.dev>

* Close first DB before opening second

Signed-off-by: Levi Harrison <git@leviharrison.dev>

* Use seperate variables for different DBs?

Signed-off-by: Levi Harrison <git@leviharrison.dev>

* Close remote storage

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>

* Fix closing of stuff

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>

* Remove the build flags after a rebase

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>

* Fix closing of stuff 2

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>

Co-authored-by: Julien Pivotto <roidelapluie@inuits.eu>
Co-authored-by: Ganesh Vernekar <ganeshvern@gmail.com>
This commit is contained in:
Levi Harrison 2021-11-10 09:35:54 -05:00 committed by GitHub
parent 4a83e6f453
commit 7400e07fa9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 72 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
tsdb/agent/db_test.go
View File

@ -11,15 +11,10 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
//go:build !windows
// +build !windows
package agent package agent
import ( import (
"context" "context"
"io/ioutil"
"os"
"strconv" "strconv"
"sync" "sync"
"testing" "testing"
@ -39,20 +34,16 @@ import (
) )
func TestUnsupported(t *testing.T) { func TestUnsupported(t *testing.T) {
promAgentDir, err := ioutil.TempDir("", "TestUnsupported") promAgentDir := t.TempDir()
require.NoError(t, err)
t.Cleanup(func() {
require.NoError(t, os.RemoveAll(promAgentDir))
})
opts := DefaultOptions() opts := DefaultOptions()
logger := log.NewNopLogger() logger := log.NewNopLogger()
s, err := Open(logger, prometheus.DefaultRegisterer, nil, promAgentDir, opts) s, err := Open(logger, prometheus.DefaultRegisterer, nil, promAgentDir, opts)
if err != nil { require.NoError(t, err)
t.Fatalf("unable to create storage for the agent: %v", err) defer func() {
} require.NoError(t, s.Close())
defer s.Close() }()
t.Run("Querier", func(t *testing.T) { t.Run("Querier", func(t *testing.T) {
_, err := s.Querier(context.TODO(), 0, 0) _, err := s.Querier(context.TODO(), 0, 0)
@ -76,22 +67,22 @@ func TestCommit(t *testing.T) {
numSeries = 8 numSeries = 8
) )
promAgentDir, err := ioutil.TempDir("", t.Name()) promAgentDir := t.TempDir()
require.NoError(t, err)
t.Cleanup(func() {
require.NoError(t, os.RemoveAll(promAgentDir))
})
lbls := labelsForTest(t.Name(), numSeries) lbls := labelsForTest(t.Name(), numSeries)
opts := DefaultOptions() opts := DefaultOptions()
logger := log.NewNopLogger() logger := log.NewNopLogger()
reg := prometheus.NewRegistry() reg := prometheus.NewRegistry()
remoteStorage := remote.NewStorage(log.With(logger, "component", "remote"), reg, startTime, promAgentDir, time.Second*30, nil) remoteStorage := remote.NewStorage(log.With(logger, "component", "remote"), reg, startTime, promAgentDir, time.Second*30, nil)
defer func(rs *remote.Storage) {
require.NoError(t, rs.Close())
}(remoteStorage)
s, err := Open(logger, reg, remoteStorage, promAgentDir, opts) s, err := Open(logger, reg, remoteStorage, promAgentDir, opts)
if err != nil { require.NoError(t, err)
t.Fatalf("unable to create storage for the agent: %v", err) defer func() {
} require.NoError(t, s.Close())
}()
a := s.Appender(context.TODO()) a := s.Appender(context.TODO())
@ -112,17 +103,24 @@ func TestCommit(t *testing.T) {
reg = prometheus.NewRegistry() reg = prometheus.NewRegistry()
remoteStorage = remote.NewStorage(log.With(logger, "component", "remote"), reg, startTime, promAgentDir, time.Second*30, nil) remoteStorage = remote.NewStorage(log.With(logger, "component", "remote"), reg, startTime, promAgentDir, time.Second*30, nil)
defer func() {
require.NoError(t, remoteStorage.Close())
}()
s, err = Open(logger, nil, remoteStorage, promAgentDir, opts) s1, err := Open(logger, nil, remoteStorage, promAgentDir, opts)
if err != nil { require.NoError(t, err)
t.Fatalf("unable to create storage for the agent: %v", err) defer func() {
} require.NoError(t, s1.Close())
}()
var dec record.Decoder var dec record.Decoder
if err == nil { if err == nil {
sr, err := wal.NewSegmentsReader(s.wal.Dir()) sr, err := wal.NewSegmentsReader(s1.wal.Dir())
require.NoError(t, err) require.NoError(t, err)
defer func() {
require.NoError(t, sr.Close())
}()
r := wal.NewReader(sr) r := wal.NewReader(sr)
seriesPool := sync.Pool{ seriesPool := sync.Pool{
@ -165,22 +163,22 @@ func TestRollback(t *testing.T) {
numSeries = 8 numSeries = 8
) )
promAgentDir, err := ioutil.TempDir("", t.Name()) promAgentDir := t.TempDir()
require.NoError(t, err)
t.Cleanup(func() {
require.NoError(t, os.RemoveAll(promAgentDir))
})
lbls := labelsForTest(t.Name(), numSeries) lbls := labelsForTest(t.Name(), numSeries)
opts := DefaultOptions() opts := DefaultOptions()
logger := log.NewNopLogger() logger := log.NewNopLogger()
reg := prometheus.NewRegistry() reg := prometheus.NewRegistry()
remoteStorage := remote.NewStorage(log.With(logger, "component", "remote"), reg, startTime, promAgentDir, time.Second*30, nil) remoteStorage := remote.NewStorage(log.With(logger, "component", "remote"), reg, startTime, promAgentDir, time.Second*30, nil)
defer func(rs *remote.Storage) {
require.NoError(t, rs.Close())
}(remoteStorage)
s, err := Open(logger, reg, remoteStorage, promAgentDir, opts) s, err := Open(logger, reg, remoteStorage, promAgentDir, opts)
if err != nil { require.NoError(t, err)
t.Fatalf("unable to create storage for the agent: %v", err) defer func() {
} require.NoError(t, s.Close())
}()
a := s.Appender(context.TODO()) a := s.Appender(context.TODO())
@ -202,17 +200,24 @@ func TestRollback(t *testing.T) {
reg = prometheus.NewRegistry() reg = prometheus.NewRegistry()
remoteStorage = remote.NewStorage(log.With(logger, "component", "remote"), reg, startTime, promAgentDir, time.Second*30, nil) remoteStorage = remote.NewStorage(log.With(logger, "component", "remote"), reg, startTime, promAgentDir, time.Second*30, nil)
defer func() {
require.NoError(t, remoteStorage.Close())
}()
s, err = Open(logger, nil, remoteStorage, promAgentDir, opts) s1, err := Open(logger, nil, remoteStorage, promAgentDir, opts)
if err != nil { require.NoError(t, err)
t.Fatalf("unable to create storage for the agent: %v", err) defer func() {
} require.NoError(t, s1.Close())
}()
var dec record.Decoder var dec record.Decoder
if err == nil { if err == nil {
sr, err := wal.NewSegmentsReader(s.wal.Dir()) sr, err := wal.NewSegmentsReader(s1.wal.Dir())
require.NoError(t, err) require.NoError(t, err)
defer func() {
require.NoError(t, sr.Close())
}()
r := wal.NewReader(sr) r := wal.NewReader(sr)
seriesPool := sync.Pool{ seriesPool := sync.Pool{
@ -256,11 +261,7 @@ func TestFullTruncateWAL(t *testing.T) {
lastTs = 500 lastTs = 500
) )
promAgentDir, err := ioutil.TempDir("", t.Name()) promAgentDir := t.TempDir()
require.NoError(t, err)
t.Cleanup(func() {
require.NoError(t, os.RemoveAll(promAgentDir))
})
lbls := labelsForTest(t.Name(), numSeries) lbls := labelsForTest(t.Name(), numSeries)
opts := DefaultOptions() opts := DefaultOptions()
@ -268,11 +269,15 @@ func TestFullTruncateWAL(t *testing.T) {
logger := log.NewNopLogger() logger := log.NewNopLogger()
reg := prometheus.NewRegistry() reg := prometheus.NewRegistry()
remoteStorage := remote.NewStorage(log.With(logger, "component", "remote"), reg, startTime, promAgentDir, time.Second*30, nil) remoteStorage := remote.NewStorage(log.With(logger, "component", "remote"), reg, startTime, promAgentDir, time.Second*30, nil)
defer func() {
require.NoError(t, remoteStorage.Close())
}()
s, err := Open(logger, reg, remoteStorage, promAgentDir, opts) s, err := Open(logger, reg, remoteStorage, promAgentDir, opts)
if err != nil { require.NoError(t, err)
t.Fatalf("unable to create storage for the agent: %v", err) defer func() {
} require.NoError(t, s.Close())
}()
a := s.Appender(context.TODO()) a := s.Appender(context.TODO())
@ -299,22 +304,22 @@ func TestPartialTruncateWAL(t *testing.T) {
numSeries = 800 numSeries = 800
) )
promAgentDir, err := ioutil.TempDir("", t.Name()) promAgentDir := t.TempDir()
require.NoError(t, err)
t.Cleanup(func() {
require.NoError(t, os.RemoveAll(promAgentDir))
})
opts := DefaultOptions() opts := DefaultOptions()
opts.TruncateFrequency = time.Minute * 2 opts.TruncateFrequency = time.Minute * 2
logger := log.NewNopLogger() logger := log.NewNopLogger()
reg := prometheus.NewRegistry() reg := prometheus.NewRegistry()
remoteStorage := remote.NewStorage(log.With(logger, "component", "remote"), reg, startTime, promAgentDir, time.Second*30, nil) remoteStorage := remote.NewStorage(log.With(logger, "component", "remote"), reg, startTime, promAgentDir, time.Second*30, nil)
defer func() {
require.NoError(t, remoteStorage.Close())
}()
s, err := Open(logger, reg, remoteStorage, promAgentDir, opts) s, err := Open(logger, reg, remoteStorage, promAgentDir, opts)
if err != nil { require.NoError(t, err)
t.Fatalf("unable to create storage for the agent: %v", err) defer func() {
} require.NoError(t, s.Close())
}()
a := s.Appender(context.TODO()) a := s.Appender(context.TODO())
@ -361,11 +366,7 @@ func TestWALReplay(t *testing.T) {
lastTs = 500 lastTs = 500
) )
promAgentDir, err := ioutil.TempDir("", t.Name()) promAgentDir := t.TempDir()
require.NoError(t, err)
t.Cleanup(func() {
require.NoError(t, os.RemoveAll(promAgentDir))
})
lbls := labelsForTest(t.Name(), numSeries) lbls := labelsForTest(t.Name(), numSeries)
opts := DefaultOptions() opts := DefaultOptions()
@ -373,11 +374,15 @@ func TestWALReplay(t *testing.T) {
logger := log.NewNopLogger() logger := log.NewNopLogger()
reg := prometheus.NewRegistry() reg := prometheus.NewRegistry()
remoteStorage := remote.NewStorage(log.With(logger, "component", "remote"), reg, startTime, promAgentDir, time.Second*30, nil) remoteStorage := remote.NewStorage(log.With(logger, "component", "remote"), reg, startTime, promAgentDir, time.Second*30, nil)
defer func() {
require.NoError(t, remoteStorage.Close())
}()
s, err := Open(logger, reg, remoteStorage, promAgentDir, opts) s, err := Open(logger, reg, remoteStorage, promAgentDir, opts)
if err != nil { require.NoError(t, err)
t.Fatalf("unable to create storage for the agent: %v", err) defer func() {
} require.NoError(t, s.Close())
}()
a := s.Appender(context.TODO()) a := s.Appender(context.TODO())
@ -392,14 +397,14 @@ func TestWALReplay(t *testing.T) {
require.NoError(t, a.Commit()) require.NoError(t, a.Commit())
require.NoError(t, s.Close())
restartOpts := DefaultOptions() restartOpts := DefaultOptions()
restartLogger := log.NewNopLogger() restartLogger := log.NewNopLogger()
restartReg := prometheus.NewRegistry() restartReg := prometheus.NewRegistry()
s, err = Open(restartLogger, restartReg, nil, promAgentDir, restartOpts) s, err = Open(restartLogger, restartReg, nil, promAgentDir, restartOpts)
if err != nil { require.NoError(t, err)
t.Fatalf("unable to create storage for the agent: %v", err)
}
// Check if all the series are retrieved back from the WAL. // Check if all the series are retrieved back from the WAL.
m := gatherFamily(t, restartReg, "prometheus_agent_active_series") m := gatherFamily(t, restartReg, "prometheus_agent_active_series")