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
04a99806
Commit
04a99806
authored
Aug 04, 2020
by
Douglas Barbosa Alexandre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove FDW enabled check
Since Gitlab 13.2 we don't rely on FDW
parent
2c5c5a18
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
67 deletions
+0
-67
ee/lib/system_check/geo/fdw_enabled_check.rb
ee/lib/system_check/geo/fdw_enabled_check.rb
+0
-27
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_enabled_check_spec.rb
ee/spec/lib/system_check/geo/fdw_enabled_check_spec.rb
+0
-38
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_enabled_check.rb
deleted
100644 → 0
View file @
2c5c5a18
# frozen_string_literal: true
module
SystemCheck
module
Geo
class
FdwEnabledCheck
<
SystemCheck
::
BaseCheck
set_name
'GitLab Geo tracking database is configured to use Foreign Data Wrapper?'
set_skip_reason
'not a secondary node'
def
skip?
!
Gitlab
::
Geo
.
secondary?
end
def
check?
Gitlab
::
Geo
::
Fdw
.
enabled?
end
def
show_error
try_fixing_it
(
'Follow Geo setup instructions to configure secondary nodes with FDW support'
,
'If you upgraded recently check for any new step required to enable FDW'
)
for_more_information
(
'doc/gitlab-geo/database.md'
)
end
end
end
end
ee/lib/system_check/rake_task/geo_task.rb
View file @
04a99806
...
@@ -36,7 +36,6 @@ module SystemCheck
...
@@ -36,7 +36,6 @@ module SystemCheck
SystemCheck
::
Geo
::
GeoDatabaseConfiguredCheck
,
SystemCheck
::
Geo
::
GeoDatabaseConfiguredCheck
,
SystemCheck
::
Geo
::
DatabaseReplicationEnabledCheck
,
SystemCheck
::
Geo
::
DatabaseReplicationEnabledCheck
,
SystemCheck
::
Geo
::
DatabaseReplicationWorkingCheck
,
SystemCheck
::
Geo
::
DatabaseReplicationWorkingCheck
,
SystemCheck
::
Geo
::
FdwEnabledCheck
,
SystemCheck
::
Geo
::
HttpConnectionCheck
SystemCheck
::
Geo
::
HttpConnectionCheck
]
+
common_checks
]
+
common_checks
end
end
...
...
ee/spec/lib/system_check/geo/fdw_enabled_check_spec.rb
deleted
100644 → 0
View file @
2c5c5a18
# frozen_string_literal: true
require
'spec_helper'
require
'rake_helper'
RSpec
.
describe
SystemCheck
::
Geo
::
FdwEnabledCheck
,
:geo
do
describe
'#skip?'
do
subject
{
described_class
.
new
.
skip?
}
it
'skips when Geo is disabled'
do
allow
(
Gitlab
::
Geo
).
to
receive
(
:enabled?
)
{
false
}
is_expected
.
to
be_truthy
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
}
is_expected
.
to
be_truthy
end
it
'does not skip when Geo is enabled and its a secondary node'
do
allow
(
Gitlab
::
Geo
).
to
receive
(
:enabled?
)
{
true
}
allow
(
Gitlab
::
Geo
).
to
receive
(
:secondary?
)
{
true
}
is_expected
.
to
be_falsey
end
end
describe
'#check?'
do
context
'with functional FDW environment'
,
:geo_fdw
do
it
'returns true'
do
expect
(
subject
.
check?
).
to
be_truthy
end
end
end
end
ee/spec/lib/system_check/rake_task/geo_task_spec.rb
View file @
04a99806
...
@@ -25,7 +25,6 @@ RSpec.describe SystemCheck::RakeTask::GeoTask do
...
@@ -25,7 +25,6 @@ RSpec.describe SystemCheck::RakeTask::GeoTask do
SystemCheck
::
Geo
::
GeoDatabaseConfiguredCheck
,
SystemCheck
::
Geo
::
GeoDatabaseConfiguredCheck
,
SystemCheck
::
Geo
::
DatabaseReplicationEnabledCheck
,
SystemCheck
::
Geo
::
DatabaseReplicationEnabledCheck
,
SystemCheck
::
Geo
::
DatabaseReplicationWorkingCheck
,
SystemCheck
::
Geo
::
DatabaseReplicationWorkingCheck
,
SystemCheck
::
Geo
::
FdwEnabledCheck
,
SystemCheck
::
Geo
::
HttpConnectionCheck
SystemCheck
::
Geo
::
HttpConnectionCheck
]
+
common_checks
]
+
common_checks
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