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
e6f1cc02
Commit
e6f1cc02
authored
Jun 11, 2020
by
Aakriti Gupta
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor geo:status rake task
- use a helper module to break down status checks
parent
310511c7
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
269 additions
and
149 deletions
+269
-149
ee/lib/gitlab/geo/geo_node_status_check.rb
ee/lib/gitlab/geo/geo_node_status_check.rb
+240
-0
ee/lib/tasks/geo.rake
ee/lib/tasks/geo.rake
+1
-148
ee/spec/tasks/geo_rake_spec.rb
ee/spec/tasks/geo_rake_spec.rb
+28
-1
No files found.
ee/lib/gitlab/geo/geo_node_status_check.rb
0 → 100644
View file @
e6f1cc02
# frozen_string_literal: true
require
'action_view/helpers'
module
Gitlab
module
Geo
class
GeoNodeStatusCheck
include
ActionView
::
Helpers
::
DateHelper
include
ActionView
::
Helpers
::
NumberHelper
GEO_STATUS_COLUMN_WIDTH
=
40
attr_reader
:current_node_status
,
:geo_node
def
initialize
(
current_node_status
,
geo_node
)
@current_node_status
=
current_node_status
@geo_node
=
geo_node
end
def
print_status
print_current_node_info
print_postgres_version
print_gitlab_version
print_geo_role
print_node_health_status
print_repositories_status
print_verified_repositories
print_wikis_status
print_verified_wikis
print_lfs_objects_status
print_attachments_status
print_ci_job_artifacts_status
print_container_repositories_status
print_design_repositories_status
print_repositories_checked_status
print_sync_settings
print_db_replication_lag
print_last_event_id
print_last_status_report_time
puts
end
private
def
print_current_node_info
puts
puts
"Name:
#{
GeoNode
.
current_node_name
}
"
puts
"URL:
#{
GeoNode
.
current_node_url
}
"
puts
'-----------------------------------------------------'
.
color
(
:yellow
)
end
def
print_gitlab_version
print
'GitLab Version: '
.
rjust
(
GEO_STATUS_COLUMN_WIDTH
)
puts
Gitlab
::
VERSION
end
def
print_geo_role
print
'Geo Role: '
.
rjust
(
GEO_STATUS_COLUMN_WIDTH
)
role
=
if
Gitlab
::
Geo
.
primary?
'Primary'
else
Gitlab
::
Geo
.
secondary?
?
'Secondary'
:
'unknown'
.
color
(
:yellow
)
end
puts
role
end
def
print_node_health_status
print
'Health Status: '
.
rjust
(
GEO_STATUS_COLUMN_WIDTH
)
if
current_node_status
.
healthy?
puts
current_node_status
.
health_status
else
puts
current_node_status
.
health_status
.
color
(
:red
)
end
unless
current_node_status
.
healthy?
print
'Health Status Summary: '
.
rjust
(
GEO_STATUS_COLUMN_WIDTH
)
puts
current_node_status
.
health
.
color
(
:red
)
end
end
def
print_sync_settings
print
'Sync Settings: '
.
rjust
(
GEO_STATUS_COLUMN_WIDTH
)
puts
geo_node
.
namespaces
.
any?
?
'Selective'
:
'Full'
end
def
print_db_replication_lag
print
'Database replication lag: '
.
rjust
(
GEO_STATUS_COLUMN_WIDTH
)
puts
"
#{
Gitlab
::
Geo
::
HealthCheck
.
new
.
db_replication_lag_seconds
}
seconds"
end
# rubocop: disable CodeReuse/ActiveRecord
def
print_last_event_id
print
'Last event ID seen from primary: '
.
rjust
(
GEO_STATUS_COLUMN_WIDTH
)
last_event
=
::
Geo
::
EventLog
.
last
if
last_event
print
last_event
&
.
id
puts
" (
#{
time_ago_in_words
(
last_event
&
.
created_at
)
}
ago)"
print
'Last event ID processed by cursor: '
.
rjust
(
GEO_STATUS_COLUMN_WIDTH
)
cursor_last_event_id
=
::
Geo
::
EventLogState
.
last_processed
&
.
event_id
if
cursor_last_event_id
print
cursor_last_event_id
last_cursor_event_date
=
::
Geo
::
EventLog
.
find_by
(
id:
cursor_last_event_id
)
&
.
created_at
print
" (
#{
time_ago_in_words
(
last_cursor_event_date
)
}
ago)"
if
last_cursor_event_date
puts
else
puts
'N/A'
end
else
puts
'N/A'
end
end
# rubocop: enable CodeReuse/ActiveRecord
def
print_last_status_report_time
print
'Last status report was: '
.
rjust
(
GEO_STATUS_COLUMN_WIDTH
)
if
current_node_status
.
updated_at
puts
"
#{
time_ago_in_words
(
current_node_status
.
updated_at
)
}
ago"
else
# Only primary node can create a status record in the database so if
# it does not exist we get unsaved record where updated_at is nil
puts
'Never'
end
end
def
print_postgres_version
unless
Gitlab
::
Database
.
postgresql_minimum_supported_version?
puts
puts
'WARNING: Please upgrade PostgreSQL to version 9.6 or greater.'
\
' The status of the replication cannot be determined reliably '
\
'with the current version.'
.
color
(
:red
)
puts
end
end
def
print_repositories_status
print
'Repositories: '
.
rjust
(
GEO_STATUS_COLUMN_WIDTH
)
show_failed_value
(
current_node_status
.
repositories_failed_count
)
print
"
#{
current_node_status
.
repositories_synced_count
}
/
#{
current_node_status
.
projects_count
}
"
puts
using_percentage
(
current_node_status
.
repositories_synced_in_percentage
)
end
def
print_verified_repositories
if
Gitlab
::
Geo
.
repository_verification_enabled?
print
'Verified Repositories: '
.
rjust
(
GEO_STATUS_COLUMN_WIDTH
)
show_failed_value
(
current_node_status
.
repositories_verification_failed_count
)
print
"
#{
current_node_status
.
repositories_verified_count
}
/
#{
current_node_status
.
projects_count
}
"
puts
using_percentage
(
current_node_status
.
repositories_verified_in_percentage
)
end
end
def
print_wikis_status
print
'Wikis: '
.
rjust
(
GEO_STATUS_COLUMN_WIDTH
)
show_failed_value
(
current_node_status
.
wikis_failed_count
)
print
"
#{
current_node_status
.
wikis_synced_count
}
/
#{
current_node_status
.
projects_count
}
"
puts
using_percentage
(
current_node_status
.
wikis_synced_in_percentage
)
end
def
print_verified_wikis
if
Gitlab
::
Geo
.
repository_verification_enabled?
print
'Verified Wikis: '
.
rjust
(
GEO_STATUS_COLUMN_WIDTH
)
show_failed_value
(
current_node_status
.
wikis_verification_failed_count
)
print
"
#{
current_node_status
.
wikis_verified_count
}
/
#{
current_node_status
.
projects_count
}
"
puts
using_percentage
(
current_node_status
.
wikis_verified_in_percentage
)
end
end
def
print_lfs_objects_status
print
'LFS Objects: '
.
rjust
(
GEO_STATUS_COLUMN_WIDTH
)
show_failed_value
(
current_node_status
.
lfs_objects_failed_count
)
print
"
#{
current_node_status
.
lfs_objects_synced_count
}
/
#{
current_node_status
.
lfs_objects_count
}
"
puts
using_percentage
(
current_node_status
.
lfs_objects_synced_in_percentage
)
end
def
print_attachments_status
print
'Attachments: '
.
rjust
(
GEO_STATUS_COLUMN_WIDTH
)
show_failed_value
(
current_node_status
.
attachments_failed_count
)
print
"
#{
current_node_status
.
attachments_synced_count
}
/
#{
current_node_status
.
attachments_count
}
"
puts
using_percentage
(
current_node_status
.
attachments_synced_in_percentage
)
end
def
print_ci_job_artifacts_status
print
'CI job artifacts: '
.
rjust
(
GEO_STATUS_COLUMN_WIDTH
)
show_failed_value
(
current_node_status
.
job_artifacts_failed_count
)
print
"
#{
current_node_status
.
job_artifacts_synced_count
}
/
#{
current_node_status
.
job_artifacts_count
}
"
puts
using_percentage
(
current_node_status
.
job_artifacts_synced_in_percentage
)
end
def
print_container_repositories_status
if
Gitlab
.
config
.
geo
.
registry_replication
.
enabled
print
'Container repositories: '
.
rjust
(
GEO_STATUS_COLUMN_WIDTH
)
show_failed_value
(
current_node_status
.
container_repositories_failed_count
)
print
"
#{
current_node_status
.
container_repositories_synced_count
||
0
}
/
#{
current_node_status
.
container_repositories_count
||
0
}
"
puts
using_percentage
(
current_node_status
.
container_repositories_synced_in_percentage
)
end
end
def
print_design_repositories_status
print
'Design repositories: '
.
rjust
(
GEO_STATUS_COLUMN_WIDTH
)
show_failed_value
(
current_node_status
.
design_repositories_failed_count
)
print
"
#{
current_node_status
.
design_repositories_synced_count
||
0
}
/
#{
current_node_status
.
design_repositories_count
||
0
}
"
puts
using_percentage
(
current_node_status
.
design_repositories_synced_in_percentage
)
end
def
print_repositories_checked_status
if
Gitlab
::
CurrentSettings
.
repository_checks_enabled
print
'Repositories Checked: '
.
rjust
(
GEO_STATUS_COLUMN_WIDTH
)
show_failed_value
(
current_node_status
.
repositories_checked_failed_count
)
print
"
#{
current_node_status
.
repositories_checked_count
}
/
#{
current_node_status
.
projects_count
}
"
puts
using_percentage
(
current_node_status
.
repositories_checked_in_percentage
)
end
end
def
show_failed_value
(
value
)
print
"
#{
value
}
"
.
color
(
:red
)
+
'/'
if
value
>
0
end
def
using_percentage
(
value
)
"(
#{
number_to_percentage
(
value
.
floor
,
precision:
0
,
strip_insignificant_zeros:
true
)
}
)"
end
end
end
end
ee/lib/tasks/geo.rake
View file @
e6f1cc02
require
'action_view/helpers'
task
spec:
[
'geo:db:test:prepare'
]
task
spec:
[
'geo:db:test:prepare'
]
namespace
:geo
do
namespace
:geo
do
include
ActionView
::
Helpers
::
DateHelper
include
ActionView
::
Helpers
::
NumberHelper
GEO_LICENSE_ERROR_TEXT
=
'GitLab Geo is not supported with this license. Please contact the sales team: https://about.gitlab.com/sales.'
.
freeze
GEO_LICENSE_ERROR_TEXT
=
'GitLab Geo is not supported with this license. Please contact the sales team: https://about.gitlab.com/sales.'
.
freeze
GEO_STATUS_COLUMN_WIDTH
=
40
namespace
:db
do
|
ns
|
namespace
:db
do
|
ns
|
desc
'GitLab | Geo | DB | Drops the Geo tracking database from config/database_geo.yml for the current RAILS_ENV.'
desc
'GitLab | Geo | DB | Drops the Geo tracking database from config/database_geo.yml for the current RAILS_ENV.'
...
@@ -256,147 +250,6 @@ namespace :geo do
...
@@ -256,147 +250,6 @@ namespace :geo do
exit
exit
end
end
puts
Gitlab
::
Geo
::
GeoNodeStatusCheck
.
new
(
current_node_status
,
geo_node
).
print_status
puts
"Name:
#{
GeoNode
.
current_node_name
}
"
puts
"URL:
#{
GeoNode
.
current_node_url
}
"
puts
'-----------------------------------------------------'
.
color
(
:yellow
)
unless
Gitlab
::
Database
.
postgresql_minimum_supported_version?
puts
puts
'WARNING: Please upgrade PostgreSQL to version 9.6 or greater. The status of the replication cannot be determined reliably with the current version.'
.
color
(
:red
)
puts
end
print
'GitLab Version: '
.
rjust
(
GEO_STATUS_COLUMN_WIDTH
)
puts
Gitlab
::
VERSION
print
'Geo Role: '
.
rjust
(
GEO_STATUS_COLUMN_WIDTH
)
role
=
if
Gitlab
::
Geo
.
primary?
'Primary'
else
Gitlab
::
Geo
.
secondary?
?
'Secondary'
:
'unknown'
.
color
(
:yellow
)
end
puts
role
print
'Health Status: '
.
rjust
(
GEO_STATUS_COLUMN_WIDTH
)
if
current_node_status
.
healthy?
puts
current_node_status
.
health_status
else
puts
current_node_status
.
health_status
.
color
(
:red
)
end
unless
current_node_status
.
healthy?
print
'Health Status Summary: '
.
rjust
(
GEO_STATUS_COLUMN_WIDTH
)
puts
current_node_status
.
health
.
color
(
:red
)
end
print
'Repositories: '
.
rjust
(
GEO_STATUS_COLUMN_WIDTH
)
show_failed_value
(
current_node_status
.
repositories_failed_count
)
print
"
#{
current_node_status
.
repositories_synced_count
}
/
#{
current_node_status
.
projects_count
}
"
puts
using_percentage
(
current_node_status
.
repositories_synced_in_percentage
)
if
Gitlab
::
Geo
.
repository_verification_enabled?
print
'Verified Repositories: '
.
rjust
(
GEO_STATUS_COLUMN_WIDTH
)
show_failed_value
(
current_node_status
.
repositories_verification_failed_count
)
print
"
#{
current_node_status
.
repositories_verified_count
}
/
#{
current_node_status
.
projects_count
}
"
puts
using_percentage
(
current_node_status
.
repositories_verified_in_percentage
)
end
print
'Wikis: '
.
rjust
(
GEO_STATUS_COLUMN_WIDTH
)
show_failed_value
(
current_node_status
.
wikis_failed_count
)
print
"
#{
current_node_status
.
wikis_synced_count
}
/
#{
current_node_status
.
projects_count
}
"
puts
using_percentage
(
current_node_status
.
wikis_synced_in_percentage
)
if
Gitlab
::
Geo
.
repository_verification_enabled?
print
'Verified Wikis: '
.
rjust
(
GEO_STATUS_COLUMN_WIDTH
)
show_failed_value
(
current_node_status
.
wikis_verification_failed_count
)
print
"
#{
current_node_status
.
wikis_verified_count
}
/
#{
current_node_status
.
projects_count
}
"
puts
using_percentage
(
current_node_status
.
wikis_verified_in_percentage
)
end
print
'LFS Objects: '
.
rjust
(
GEO_STATUS_COLUMN_WIDTH
)
show_failed_value
(
current_node_status
.
lfs_objects_failed_count
)
print
"
#{
current_node_status
.
lfs_objects_synced_count
}
/
#{
current_node_status
.
lfs_objects_count
}
"
puts
using_percentage
(
current_node_status
.
lfs_objects_synced_in_percentage
)
print
'Attachments: '
.
rjust
(
GEO_STATUS_COLUMN_WIDTH
)
show_failed_value
(
current_node_status
.
attachments_failed_count
)
print
"
#{
current_node_status
.
attachments_synced_count
}
/
#{
current_node_status
.
attachments_count
}
"
puts
using_percentage
(
current_node_status
.
attachments_synced_in_percentage
)
print
'CI job artifacts: '
.
rjust
(
GEO_STATUS_COLUMN_WIDTH
)
show_failed_value
(
current_node_status
.
job_artifacts_failed_count
)
print
"
#{
current_node_status
.
job_artifacts_synced_count
}
/
#{
current_node_status
.
job_artifacts_count
}
"
puts
using_percentage
(
current_node_status
.
job_artifacts_synced_in_percentage
)
if
Gitlab
.
config
.
geo
.
registry_replication
.
enabled
print
'Container repositories: '
.
rjust
(
GEO_STATUS_COLUMN_WIDTH
)
show_failed_value
(
current_node_status
.
container_repositories_failed_count
)
print
"
#{
current_node_status
.
container_repositories_synced_count
||
0
}
/
#{
current_node_status
.
container_repositories_count
||
0
}
"
puts
using_percentage
(
current_node_status
.
container_repositories_synced_in_percentage
)
end
print
'Design repositories: '
.
rjust
(
GEO_STATUS_COLUMN_WIDTH
)
show_failed_value
(
current_node_status
.
design_repositories_failed_count
)
print
"
#{
current_node_status
.
design_repositories_synced_count
||
0
}
/
#{
current_node_status
.
design_repositories_count
||
0
}
"
puts
using_percentage
(
current_node_status
.
design_repositories_synced_in_percentage
)
if
Gitlab
::
CurrentSettings
.
repository_checks_enabled
print
'Repositories Checked: '
.
rjust
(
GEO_STATUS_COLUMN_WIDTH
)
show_failed_value
(
current_node_status
.
repositories_checked_failed_count
)
print
"
#{
current_node_status
.
repositories_checked_count
}
/
#{
current_node_status
.
projects_count
}
"
puts
using_percentage
(
current_node_status
.
repositories_checked_in_percentage
)
end
print
'Sync Settings: '
.
rjust
(
GEO_STATUS_COLUMN_WIDTH
)
puts
geo_node
.
namespaces
.
any?
?
'Selective'
:
'Full'
print
'Database replication lag: '
.
rjust
(
GEO_STATUS_COLUMN_WIDTH
)
puts
"
#{
Gitlab
::
Geo
::
HealthCheck
.
new
.
db_replication_lag_seconds
}
seconds"
print
'Last event ID seen from primary: '
.
rjust
(
GEO_STATUS_COLUMN_WIDTH
)
last_event
=
Geo
::
EventLog
.
last
if
last_event
print
last_event
&
.
id
puts
" (
#{
time_ago_in_words
(
last_event
&
.
created_at
)
}
ago)"
print
'Last event ID processed by cursor: '
.
rjust
(
GEO_STATUS_COLUMN_WIDTH
)
cursor_last_event_id
=
Geo
::
EventLogState
.
last_processed
&
.
event_id
if
cursor_last_event_id
print
cursor_last_event_id
last_cursor_event_date
=
Geo
::
EventLog
.
find_by
(
id:
cursor_last_event_id
)
&
.
created_at
print
" (
#{
time_ago_in_words
(
last_cursor_event_date
)
}
ago)"
if
last_cursor_event_date
puts
else
puts
'N/A'
end
else
puts
'N/A'
end
print
'Last status report was: '
.
rjust
(
GEO_STATUS_COLUMN_WIDTH
)
if
current_node_status
.
updated_at
puts
"
#{
time_ago_in_words
(
current_node_status
.
updated_at
)
}
ago"
else
# Only primary node can create a status record in the database so if it does not exist
# we get unsaved record where updated_at is nil
puts
"Never"
end
puts
end
def
show_failed_value
(
value
)
print
"
#{
value
}
"
.
color
(
:red
)
+
'/'
if
value
>
0
end
def
using_percentage
(
value
)
"(
#{
number_to_percentage
(
value
.
floor
,
precision:
0
,
strip_insignificant_zeros:
true
)
}
)"
end
end
end
end
ee/spec/tasks/geo_rake_spec.rb
View file @
e6f1cc02
...
@@ -342,7 +342,8 @@ RSpec.describe 'geo rake tasks', :geo do
...
@@ -342,7 +342,8 @@ RSpec.describe 'geo rake tasks', :geo do
stub_licensed_features
(
geo:
true
)
stub_licensed_features
(
geo:
true
)
stub_current_geo_node
(
current_node
)
stub_current_geo_node
(
current_node
)
allow
(
GeoNodeStatus
).
to
receive
(
:current_node_status
).
once
.
and_return
(
geo_node_status
)
allow
(
GeoNodeStatus
).
to
receive
(
:current_node_status
).
and_return
(
geo_node_status
)
allow
(
Gitlab
.
config
.
geo
.
registry_replication
).
to
receive
(
:enabled
).
and_return
(
true
)
end
end
it
'runs with no error'
do
it
'runs with no error'
do
...
@@ -361,6 +362,32 @@ RSpec.describe 'geo rake tasks', :geo do
...
@@ -361,6 +362,32 @@ RSpec.describe 'geo rake tasks', :geo do
it
'does not show health status summary'
do
it
'does not show health status summary'
do
expect
{
run_rake_task
(
'geo:status'
)
}.
not_to
output
(
/Health Status Summary/
).
to_stdout
expect
{
run_rake_task
(
'geo:status'
)
}.
not_to
output
(
/Health Status Summary/
).
to_stdout
end
end
it
'prints messages for all the checks'
do
[
/Name/
,
/URL/
,
/GitLab Version/
,
/Geo Role/
,
/Health Status/
,
/Sync Settings/
,
/Database replication lag/
,
/Repositories/
,
/Verified Repositories/
,
/Wikis/
,
/Verified Wikis/
,
/LFS Objects/
,
/Attachments/
,
/CI job artifacts/
,
/Container repositories/
,
/Design repositories/
,
/Repositories Checked/
,
/Last event ID seen from primary/
,
/Last status report was/
].
each
do
|
text
|
expect
{
run_rake_task
(
'geo:status'
)
}.
to
output
(
text
).
to_stdout
end
end
end
end
context
'with an unhealthy node'
do
context
'with an unhealthy node'
do
...
...
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