Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
6f1a6640
Commit
6f1a6640
authored
Dec 10, 2019
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add environment auto stop worker
This commit adds environment auto stop worker
parent
81cf8a7c
Changes
17
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
401 additions
and
2 deletions
+401
-2
app/models/deployment.rb
app/models/deployment.rb
+1
-0
app/models/environment.rb
app/models/environment.rb
+39
-0
app/services/ci/stop_environments_service.rb
app/services/ci/stop_environments_service.rb
+16
-0
app/services/environments/auto_stop_service.rb
app/services/environments/auto_stop_service.rb
+38
-0
app/workers/all_queues.yml
app/workers/all_queues.yml
+6
-0
app/workers/environments/auto_stop_cron_worker.rb
app/workers/environments/auto_stop_cron_worker.rb
+16
-0
config/gitlab.yml.example
config/gitlab.yml.example
+3
-0
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+3
-0
db/migrate/20200131140428_create_index_on_auto_stop_in.rb
db/migrate/20200131140428_create_index_on_auto_stop_in.rb
+17
-0
db/schema.rb
db/schema.rb
+2
-0
spec/factories/environments.rb
spec/factories/environments.rb
+1
-1
spec/models/deployment_spec.rb
spec/models/deployment_spec.rb
+16
-0
spec/models/environment_spec.rb
spec/models/environment_spec.rb
+68
-1
spec/services/ci/stop_environments_service_spec.rb
spec/services/ci/stop_environments_service_spec.rb
+51
-0
spec/services/environments/auto_stop_service_spec.rb
spec/services/environments/auto_stop_service_spec.rb
+94
-0
spec/support/helpers/create_environments_helpers.rb
spec/support/helpers/create_environments_helpers.rb
+13
-0
spec/workers/environments/auto_stop_cron_worker_spec.rb
spec/workers/environments/auto_stop_cron_worker_spec.rb
+17
-0
No files found.
app/models/deployment.rb
View file @
6f1a6640
...
...
@@ -39,6 +39,7 @@ class Deployment < ApplicationRecord
scope
:for_status
,
->
(
status
)
{
where
(
status:
status
)
}
scope
:visible
,
->
{
where
(
status:
%i[running success failed canceled]
)
}
scope
:stoppable
,
->
{
where
.
not
(
on_stop:
nil
).
where
.
not
(
deployable_id:
nil
).
success
}
state_machine
:status
,
initial: :created
do
event
:run
do
...
...
app/models/environment.rb
View file @
6f1a6640
...
...
@@ -61,6 +61,7 @@ class Environment < ApplicationRecord
scope
:in_review_folder
,
->
{
where
(
environment_type:
"review"
)
}
scope
:for_name
,
->
(
name
)
{
where
(
name:
name
)
}
scope
:preload_cluster
,
->
{
preload
(
last_deployment: :cluster
)
}
scope
:auto_stoppable
,
->
(
limit
)
{
available
.
where
(
'auto_stop_at < ?'
,
Time
.
zone
.
now
).
limit
(
limit
)
}
##
# Search environments which have names like the given query.
...
...
@@ -107,6 +108,44 @@ class Environment < ApplicationRecord
find_or_create_by
(
name:
name
)
end
class
<<
self
##
# This method returns stop actions (jobs) for multiple environments within one
# query. It's useful to avoid N+1 problem.
#
# NOTE: The count of environments should be small~medium (e.g. < 5000)
def
stop_actions
cte
=
cte_for_deployments_with_stop_action
ci_builds
=
Ci
::
Build
.
arel_table
inner_join_stop_actions
=
ci_builds
.
join
(
cte
.
table
).
on
(
ci_builds
[
:project_id
].
eq
(
cte
.
table
[
:project_id
])
.
and
(
ci_builds
[
:ref
].
eq
(
cte
.
table
[
:ref
]))
.
and
(
ci_builds
[
:name
].
eq
(
cte
.
table
[
:on_stop
]))
).
join_sources
pipeline_ids
=
ci_builds
.
join
(
cte
.
table
).
on
(
ci_builds
[
:id
].
eq
(
cte
.
table
[
:deployable_id
])
).
project
(
:commit_id
)
Ci
::
Build
.
joins
(
inner_join_stop_actions
)
.
with
(
cte
.
to_arel
)
.
where
(
ci_builds
[
:commit_id
].
in
(
pipeline_ids
))
.
where
(
status:
HasStatus
::
BLOCKED_STATUS
)
.
preload_project_and_pipeline_project
.
preload
(
:user
,
:metadata
,
:deployment
)
end
private
def
cte_for_deployments_with_stop_action
Gitlab
::
SQL
::
CTE
.
new
(
:deployments_with_stop_action
,
Deployment
.
where
(
environment_id:
select
(
:id
))
.
distinct_on_environment
.
stoppable
)
end
end
def
clear_prometheus_reactive_cache!
(
query_name
)
cluster_prometheus_adapter
&
.
clear_prometheus_reactive_cache!
(
query_name
,
self
)
end
...
...
app/services/ci/stop_environments_service.rb
View file @
6f1a6640
...
...
@@ -16,6 +16,22 @@ module Ci
merge_request
.
environments
.
each
{
|
environment
|
stop
(
environment
)
}
end
##
# This method is for stopping multiple environments in a batch style.
# The maximum acceptable count of environments is roughly 5000. Please
# apply acceptable `LIMIT` clause to the `environments` relation.
def
self
.
execute_in_batch
(
environments
)
stop_actions
=
environments
.
stop_actions
.
load
environments
.
update_all
(
auto_stop_at:
nil
,
state:
'stopped'
)
stop_actions
.
each
do
|
stop_action
|
stop_action
.
play
(
stop_action
.
user
)
rescue
=>
e
Gitlab
::
ErrorTracking
.
track_error
(
e
,
deployable_id:
stop_action
.
id
)
end
end
private
def
environments
...
...
app/services/environments/auto_stop_service.rb
0 → 100644
View file @
6f1a6640
# frozen_string_literal: true
module
Environments
class
AutoStopService
include
::
Gitlab
::
ExclusiveLeaseHelpers
include
::
Gitlab
::
LoopHelpers
BATCH_SIZE
=
100
LOOP_TIMEOUT
=
45
.
minutes
LOOP_LIMIT
=
1000
EXCLUSIVE_LOCK_KEY
=
'environments:auto_stop:lock'
LOCK_TIMEOUT
=
50
.
minutes
##
# Stop expired environments on GitLab instance
#
# This auto stop process cannot run for more than 45 minutes. This is for
# preventing multiple `AutoStopCronWorker` CRON jobs run concurrently,
# which is scheduled at every hour.
def
execute
in_lock
(
EXCLUSIVE_LOCK_KEY
,
ttl:
LOCK_TIMEOUT
,
retries:
1
)
do
loop_until
(
timeout:
LOOP_TIMEOUT
,
limit:
LOOP_LIMIT
)
do
stop_in_batch
end
end
end
private
def
stop_in_batch
environments
=
Environment
.
auto_stoppable
(
BATCH_SIZE
)
return
false
unless
environments
.
exists?
&&
Feature
.
enabled?
(
:auto_stop_environments
)
Ci
::
StopEnvironmentsService
.
execute_in_batch
(
environments
)
end
end
end
app/workers/all_queues.yml
View file @
6f1a6640
...
...
@@ -75,6 +75,12 @@
:latency_sensitive:
:resource_boundary: :unknown
:weight:
1
-
:name: cronjob:environments_auto_stop_cron
:feature_category: :continuous_delivery
:has_external_dependencies:
:latency_sensitive:
:resource_boundary: :unknown
:weight:
1
-
:name: cronjob:expire_build_artifacts
:feature_category: :continuous_integration
:has_external_dependencies:
...
...
app/workers/environments/auto_stop_cron_worker.rb
0 → 100644
View file @
6f1a6640
# frozen_string_literal: true
module
Environments
class
AutoStopCronWorker
include
ApplicationWorker
include
CronjobQueue
# rubocop:disable Scalability/CronWorkerContext
feature_category
:continuous_delivery
def
perform
return
unless
Feature
.
enabled?
(
:auto_stop_environments
)
AutoStopService
.
new
.
execute
end
end
end
config/gitlab.yml.example
View file @
6f1a6640
...
...
@@ -373,6 +373,9 @@ production: &base
# Remove expired build artifacts
expire_build_artifacts_worker:
cron: "50 * * * *"
# Stop expired environments
environments_auto_stop_cron_worker:
cron: "24 * * * *"
# Periodically run 'git fsck' on all repositories. If started more than
# once per hour you will have concurrent 'git fsck' jobs.
repository_check_worker:
...
...
config/initializers/1_settings.rb
View file @
6f1a6640
...
...
@@ -403,6 +403,9 @@ Settings.cron_jobs['pipeline_schedule_worker']['job_class'] = 'PipelineScheduleW
Settings
.
cron_jobs
[
'expire_build_artifacts_worker'
]
||=
Settingslogic
.
new
({})
Settings
.
cron_jobs
[
'expire_build_artifacts_worker'
][
'cron'
]
||=
'50 * * * *'
Settings
.
cron_jobs
[
'expire_build_artifacts_worker'
][
'job_class'
]
=
'ExpireBuildArtifactsWorker'
Settings
.
cron_jobs
[
'environments_auto_stop_cron_worker'
]
||=
Settingslogic
.
new
({})
Settings
.
cron_jobs
[
'environments_auto_stop_cron_worker'
][
'cron'
]
||=
'24 * * * *'
Settings
.
cron_jobs
[
'environments_auto_stop_cron_worker'
][
'job_class'
]
=
'Environments::AutoStopCronWorker'
Settings
.
cron_jobs
[
'repository_check_worker'
]
||=
Settingslogic
.
new
({})
Settings
.
cron_jobs
[
'repository_check_worker'
][
'cron'
]
||=
'20 * * * *'
Settings
.
cron_jobs
[
'repository_check_worker'
][
'job_class'
]
=
'RepositoryCheck::DispatchWorker'
...
...
db/migrate/20200131140428_create_index_on_auto_stop_in.rb
0 → 100644
View file @
6f1a6640
# frozen_string_literal: true
class
CreateIndexOnAutoStopIn
<
ActiveRecord
::
Migration
[
6.0
]
include
Gitlab
::
Database
::
MigrationHelpers
DOWNTIME
=
false
disable_ddl_transaction!
def
up
add_concurrent_index
:environments
,
%i[state auto_stop_at]
,
where:
"auto_stop_at IS NOT NULL AND state = 'available'"
end
def
down
remove_concurrent_index
:environments
,
%i[state auto_stop_at]
end
end
db/schema.rb
View file @
6f1a6640
...
...
@@ -1494,10 +1494,12 @@ ActiveRecord::Schema.define(version: 2020_02_12_052620) do
t
.
string
"state"
,
default:
"available"
,
null:
false
t
.
string
"slug"
,
null:
false
t
.
datetime_with_timezone
"auto_stop_at"
t
.
index
[
"auto_stop_at"
],
name:
"index_environments_on_auto_stop_at"
,
where:
"(auto_stop_at IS NOT NULL)"
t
.
index
[
"name"
],
name:
"index_environments_on_name_varchar_pattern_ops"
,
opclass: :varchar_pattern_ops
t
.
index
[
"project_id"
,
"name"
],
name:
"index_environments_on_project_id_and_name"
,
unique:
true
t
.
index
[
"project_id"
,
"slug"
],
name:
"index_environments_on_project_id_and_slug"
,
unique:
true
t
.
index
[
"project_id"
,
"state"
,
"environment_type"
],
name:
"index_environments_on_project_id_state_environment_type"
t
.
index
[
"state"
,
"auto_stop_at"
],
name:
"index_environments_on_state_and_auto_stop_at"
,
where:
"((auto_stop_at IS NOT NULL) AND ((state)::text = 'available'::text))"
end
create_table
"epic_issues"
,
id: :serial
,
force: :cascade
do
|
t
|
...
...
spec/factories/environments.rb
View file @
6f1a6640
...
...
@@ -45,7 +45,7 @@ FactoryBot.define do
self
.
when
{
'manual'
}
end
trait
:auto_stopp
ed
do
trait
:auto_stopp
able
do
auto_stop_at
{
1
.
day
.
ago
}
end
...
...
spec/models/deployment_spec.rb
View file @
6f1a6640
...
...
@@ -51,6 +51,22 @@ describe Deployment do
end
end
describe
'.stoppable'
do
subject
{
described_class
.
stoppable
}
context
'when deployment is stoppable'
do
let!
(
:deployment
)
{
create
(
:deployment
,
:success
,
on_stop:
'stop-review'
)
}
it
{
is_expected
.
to
eq
([
deployment
])
}
end
context
'when deployment is not stoppable'
do
let!
(
:deployment
)
{
create
(
:deployment
,
:failed
)
}
it
{
is_expected
.
to
be_empty
}
end
end
describe
'.success'
do
subject
{
described_class
.
success
}
...
...
spec/models/environment_spec.rb
View file @
6f1a6640
...
...
@@ -7,6 +7,7 @@ describe Environment, :use_clean_rails_memory_store_caching do
using
RSpec
::
Parameterized
::
TableSyntax
include
RepoHelpers
include
StubENV
include
CreateEnvironmentsHelpers
let
(
:project
)
{
create
(
:project
,
:repository
)
}
...
...
@@ -114,6 +115,72 @@ describe Environment, :use_clean_rails_memory_store_caching do
end
end
describe
'.auto_stoppable'
do
subject
{
described_class
.
auto_stoppable
(
limit
)
}
let
(
:limit
)
{
100
}
context
'when environment is auto-stoppable'
do
let!
(
:environment
)
{
create
(
:environment
,
:auto_stoppable
)
}
it
{
is_expected
.
to
eq
([
environment
])
}
end
context
'when environment is not auto-stoppable'
do
let!
(
:environment
)
{
create
(
:environment
)
}
it
{
is_expected
.
to
be_empty
}
end
end
describe
'.stop_actions'
do
subject
{
environments
.
stop_actions
}
let_it_be
(
:project
)
{
create
(
:project
,
:repository
)
}
let_it_be
(
:user
)
{
create
(
:user
)
}
let
(
:environments
)
{
Environment
.
all
}
before_all
do
project
.
add_developer
(
user
)
project
.
repository
.
add_branch
(
user
,
'review/feature-1'
,
'master'
)
project
.
repository
.
add_branch
(
user
,
'review/feature-2'
,
'master'
)
end
shared_examples_for
'correct filtering'
do
it
'returns stop actions for available environments only'
do
expect
(
subject
.
count
).
to
eq
(
1
)
expect
(
subject
.
first
.
name
).
to
eq
(
'stop_review_app'
)
expect
(
subject
.
first
.
ref
).
to
eq
(
'review/feature-1'
)
end
end
before
do
create_review_app
(
user
,
project
,
'review/feature-1'
)
create_review_app
(
user
,
project
,
'review/feature-2'
)
end
it
'returns stop actions for environments'
do
expect
(
subject
.
count
).
to
eq
(
2
)
expect
(
subject
).
to
match_array
(
Ci
::
Build
.
where
(
name:
'stop_review_app'
))
end
context
'when one of the stop actions has already been executed'
do
before
do
Ci
::
Build
.
where
(
ref:
'review/feature-2'
).
find_by_name
(
'stop_review_app'
).
enqueue!
end
it_behaves_like
'correct filtering'
end
context
'when one of the deployments does not have stop action'
do
before
do
Deployment
.
where
(
ref:
'review/feature-2'
).
update_all
(
on_stop:
nil
)
end
it_behaves_like
'correct filtering'
end
end
describe
'.pluck_names'
do
subject
{
described_class
.
pluck_names
}
...
...
@@ -449,7 +516,7 @@ describe Environment, :use_clean_rails_memory_store_caching do
describe
'#reset_auto_stop'
do
subject
{
environment
.
reset_auto_stop
}
let
(
:environment
)
{
create
(
:environment
,
:auto_stopp
ed
)
}
let
(
:environment
)
{
create
(
:environment
,
:auto_stopp
able
)
}
it
'nullifies the auto_stop_at'
do
expect
{
subject
}.
to
change
(
environment
,
:auto_stop_at
).
from
(
Time
).
to
(
nil
)
...
...
spec/services/ci/stop_environments_service_spec.rb
View file @
6f1a6640
...
...
@@ -3,6 +3,8 @@
require
'spec_helper'
describe
Ci
::
StopEnvironmentsService
do
include
CreateEnvironmentsHelpers
let
(
:project
)
{
create
(
:project
,
:private
,
:repository
)
}
let
(
:user
)
{
create
(
:user
)
}
...
...
@@ -181,6 +183,55 @@ describe Ci::StopEnvironmentsService do
end
end
describe
'.execute_in_batch'
do
subject
{
described_class
.
execute_in_batch
(
environments
)
}
let_it_be
(
:project
)
{
create
(
:project
,
:repository
)
}
let_it_be
(
:user
)
{
create
(
:user
)
}
let
(
:environments
)
{
Environment
.
available
}
before_all
do
project
.
add_developer
(
user
)
project
.
repository
.
add_branch
(
user
,
'review/feature-1'
,
'master'
)
project
.
repository
.
add_branch
(
user
,
'review/feature-2'
,
'master'
)
end
before
do
create_review_app
(
user
,
project
,
'review/feature-1'
)
create_review_app
(
user
,
project
,
'review/feature-2'
)
end
it
'stops environments'
do
expect
{
subject
}
.
to
change
{
project
.
environments
.
all
.
map
(
&
:state
).
uniq
}
.
from
([
'available'
]).
to
([
'stopped'
])
expect
(
project
.
environments
.
all
.
map
(
&
:auto_stop_at
).
uniq
).
to
eq
([
nil
])
end
it
'plays stop actions'
do
expect
{
subject
}
.
to
change
{
Ci
::
Build
.
where
(
name:
'stop_review_app'
).
map
(
&
:status
).
uniq
}
.
from
([
'manual'
]).
to
([
'pending'
])
end
context
'when user does not have a permission to play the stop action'
do
before
do
Ci
::
Build
.
find_by_ref
(
'review/feature-2'
).
update_column
(
:user_id
,
nil
)
end
it
'tracks the exception'
do
deployable
=
Ci
::
Build
.
find_by_ref
(
'review/feature-2'
)
expect
(
Gitlab
::
ErrorTracking
)
.
to
receive
(
:track_error
)
.
with
(
Gitlab
::
Access
::
AccessDeniedError
,
deployable_id:
deployable
.
id
).
once
subject
end
end
end
def
expect_environment_stopped_on
(
branch
)
expect_any_instance_of
(
Environment
)
.
to
receive
(
:stop!
)
...
...
spec/services/environments/auto_stop_service_spec.rb
0 → 100644
View file @
6f1a6640
# frozen_string_literal: true
require
'spec_helper'
describe
Environments
::
AutoStopService
,
:clean_gitlab_redis_shared_state
do
include
CreateEnvironmentsHelpers
include
ExclusiveLeaseHelpers
let_it_be
(
:project
)
{
create
(
:project
,
:repository
)
}
let_it_be
(
:user
)
{
create
(
:user
)
}
let
(
:service
)
{
described_class
.
new
}
before_all
do
project
.
add_developer
(
user
)
end
describe
'#execute'
do
subject
{
service
.
execute
}
let_it_be
(
:project
)
{
create
(
:project
,
:repository
)
}
let_it_be
(
:user
)
{
create
(
:user
)
}
let
(
:environments
)
{
Environment
.
all
}
before_all
do
project
.
add_developer
(
user
)
project
.
repository
.
add_branch
(
user
,
'review/feature-1'
,
'master'
)
project
.
repository
.
add_branch
(
user
,
'review/feature-2'
,
'master'
)
end
before
do
create_review_app
(
user
,
project
,
'review/feature-1'
)
create_review_app
(
user
,
project
,
'review/feature-2'
)
end
it
'stops environments and play stop jobs'
do
expect
{
subject
}
.
to
change
{
Environment
.
all
.
map
(
&
:state
).
uniq
}
.
from
([
'available'
]).
to
([
'stopped'
])
expect
(
Ci
::
Build
.
where
(
name:
'stop_review_app'
).
map
(
&
:status
).
uniq
).
to
eq
([
'pending'
])
end
context
'when auto_stop_environments feature flag is disabled'
do
before
do
stub_feature_flags
(
auto_stop_environments:
false
)
end
it
'does not execute Ci::StopEnvironmentsService'
do
expect
(
Ci
::
StopEnvironmentsService
).
not_to
receive
(
:execute_in_batch
)
subject
end
end
context
'when the other sidekiq worker has already been running'
do
before
do
stub_exclusive_lease_taken
(
described_class
::
EXCLUSIVE_LOCK_KEY
)
end
it
'does not execute stop_in_batch'
do
expect_next_instance_of
(
described_class
)
do
|
service
|
expect
(
service
).
not_to
receive
(
:stop_in_batch
)
end
expect
{
subject
}.
to
raise_error
(
Gitlab
::
ExclusiveLeaseHelpers
::
FailedToObtainLockError
)
end
end
context
'when loop reached timeout'
do
before
do
stub_const
(
"
#{
described_class
}
::LOOP_TIMEOUT"
,
0
.
seconds
)
stub_const
(
"
#{
described_class
}
::LOOP_LIMIT"
,
100_000
)
allow_next_instance_of
(
described_class
)
do
|
service
|
allow
(
service
).
to
receive
(
:stop_in_batch
)
{
true
}
end
end
it
'returns false and does not continue the process'
do
is_expected
.
to
eq
(
false
)
end
end
context
'when loop reached loop limit'
do
before
do
stub_const
(
"
#{
described_class
}
::LOOP_LIMIT"
,
1
)
stub_const
(
"
#{
described_class
}
::BATCH_SIZE"
,
1
)
end
it
'stops only one available environment'
do
expect
{
subject
}.
to
change
{
Environment
.
available
.
count
}.
by
(
-
1
)
end
end
end
end
spec/support/helpers/create_environments_helpers.rb
0 → 100644
View file @
6f1a6640
# frozen_string_literal: true
module
CreateEnvironmentsHelpers
def
create_review_app
(
user
,
project
,
ref
)
common
=
{
project:
project
,
ref:
ref
,
user:
user
}
pipeline
=
create
(
:ci_pipeline
,
**
common
)
start_review
=
create
(
:ci_build
,
:start_review_app
,
:success
,
**
common
,
pipeline:
pipeline
)
stop_review
=
create
(
:ci_build
,
:stop_review_app
,
:manual
,
**
common
,
pipeline:
pipeline
)
environment
=
create
(
:environment
,
:auto_stoppable
,
project:
project
,
name:
ref
)
create
(
:deployment
,
:success
,
**
common
,
on_stop:
stop_review
.
name
,
deployable:
start_review
,
environment:
environment
)
end
end
spec/workers/environments/auto_stop_cron_worker_spec.rb
0 → 100644
View file @
6f1a6640
# frozen_string_literal: true
require
'spec_helper'
describe
Environments
::
AutoStopCronWorker
do
subject
{
worker
.
perform
}
let
(
:worker
)
{
described_class
.
new
}
it
'executes Environments::AutoStopService'
do
expect_next_instance_of
(
Environments
::
AutoStopService
)
do
|
service
|
expect
(
service
).
to
receive
(
:execute
)
end
subject
end
end
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