Skip to content

Commit

Permalink
Make rollback actually rollback.
Browse files Browse the repository at this point in the history
Also add tests for basic commit/rollback
functionality.

Fixes prometheus-junkyard#39
  • Loading branch information
brian-brazil committed Apr 19, 2017
1 parent 25d4546 commit dba222b
Show file tree
Hide file tree
Showing 2 changed files with 76 additions and 1 deletion.
2 changes: 1 addition & 1 deletion db.go
Original file line number Diff line number Diff line change
Expand Up @@ -654,7 +654,7 @@ func (a *dbAppender) Rollback() error {
var g errgroup.Group

for _, h := range a.heads {
g.Go(h.app.Commit)
g.Go(h.app.Rollback)
}

return g.Wait()
Expand Down
75 changes: 75 additions & 0 deletions db_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,78 @@
// limitations under the License.

package tsdb

import (
"io/ioutil"
"os"
"testing"

"github.com/prometheus/tsdb/labels"
)

func TestDataAvailableOnlyAfterCommit(t *testing.T) {
tmpdir, _ := ioutil.TempDir("", "test")
defer os.RemoveAll(tmpdir)

db, err := Open(tmpdir, nil, nil, nil)
if err != nil {
t.Fatalf("Error opening database: %q", err)
}
defer db.Close()

app := db.Appender()
_, err = app.Add(labels.FromStrings("foo", "bar"), 0, 0)
if err != nil {
t.Fatalf("Error adding sample: %q", err)
}

querier := db.Querier(0, 1)
defer querier.Close()
seriesSet := querier.Select(labels.NewEqualMatcher("foo", "bar"))
if seriesSet.Next() {
t.Fatalf("Error, was expecting no matching series.")
}

err = app.Commit()
if err != nil {
t.Fatalf("Error committing: %q", err)
}

querier = db.Querier(0, 1)
defer querier.Close()

seriesSet = querier.Select(labels.NewEqualMatcher("foo", "bar"))
if !seriesSet.Next() {
t.Fatalf("Error, was expecting a matching series.")
}
}

func TestDataNotAvailableAfterRollback(t *testing.T) {
tmpdir, _ := ioutil.TempDir("", "test")
defer os.RemoveAll(tmpdir)

db, err := Open(tmpdir, nil, nil, nil)
if err != nil {
t.Fatalf("Error opening database: %q", err)
}
defer db.Close()

app := db.Appender()
_, err = app.Add(labels.FromStrings("foo", "bar"), 0, 0)
if err != nil {
t.Fatalf("Error adding sample: %q", err)
}

err = app.Rollback()
if err != nil {
t.Fatalf("Error rolling back: %q", err)
}

querier := db.Querier(0, 1)
defer querier.Close()

seriesSet := querier.Select(labels.NewEqualMatcher("foo", "bar"))
if seriesSet.Next() {
t.Fatalf("Error, was expecting no matching series.")
}
}

0 comments on commit dba222b

Please sign in to comment.