Skip to content

Commit

Permalink
Merge pull request harness#2055 from bradrydzewski/fix/build-seq
Browse files Browse the repository at this point in the history 
Store build number counter in repository table
  • Loading branch information
@bradrydzewski
bradrydzewski authored May 23, 2017
2 parents 2341e09 + 08b320e commit 0b4dbf8
Show file tree
Hide file tree
Showing 15 changed files with 288 additions and 42 deletions.
1 change: 1 addition & 0 deletions model/repo.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ type Repo struct {
AllowPush bool `json:"allow_push" meddler:"repo_allow_push"`
AllowDeploy bool `json:"allow_deploys" meddler:"repo_allow_deploys"`
AllowTag bool `json:"allow_tags" meddler:"repo_allow_tags"`
Counter int `json:"last_build" meddler:"repo_counter"`
Config string `json:"config_file" meddler:"repo_config_path"`
Hash string `json:"-" meddler:"repo_hash"`
}
Expand Down
45 changes: 41 additions & 4 deletions store/datastore/builds.go
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
package datastore

import (
"fmt"
"time"

"github.com/drone/drone/model"
"github.com/drone/drone/store/datastore/sql"
"github.com/russross/meddler"
)

Expand Down Expand Up @@ -56,12 +58,14 @@ func (db *datastore) GetBuildQueue() ([]*model.Feed, error) {
}

func (db *datastore) CreateBuild(build *model.Build, procs ...*model.Proc) error {
var number int
db.QueryRow(rebind(buildNumberLast), build.RepoID).Scan(&number)
build.Number = number + 1
id, err := db.incrementRepoRetry(build.RepoID)
if err != nil {
return err
}
build.Number = id
build.Created = time.Now().UTC().Unix()
build.Enqueued = build.Created
err := meddler.Insert(db, buildTable, build)
err = meddler.Insert(db, buildTable, build)
if err != nil {
return err
}
Expand All @@ -75,6 +79,39 @@ func (db *datastore) CreateBuild(build *model.Build, procs ...*model.Proc) error
return nil
}

func (db *datastore) incrementRepoRetry(id int64) (int, error) {
repo, err := db.GetRepo(id)
if err != nil {
return 0, fmt.Errorf("database: cannot fetch repository: %s", err)
}
for i := 0; i < 10; i++ {
seq, err := db.incrementRepo(repo.ID, repo.Counter+i, repo.Counter+i+1)
if err != nil {
return 0, err
}
if seq == 0 {
continue
}
return seq, nil
}
return 0, fmt.Errorf("cannot increment next build number")
}

func (db *datastore) incrementRepo(id int64, old, new int) (int, error) {
results, err := db.Exec(sql.Lookup(db.driver, "repo-update-counter"), new, old, id)
if err != nil {
return 0, fmt.Errorf("database: update repository counter: %s", err)
}
updated, err := results.RowsAffected()
if err != nil {
return 0, fmt.Errorf("database: update repository counter: %s", err)
}
if updated == 0 {
return 0, nil
}
return new, nil
}

func (db *datastore) UpdateBuild(build *model.Build) error {
return meddler.Update(db, buildTable, build)
}
Expand Down
118 changes: 93 additions & 25 deletions store/datastore/builds_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,40 @@ import (
)

