Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
c565b018
Commit
c565b018
authored
Dec 12, 2018
by
bergquist
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
clean up integration tests
parent
823bba8d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
32 additions
and
66 deletions
+32
-66
pkg/infra/serverlock/serverlock.go
+7
-4
pkg/infra/serverlock/serverlock_integration_test.go
+23
-58
pkg/infra/serverlock/serverlock_test.go
+2
-4
No files found.
pkg/infra/serverlock/serverlock.go
View file @
c565b018
...
...
@@ -28,20 +28,23 @@ func (sl *ServerLockService) Init() error {
// 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
// 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
)
if
err
!=
nil
{
return
err
}
// avoid execution if last lock happened less than `matInterval` ago
if
rowLock
.
LastExecution
!=
0
{
lastExeuctionTime
:=
time
.
Unix
(
rowLock
.
LastExecution
,
0
)
if
lastExeuctionTime
.
Unix
()
>
time
.
Now
()
.
Add
(
-
max
Every
)
.
Unix
()
{
if
lastExeuctionTime
.
Unix
()
>
time
.
Now
()
.
Add
(
-
max
Interval
)
.
Unix
()
{
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
{
return
err
}
...
...
@@ -53,7 +56,7 @@ func (sl *ServerLockService) OncePerServerGroup(ctx context.Context, actionName
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
err
:=
sl
.
SQLStore
.
WithDbSession
(
ctx
,
func
(
dbSession
*
sqlstore
.
DBSession
)
error
{
...
...
pkg/infra/serverlock/serverlock_integration_test.go
View file @
c565b018
...
...
@@ -13,63 +13,28 @@ import (
func
TestServerLok
(
t
*
testing
.
T
)
{
sl
:=
createTestableServerLock
(
t
)
Convey
(
"Server lock integration test"
,
t
,
func
()
{
Convey
(
"Check that we can call OncePerServerGroup multiple times without executing callback"
,
func
()
{
counter
:=
0
var
err
error
//this time `fn` should be executed
err
=
sl
.
OncePerServerGroup
(
context
.
Background
(),
"test-operation"
,
time
.
Second
*
5
,
func
()
{
counter
++
})
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`
err
=
sl
.
OncePerServerGroup
(
context
.
Background
(),
"test-operation"
,
time
.
Second
*
5
,
func
()
{
counter
++
})
So
(
err
,
ShouldBeNil
)
// wg := sync.WaitGroup{}
// 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.
<-
time
.
After
(
time
.
Second
*
10
)
// now `fn` should be executed again
err
=
sl
.
OncePerServerGroup
(
context
.
Background
(),
"test-operation"
,
time
.
Second
*
5
,
func
()
{
counter
++
})
So
(
err
,
ShouldBeNil
)
So
(
counter
,
ShouldEqual
,
2
)
})
Convey
(
"Server lock integration tests"
,
t
,
func
()
{
counter
:=
0
var
err
error
incCounter
:=
func
()
{
counter
++
}
atInterval
:=
time
.
Second
*
1
ctx
:=
context
.
Background
()
//this time `fn` should be executed
So
(
sl
.
OncePerServerGroup
(
ctx
,
"test-operation"
,
atInterval
,
incCounter
),
ShouldBeNil
)
//this should not execute `fn`
So
(
sl
.
OncePerServerGroup
(
ctx
,
"test-operation"
,
atInterval
,
incCounter
),
ShouldBeNil
)
So
(
sl
.
OncePerServerGroup
(
ctx
,
"test-operation"
,
atInterval
,
incCounter
),
ShouldBeNil
)
So
(
sl
.
OncePerServerGroup
(
ctx
,
"test-operation"
,
atInterval
,
incCounter
),
ShouldBeNil
)
So
(
sl
.
OncePerServerGroup
(
ctx
,
"test-operation"
,
atInterval
,
incCounter
),
ShouldBeNil
)
// wait 5 second.
<-
time
.
After
(
atInterval
*
2
)
// now `fn` should be executed again
err
=
sl
.
OncePerServerGroup
(
ctx
,
"test-operation"
,
atInterval
,
incCounter
)
So
(
err
,
ShouldBeNil
)
So
(
counter
,
ShouldEqual
,
2
)
})
}
pkg/infra/serverlock/serverlock_test.go
View file @
c565b018
...
...
@@ -3,10 +3,8 @@ package serverlock
import
(
"context"
"testing"
"time"
"github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/services/sqlstore"
.
"github.com/smartystreets/goconvey/convey"
)
...
...
@@ -45,11 +43,11 @@ func TestServerLock(t *testing.T) {
})
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
(
gotLock
,
ShouldBeTrue
)
gotLock
,
err
=
sl
.
acquireLock
(
context
.
Background
(),
first
,
time
.
Second
*
1
)
gotLock
,
err
=
sl
.
acquireLock
(
context
.
Background
(),
first
)
So
(
err
,
ShouldBeNil
)
So
(
gotLock
,
ShouldBeFalse
)
})
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment