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
2c5c5a18
Commit
2c5c5a18
authored
Aug 04, 2020
by
Douglas Barbosa Alexandre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove FDW schema up-to-date check
Since Gitlab 13.2 we don't rely on FDW
parent
b4665a80
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
89 deletions
+0
-89
ee/lib/system_check/geo/fdw_schema_up_to_date_check.rb
ee/lib/system_check/geo/fdw_schema_up_to_date_check.rb
+0
-41
ee/lib/system_check/rake_task/geo_task.rb
ee/lib/system_check/rake_task/geo_task.rb
+0
-1
ee/spec/lib/system_check/geo/fdw_schema_up_to_date_check_spec.rb
.../lib/system_check/geo/fdw_schema_up_to_date_check_spec.rb
+0
-46
ee/spec/lib/system_check/rake_task/geo_task_spec.rb
ee/spec/lib/system_check/rake_task/geo_task_spec.rb
+0
-1
No files found.
ee/lib/system_check/geo/fdw_schema_up_to_date_check.rb
deleted
100644 → 0
View file @
b4665a80
# frozen_string_literal: true
module
SystemCheck
module
Geo
class
FdwSchemaUpToDateCheck
<
SystemCheck
::
BaseCheck
set_name
'GitLab Geo tracking database Foreign Data Wrapper schema is up-to-date?'
NOT_SECONDARY_NODE
=
'not a secondary node'
.
freeze
FDW_NOT_CONFIGURED
=
'foreign data wrapper is not configured'
.
freeze
def
skip?
unless
Gitlab
::
Geo
.
secondary?
self
.
skip_reason
=
NOT_SECONDARY_NODE
return
true
end
unless
Gitlab
::
Geo
::
Fdw
.
enabled?
self
.
skip_reason
=
FDW_NOT_CONFIGURED
return
true
end
false
end
def
check?
Gitlab
::
Geo
::
Fdw
.
foreign_tables_up_to_date?
end
def
show_error
try_fixing_it
(
'Run the following command to refresh the FDW schema:'
,
'gitlab-rake geo:db:refresh_foreign_tables'
)
for_more_information
(
'doc/administration/geo/replication/troubleshooting.md#geo-database-has-an-outdated-fdw-remote-schema-error'
)
end
end
end
end
ee/lib/system_check/rake_task/geo_task.rb
View file @
2c5c5a18
...
...
@@ -37,7 +37,6 @@ module SystemCheck
SystemCheck
::
Geo
::
DatabaseReplicationEnabledCheck
,
SystemCheck
::
Geo
::
DatabaseReplicationWorkingCheck
,
SystemCheck
::
Geo
::
FdwEnabledCheck
,
SystemCheck
::
Geo
::
FdwSchemaUpToDateCheck
,
SystemCheck
::
Geo
::
HttpConnectionCheck
]
+
common_checks
end
...
...
ee/spec/lib/system_check/geo/fdw_schema_up_to_date_check_spec.rb
deleted
100644 → 0
View file @
b4665a80
# frozen_string_literal: true
require
'spec_helper'
require
'rake_helper'
RSpec
.
describe
SystemCheck
::
Geo
::
FdwSchemaUpToDateCheck
,
:geo
do
describe
'#skip?'
do
it
'skips when Geo is disabled'
do
allow
(
Gitlab
::
Geo
).
to
receive
(
:enabled?
)
{
false
}
expect
(
subject
.
skip?
).
to
be_truthy
expect
(
subject
.
skip_reason
).
to
eq
(
'not a secondary node'
)
end
it
'skips when Geo is enabled but its a primary node'
do
allow
(
Gitlab
::
Geo
).
to
receive
(
:enabled?
)
{
true
}
allow
(
Gitlab
::
Geo
).
to
receive
(
:secondary?
)
{
false
}
expect
(
subject
.
skip?
).
to
be_truthy
expect
(
subject
.
skip_reason
).
to
eq
(
'not a secondary node'
)
end
it
'skips when FDW is disabled'
do
allow
(
Gitlab
::
Geo
).
to
receive
(
:enabled?
)
{
true
}
allow
(
Gitlab
::
Geo
).
to
receive
(
:secondary?
)
{
true
}
allow
(
Gitlab
::
Geo
::
Fdw
).
to
receive
(
:enabled?
)
{
false
}
expect
(
subject
.
skip?
).
to
be_truthy
expect
(
subject
.
skip_reason
).
to
eq
(
'foreign data wrapper is not configured'
)
end
it
'does not skip when Geo is enabled, its a secondary node and FDW is enabled'
do
allow
(
Gitlab
::
Geo
).
to
receive
(
:enabled?
)
{
true
}
allow
(
Gitlab
::
Geo
).
to
receive
(
:secondary?
)
{
true
}
allow
(
Gitlab
::
Geo
::
Fdw
).
to
receive
(
:enabled?
)
{
true
}
expect
(
subject
.
skip?
).
to
be_falsey
end
end
context
'with functional FDW environment'
,
:geo_fdw
do
it
'returns true'
do
expect
(
subject
.
check?
).
to
be_truthy
end
end
end
ee/spec/lib/system_check/rake_task/geo_task_spec.rb
View file @
2c5c5a18
...
...
@@ -26,7 +26,6 @@ RSpec.describe SystemCheck::RakeTask::GeoTask do
SystemCheck
::
Geo
::
DatabaseReplicationEnabledCheck
,
SystemCheck
::
Geo
::
DatabaseReplicationWorkingCheck
,
SystemCheck
::
Geo
::
FdwEnabledCheck
,
SystemCheck
::
Geo
::
FdwSchemaUpToDateCheck
,
SystemCheck
::
Geo
::
HttpConnectionCheck
]
+
common_checks
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