Skip to content

N
nexpie-grafana-theme
Commit c565b018 by bergquist
Options

clean up integration tests

parent 823bba8d
Showing with 20 additions and 54 deletions
pkg/infra/serverlock/serverlock.go
...@@ -28,20 +28,23 @@ func (sl *ServerLockService) Init() error { ...@@ -28,20 +28,23 @@ func (sl *ServerLockService) Init() error {
// OncePerServerGroup try to create a lock for this server and only executes the // OncePerServerGroup try to create a lock for this server and only executes the
// `fn` function when successful. This should not be used at low internal. But services // `fn` function when successful. This should not be used at low internal. But services
// that needs to be run once every ex 10m. // that needs to be run once every ex 10m.
func (sl *ServerLockService) OncePerServerGroup(ctx context.Context, actionName string, maxEvery time.Duration, fn func()) error { func (sl *ServerLockService) OncePerServerGroup(ctx context.Context, actionName string, maxInterval time.Duration, fn func()) error {
// gets or creates a lockable row
rowLock, err := sl.getOrCreate(ctx, actionName) rowLock, err := sl.getOrCreate(ctx, actionName)
if err != nil { if err != nil {
return err return err
} }
// avoid execution if last lock happened less than `matInterval` ago
if rowLock.LastExecution != 0 { if rowLock.LastExecution != 0 {
lastExeuctionTime := time.Unix(rowLock.LastExecution, 0) lastExeuctionTime := time.Unix(rowLock.LastExecution, 0)
if lastExeuctionTime.Unix() > time.Now().Add(-maxEvery).Unix() { if lastExeuctionTime.Unix() > time.Now().Add(-maxInterval).Unix() {
return nil return nil
} }
} }
acquiredLock, err := sl.acquireLock(ctx, rowLock, maxEvery) // try to get lock based on rowLow version
acquiredLock, err := sl.acquireLock(ctx, rowLock)
if err != nil { if err != nil {
return err return err
} }
...@@ -53,7 +56,7 @@ func (sl *ServerLockService) OncePerServerGroup(ctx context.Context, actionName ...@@ -53,7 +56,7 @@ func (sl *ServerLockService) OncePerServerGroup(ctx context.Context, actionName
return nil return nil
} }
func (sl *ServerLockService) acquireLock(ctx context.Context, serverLock *serverLock, maxEvery time.Duration) (bool, error) { func (sl *ServerLockService) acquireLock(ctx context.Context, serverLock *serverLock) (bool, error) {
var result bool var result bool
err := sl.SQLStore.WithDbSession(ctx, func(dbSession *sqlstore.DBSession) error { err := sl.SQLStore.WithDbSession(ctx, func(dbSession *sqlstore.DBSession) error {
......
pkg/infra/serverlock/serverlock_integration_test.go
...@@ -13,63 +13,28 @@ import ( ...@@ -13,63 +13,28 @@ import (
func TestServerLok(t *testing.T) { func TestServerLok(t *testing.T) {
sl := createTestableServerLock(t) sl := createTestableServerLock(t)
Convey("Server lock integration test", t, func() { Convey("Server lock integration tests", t, func() {
Convey("Check that we can call OncePerServerGroup multiple times without executing callback", func() {
counter := 0 counter := 0
var err error var err error
incCounter := func() { counter++ }
atInterval := time.Second * 1
ctx := context.Background()
//this time `fn` should be executed //this time `fn` should be executed
err = sl.OncePerServerGroup(context.Background(), "test-operation", time.Second*5, func() { counter++ }) So(sl.OncePerServerGroup(ctx, "test-operation", atInterval, incCounter), ShouldBeNil)
So(err, ShouldBeNil)
//this should not execute `fn`
err = sl.OncePerServerGroup(context.Background(), "test-operation", time.Second*5, func() { counter++ })
So(err, ShouldBeNil)
//this should not execute `fn` //this should not execute `fn`
err = sl.OncePerServerGroup(context.Background(), "test-operation", time.Second*5, func() { counter++ }) So(sl.OncePerServerGroup(ctx, "test-operation", atInterval, incCounter), ShouldBeNil)
So(err, ShouldBeNil) So(sl.OncePerServerGroup(ctx, "test-operation", atInterval, incCounter), ShouldBeNil)
So(sl.OncePerServerGroup(ctx, "test-operation", atInterval, incCounter), ShouldBeNil)
// wg := sync.WaitGroup{} So(sl.OncePerServerGroup(ctx, "test-operation", atInterval, incCounter), ShouldBeNil)
// for i := 0; i < 3; i++ {
// wg.Add(1)
// go func(index int) {
// defer wg.Done()
// //sl := createTestableServerLock(t)
// //<-time.After(time.Second)
// j := 0
// for {
// select {
// case <-time.Tick(time.Second):
// fmt.Printf("running worker %d loop %d\n", index, j)
// err := sl.OncePerServerGroup(context.Background(), "test-operation", time.Second*2, func() {
// counter++
// })
// if err != nil {
// t.Errorf("expected. err: %v", err)
// }
// j++
// if j > 3 {
// return
// }
// }
// }
// }(i)
// }
// wg.Wait()
// wait 5 second. // wait 5 second.
<-time.After(time.Second * 10) <-time.After(atInterval * 2)
// now `fn` should be executed again // now `fn` should be executed again
err = sl.OncePerServerGroup(context.Background(), "test-operation", time.Second*5, func() { counter++ }) err = sl.OncePerServerGroup(ctx, "test-operation", atInterval, incCounter)
So(err, ShouldBeNil) So(err, ShouldBeNil)
So(counter, ShouldEqual, 2) So(counter, ShouldEqual, 2)
}) })
})
} }
pkg/infra/serverlock/serverlock_test.go
...@@ -3,10 +3,8 @@ package serverlock ...@@ -3,10 +3,8 @@ package serverlock
import ( import (
"context" "context"
"testing" "testing"
"time"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/services/sqlstore" "github.com/grafana/grafana/pkg/services/sqlstore"
. "github.com/smartystreets/goconvey/convey" . "github.com/smartystreets/goconvey/convey"
) )
...@@ -45,11 +43,11 @@ func TestServerLock(t *testing.T) { ...@@ -45,11 +43,11 @@ func TestServerLock(t *testing.T) {
}) })
Convey("Should be able to create lock on first row", func() { Convey("Should be able to create lock on first row", func() {
gotLock, err := sl.acquireLock(context.Background(), first, time.Second*1) gotLock, err := sl.acquireLock(context.Background(), first)
So(err, ShouldBeNil) So(err, ShouldBeNil)
So(gotLock, ShouldBeTrue) So(gotLock, ShouldBeTrue)
gotLock, err = sl.acquireLock(context.Background(), first, time.Second*1) gotLock, err = sl.acquireLock(context.Background(), first)
So(err, ShouldBeNil) So(err, ShouldBeNil)
So(gotLock, ShouldBeFalse) So(gotLock, ShouldBeFalse)
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment