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
0
Merge Requests
0
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
Tatuya Kamada
gitlab-ce
Commits
d071f61b
Commit
d071f61b
authored
Sep 05, 2016
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Forget about pending duration for now, need more discussion
parent
7aaed299
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
49 deletions
+11
-49
app/models/ci/pipeline.rb
app/models/ci/pipeline.rb
+1
-2
db/migrate/20160829122117_add_pending_duration_to_pipelines.rb
...grate/20160829122117_add_pending_duration_to_pipelines.rb
+0
-7
db/schema.rb
db/schema.rb
+0
-1
lib/gitlab/ci/pipeline_duration.rb
lib/gitlab/ci/pipeline_duration.rb
+10
-39
No files found.
app/models/ci/pipeline.rb
View file @
d071f61b
...
...
@@ -260,8 +260,7 @@ module Ci
def
update_duration
return
unless
started_at
self
.
duration
,
self
.
pending_duration
=
Gitlab
::
Ci
::
PipelineDuration
.
from_pipeline
(
self
)
self
.
duration
=
Gitlab
::
Ci
::
PipelineDuration
.
from_pipeline
(
self
)
end
def
execute_hooks
...
...
db/migrate/20160829122117_add_pending_duration_to_pipelines.rb
deleted
100644 → 0
View file @
7aaed299
class
AddPendingDurationToPipelines
<
ActiveRecord
::
Migration
DOWNTIME
=
false
def
change
add_column
:ci_commits
,
:pending_duration
,
:integer
end
end
db/schema.rb
View file @
d071f61b
...
...
@@ -210,7 +210,6 @@ ActiveRecord::Schema.define(version: 20160831223750) do
t
.
datetime
"finished_at"
t
.
integer
"duration"
t
.
integer
"user_id"
t
.
integer
"pending_duration"
end
add_index
"ci_commits"
,
[
"gl_project_id"
,
"sha"
],
name:
"index_ci_commits_on_gl_project_id_and_sha"
,
using: :btree
...
...
lib/gitlab/ci/pipeline_duration.rb
View file @
d071f61b
module
Gitlab
module
Ci
# # Introduction - total running time
#
# The problem this class is trying to solve is finding the total running
# time amongst all the jobs, excluding retries and pending (queue) time.
# We could reduce this problem down to finding the union of periods.
#
# So each job would be represented as a `Period`, which consists of
# `Period#first` and `Period#last`. A simple example here would be:
# `Period#first` as when the job started and `Period#last` as when the
# job was finished. A simple example here would be:
#
# * A (1, 3)
# * B (2, 4)
...
...
@@ -24,22 +27,7 @@ module Gitlab
#
# (4 - 1) + (7 - 6) => 4
#
# And the pending (queue) time would be (4, 6) like this: (marked as X)
#
# 0 1 2 3 4 5 6 7
# AAAAAAA
# BBBBBBB
# CCCC
# XXXXX
#
# Which could be calculated by having (1, 7) as total time, minus
# the running time we have above, 4. The full calculation would be:
#
# total = (7 - 1)
# duration = (4 - 1) + (7 - 6)
# pending = total - duration # 6 - 4 => 2
#
# Which the answer to pending would be 2 in this example.
# # The Algorithm
#
# The algorithm used here for union would be described as follow.
# First we make sure that all periods are sorted by `Period#first`.
...
...
@@ -82,22 +70,12 @@ module Gitlab
# `C.first <= D.last` is `false`. Therefore we need to keep both C
# and D. The example would end here because there are no more jobs.
#
# After having the union of all periods, the rest is simple and
# described in the beginning. To summarise:
#
# duration = (4 - 1) + (7 - 6)
# total = (7 - 1)
# pending = total - duration # 6 - 4 => 2
#
# Note that the pending time is actually not the final pending time
# for pipelines, because we still need to accumulate the pending time
# before the first job (A in this example) even started! That is:
# After having the union of all periods, we just need to sum the length
# of all periods to get total time.
#
#
total_pending = pipeline.started_at - pipeline.created_at + pending
#
(4 - 1) + (7 - 6) => 4
#
# Would be the final answer. We deal with that in pipeline itself
# but not here because here we try not to be depending on pipeline
# and it's trivial enough to get that information.
# That is 4 is the answer in the example.
class
PipelineDuration
PeriodStruct
=
Struct
.
new
(
:first
,
:last
)
class
Period
<
PeriodStruct
...
...
@@ -107,17 +85,10 @@ module Gitlab
end
def
self
.
from_pipeline
(
pipeline
)
now
=
Time
.
now
status
=
%w[success failed running canceled]
builds
=
pipeline
.
builds
.
latest
.
where
(
status:
status
)
running
=
from_builds
(
builds
,
:started_at
,
:finished_at
,
now
).
duration
pending
=
pipeline
.
started_at
-
pipeline
.
created_at
queuing
=
builds
.
inject
(
0
)
do
|
result
,
job
|
result
+
((
job
.
started_at
||
now
)
-
(
job
.
queued_at
||
now
))
end
[
running
,
pending
+
queuing
]
from_builds
(
builds
,
:started_at
,
:finished_at
).
duration
end
def
self
.
from_builds
(
builds
,
from
,
to
,
now
=
Time
.
now
)
...
...
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