func TestBuilds(t *testing.T) {
db := openTest()
defer db.Close()
repo := &model.Repo{
UserID: 1,
FullName: "bradrydzewski/drone",
Owner: "bradrydzewski",
Name: "drone",
}

s := newTest()
defer s.Close()

s := From(db)
g := goblin.Goblin(t)
g.Describe("Builds", func() {
g.Before(func() {
s.Exec("DELETE FROM repos")
s.CreateRepo(repo)
})
g.After(func() {
s.Exec("DELETE FROM repos")
})

// before each test be sure to purge the package
// table data from the database.
g.BeforeEach(func() {
db.Exec("DELETE FROM builds")
db.Exec("DELETE FROM jobs")
s.Exec("DELETE FROM builds")
s.Exec("DELETE FROM jobs")
})

g.It("Should Post a Build", func() {
build := model.Build{
RepoID: 1,
RepoID: repo.ID,
Status: model.StatusSuccess,
Commit: "85f8c029b902ed9400bc600bac301a0aadb144ac",
}
err := s.CreateBuild(&build, []*model.Proc{}...)
err := s.CreateBuild(&build)
g.Assert(err == nil).IsTrue()
g.Assert(build.ID != 0).IsTrue()
g.Assert(build.Number).Equal(1)
Expand All @@ -37,12 +50,12 @@ func TestBuilds(t *testing.T) {

g.It("Should Put a Build", func() {
build := model.Build{
RepoID: 1,
RepoID: repo.ID,
Number: 5,
Status: model.StatusSuccess,
Commit: "85f8c029b902ed9400bc600bac301a0aadb144ac",
}
s.CreateBuild(&build, []*model.Proc{}...)
s.CreateBuild(&build)
build.Status = model.StatusRunning
err1 := s.UpdateBuild(&build)
getbuild, err2 := s.GetBuild(build.ID)
Expand All @@ -56,7 +69,7 @@ func TestBuilds(t *testing.T) {

g.It("Should Get a Build", func() {
build := model.Build{
RepoID: 1,
RepoID: repo.ID,
Status: model.StatusSuccess,
}
s.CreateBuild(&build, []*model.Proc{}...)
Expand All @@ -69,11 +82,11 @@ func TestBuilds(t *testing.T) {

g.It("Should Get a Build by Number", func() {
build1 := &model.Build{
RepoID: 1,
RepoID: repo.ID,
Status: model.StatusPending,
}
build2 := &model.Build{
RepoID: 1,
RepoID: repo.ID,
Status: model.StatusPending,
}
err1 := s.CreateBuild(build1, []*model.Proc{}...)
Expand All @@ -89,12 +102,12 @@ func TestBuilds(t *testing.T) {

g.It("Should Get a Build by Ref", func() {
build1 := &model.Build{
RepoID: 1,
RepoID: repo.ID,
Status: model.StatusPending,
Ref: "refs/pull/5",
}
build2 := &model.Build{
RepoID: 1,
RepoID: repo.ID,
Status: model.StatusPending,
Ref: "refs/pull/6",
}
Expand All @@ -112,12 +125,12 @@ func TestBuilds(t *testing.T) {

g.It("Should Get a Build by Ref", func() {
build1 := &model.Build{
RepoID: 1,
RepoID: repo.ID,
Status: model.StatusPending,
Ref: "refs/pull/5",
}
build2 := &model.Build{
RepoID: 1,
RepoID: repo.ID,
Status: model.StatusPending,
Ref: "refs/pull/6",
}
Expand All @@ -135,13 +148,13 @@ func TestBuilds(t *testing.T) {

g.It("Should Get a Build by Commit", func() {
build1 := &model.Build{
RepoID: 1,
RepoID: repo.ID,
Status: model.StatusPending,
Branch: "master",
Commit: "85f8c029b902ed9400bc600bac301a0aadb144ac",
}
build2 := &model.Build{
RepoID: 1,
RepoID: repo.ID,
Status: model.StatusPending,
Branch: "dev",
Commit: "85f8c029b902ed9400bc600bac301a0aadb144aa",
Expand All @@ -161,14 +174,14 @@ func TestBuilds(t *testing.T) {

g.It("Should Get the last Build", func() {
build1 := &model.Build{
RepoID: 1,
RepoID: repo.ID,
Status: model.StatusFailure,
Branch: "master",
Commit: "85f8c029b902ed9400bc600bac301a0aadb144ac",
Event: model.EventPush,
}
build2 := &model.Build{
RepoID: 1,
RepoID: repo.ID,
Status: model.StatusSuccess,
Branch: "master",
Commit: "85f8c029b902ed9400bc600bac301a0aadb144aa",
Expand All @@ -190,19 +203,19 @@ func TestBuilds(t *testing.T) {

g.It("Should Get the last Build Before Build N", func() {
build1 := &model.Build{
RepoID: 1,
RepoID: repo.ID,
Status: model.StatusFailure,
Branch: "master",
Commit: "85f8c029b902ed9400bc600bac301a0aadb144ac",
}
build2 := &model.Build{
RepoID: 1,
RepoID: repo.ID,
Status: model.StatusSuccess,
Branch: "master",
Commit: "85f8c029b902ed9400bc600bac301a0aadb144aa",
}
build3 := &model.Build{
RepoID: 1,
RepoID: repo.ID,
Status: model.StatusRunning,
Branch: "master",
Commit: "85f8c029b902ed9400bc600bac301a0aadb144aa",
Expand All @@ -225,11 +238,11 @@ func TestBuilds(t *testing.T) {

g.It("Should get recent Builds", func() {
build1 := &model.Build{
RepoID: 1,
RepoID: repo.ID,
Status: model.StatusFailure,
}
build2 := &model.Build{
RepoID: 1,
RepoID: repo.ID,
Status: model.StatusSuccess,
}
s.CreateBuild(build1, []*model.Proc{}...)
Expand All @@ -243,3 +256,58 @@ func TestBuilds(t *testing.T) {
})
})
}

func TestBuildIncrement(t *testing.T) {
s := newTest()
defer func() {
s.Exec("delete from repos")
s.Exec("delete from builds")
s.Close()
}()

repo := &model.Repo{
UserID: 1,
FullName: "bradrydzewski/drone",
Owner: "bradrydzewski",
Name: "drone",
}
if err := s.CreateRepo(repo); err != nil {
t.Error(err)
}

num, err := s.incrementRepo(repo.ID, 0, 1)
if err != nil {
t.Error(err)
}

if got, want := num, 1; got != want {
t.Errorf("Want repository counter incremented to %d, got %d", want, got)
}

num, err = s.incrementRepo(repo.ID, 1, 2)
if err != nil {
t.Error(err)
}

if got, want := num, 2; got != want {
t.Errorf("Want repository counter incremented to %d, got %d", want, got)
}

// this block tests incrementing the repository counter
// should fail when attempting to increment the counter
// from a stale base.
num, _ = s.incrementRepo(repo.ID, 1, 2)
if num != 0 {
t.Errorf("Want error when trying to increment stale number")
}

// this block tests incrementing the repository counter
// using the given repository id with backoff.
num, err = s.incrementRepoRetry(repo.ID)
if err != nil {
t.Error(err)
}
if got, want := num, 3; got != want {
t.Errorf("Want repository counter incremented to %d, got %d", want, got)
}
}
18 changes: 13 additions & 5 deletions store/datastore/config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,23 @@ func TestConfigApproved(t *testing.T) {
defer func() {
s.Exec("delete from config")
s.Exec("delete from builds")
s.Exec("delete from repos")
s.Close()
}()

repo := &model.Repo{
UserID: 1,
FullName: "bradrydzewski/drone",
Owner: "bradrydzewski",
Name: "drone",
}
s.CreateRepo(repo)

var (
data = "pipeline: [ { image: golang, commands: [ go build, go test ] } ]"
hash = "8d8647c9aa90d893bfb79dddbe901f03e258588121e5202632f8ae5738590b26"
conf = &model.Config{
RepoID: 1,
RepoID: repo.ID,
Data: data,
Hash: hash,
}
Expand All @@ -79,15 +88,14 @@ func TestConfigApproved(t *testing.T) {
t.Errorf("Unexpected error: insert config: %s", err)
return
}

s.CreateBuild(&model.Build{
RepoID: 1,
RepoID: repo.ID,
ConfigID: conf.ID,
Status: model.StatusBlocked,
Commit: "85f8c029b902ed9400bc600bac301a0aadb144ac",
})
s.CreateBuild(&model.Build{
RepoID: 1,
RepoID: repo.ID,
ConfigID: conf.ID,
Status: model.StatusPending,
Commit: "85f8c029b902ed9400bc600bac301a0aadb144ac",
Expand All @@ -99,7 +107,7 @@ func TestConfigApproved(t *testing.T) {
}

s.CreateBuild(&model.Build{
RepoID: 1,
RepoID: repo.ID,
ConfigID: conf.ID,
Status: model.StatusRunning,
Commit: "85f8c029b902ed9400bc600bac301a0aadb144ac",
Expand Down
Loading

0 comments on commit 0b4dbf8

Please sign in to comment.