mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2024-12-23 08:56:29 +00:00
Code Issues Projects Releases Wiki Activity

Task dependencies to survive restarts

Browse source
This commit is contained in:
Laszlo Fogas 2019-06-25 12:07:36 +02:00
parent 84564f9ae5
commit be0d1d73fb
13 changed files with 114 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
model/queue.go
View file

@ -23,9 +23,11 @@ import (
// Task defines scheduled pipeline Task.
type Task struct {
ID string `meddler:"task_id"`
Data []byte `meddler:"task_data"`
Labels map[string]string `meddler:"task_labels,json"`
ID string `meddler:"task_id"`
Data []byte `meddler:"task_data"`
Labels map[string]string `meddler:"task_labels,json"`
Dependencies []string `meddler:"task_dependencies,json"`
RunOn []string `meddler:"task_run_on,json"`
}
// TaskStore defines storage for scheduled Tasks.
@ -39,13 +41,18 @@ type TaskStore interface {
// ensures the task Queue can be restored when the system starts.
func WithTaskStore(q queue.Queue, s TaskStore) queue.Queue {
tasks, _ := s.TaskList()
toEnqueue := []*queue.Task{}
for _, task := range tasks {
q.Push(context.Background(), &queue.Task{
ID: task.ID,
Data: task.Data,
Labels: task.Labels,
toEnqueue = append(toEnqueue, &queue.Task{
ID: task.ID,
Data: task.Data,
Labels: task.Labels,
Dependencies: task.Dependencies,
RunOn: task.RunOn,
DepStatus: make(map[string]bool),
})
}
q.PushAtOnce(context.Background(), toEnqueue)
return &persistentQueue{q, s}
}
@ -57,9 +64,11 @@ type persistentQueue struct {
// Push pushes a task to the tail of this queue.
func (q *persistentQueue) Push(c context.Context, task *queue.Task) error {
q.store.TaskInsert(&Task{
ID: task.ID,
Data: task.Data,
Labels: task.Labels,
ID: task.ID,
Data: task.Data,
Labels: task.Labels,
Dependencies: task.Dependencies,
RunOn: task.RunOn,
})
err := q.Queue.Push(c, task)
if err != nil {
@ -72,9 +81,11 @@ func (q *persistentQueue) Push(c context.Context, task *queue.Task) error {
func (q *persistentQueue) PushAtOnce(c context.Context, tasks []*queue.Task) error {
for _, task := range tasks {
q.store.TaskInsert(&Task{
ID: task.ID,
Data: task.Data,
Labels: task.Labels,
ID: task.ID,
Data: task.Data,
Labels: task.Labels,
Dependencies: task.Dependencies,
RunOn: task.RunOn,
})
}
err := q.Queue.PushAtOnce(c, tasks)

20
store/datastore/ddl/mysql/ddl_gen.go
View file

@ -172,6 +172,14 @@ var migrations = []struct {
name: "populate-build-config",
stmt: populateBuildConfig,
},
{
name: "alter-table-add-task-dependencies",
stmt: alterTableAddTaskDependencies,
},
{
name: "alter-table-add-task-run-on",
stmt: alterTableAddTaskRunOn,
},
}
// Migrate performs the database migration. If the migration fails
@ -673,3 +681,15 @@ var populateBuildConfig = `
INSERT INTO build_config (config_id, build_id)
SELECT build_config_id, build_id FROM builds
`
//
// 022_add_task_columns.sql
//
var alterTableAddTaskDependencies = `
ALTER TABLE tasks ADD COLUMN task_dependencies MEDIUMBLOB
`
var alterTableAddTaskRunOn = `
ALTER TABLE tasks ADD COLUMN task_run_on MEDIUMBLOB
`

6
store/datastore/ddl/mysql/files/022_add_task_columns.sql Normal file
View file

@ -0,0 +1,6 @@
-- name: alter-table-add-task-dependencies
ALTER TABLE tasks ADD COLUMN task_dependencies MEDIUMBLOB
-- name: alter-table-add-task-run-on
ALTER TABLE tasks ADD COLUMN task_run_on MEDIUMBLOB

20
store/datastore/ddl/postgres/ddl_gen.go
View file

@ -172,6 +172,14 @@ var migrations = []struct {
name: "populate-build-config",
stmt: populateBuildConfig,
},
{
name: "alter-table-add-task-dependencies",
stmt: alterTableAddTaskDependencies,
},
{
name: "alter-table-add-task-run-on",
stmt: alterTableAddTaskRunOn,
},
}
// Migrate performs the database migration. If the migration fails
@ -675,3 +683,15 @@ var populateBuildConfig = `
INSERT INTO build_config (config_id, build_id)
SELECT build_config_id, build_id FROM builds
`
//
// 022_add_task_columns.sql
//
var alterTableAddTaskDependencies = `
ALTER TABLE tasks ADD COLUMN task_dependencies BYTEA
`
var alterTableAddTaskRunOn = `
ALTER TABLE tasks ADD COLUMN task_run_on BYTEA
`

6
store/datastore/ddl/postgres/files/022_add_task_columns.sql Normal file
View file

@ -0,0 +1,6 @@
-- name: alter-table-add-task-dependencies
ALTER TABLE tasks ADD COLUMN task_dependencies BYTEA
-- name: alter-table-add-task-run-on
ALTER TABLE tasks ADD COLUMN task_run_on BYTEA

20
store/datastore/ddl/sqlite/ddl_gen.go
View file

@ -176,6 +176,14 @@ var migrations = []struct {
name: "populate-build-config",
stmt: populateBuildConfig,
},
{
name: "alter-table-add-task-dependencies",
stmt: alterTableAddTaskDependencies,
},
{
name: "alter-table-add-task-run-on",
stmt: alterTableAddTaskRunOn,
},
}
// Migrate performs the database migration. If the migration fails
@ -674,3 +682,15 @@ var populateBuildConfig = `
INSERT INTO build_config (config_id, build_id)
SELECT build_config_id, build_id FROM builds
`
//
// 022_add_task_columns.sql
//
var alterTableAddTaskDependencies = `
ALTER TABLE tasks ADD COLUMN task_dependencies BLOB
`
var alterTableAddTaskRunOn = `
ALTER TABLE tasks ADD COLUMN task_run_on BLOB
`

6
store/datastore/ddl/sqlite/files/022_add_task_columns.sql Normal file
View file

@ -0,0 +1,6 @@
-- name: alter-table-add-task-dependencies
ALTER TABLE tasks ADD COLUMN task_dependencies BLOB
-- name: alter-table-add-task-run-on
ALTER TABLE tasks ADD COLUMN task_run_on BLOB

2
store/datastore/sql/mysql/files/task.sql
View file

@ -4,6 +4,8 @@ SELECT
task_id
,task_data
,task_labels
,task_dependencies
,task_run_on
FROM tasks
-- name: task-delete

2
store/datastore/sql/mysql/sql_gen.go
View file

@ -554,6 +554,8 @@ SELECT
task_id
,task_data
,task_labels
,task_dependencies
,task_run_on
FROM tasks
`

2
store/datastore/sql/postgres/files/tasks.sql
View file

@ -4,6 +4,8 @@ SELECT
task_id
,task_data
,task_labels
,task_dependencies
,task_run_on
FROM tasks
-- name: task-delete

2
store/datastore/sql/postgres/sql_gen.go
View file

@ -559,6 +559,8 @@ SELECT
task_id
,task_data
,task_labels
,task_dependencies
,task_run_on
FROM tasks
`

2
store/datastore/sql/sqlite/files/task.sql
View file

@ -4,6 +4,8 @@ SELECT
task_id
,task_data
,task_labels
,task_dependencies
,task_run_on
FROM tasks
-- name: task-delete

2
store/datastore/sql/sqlite/sql_gen.go
View file

@ -554,6 +554,8 @@ SELECT
task_id
,task_data
,task_labels
,task_dependencies
,task_run_on
FROM tasks
`