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
b2681e0f
Commit
b2681e0f
authored
Dec 11, 2017
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Optimize Geo specs by using truncation strategy for DB cleaner only when necessary
Closes #4259
parent
5722f7b7
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
20 deletions
+20
-20
spec/ee/spec/finders/geo/attachment_registry_finder_spec.rb
spec/ee/spec/finders/geo/attachment_registry_finder_spec.rb
+4
-4
spec/ee/spec/finders/geo/expire_uploads_finder_spec.rb
spec/ee/spec/finders/geo/expire_uploads_finder_spec.rb
+4
-4
spec/ee/spec/finders/geo/project_registry_finder_spec.rb
spec/ee/spec/finders/geo/project_registry_finder_spec.rb
+4
-4
spec/models/geo_node_status_spec.rb
spec/models/geo_node_status_spec.rb
+6
-6
spec/workers/geo/file_download_dispatch_worker_spec.rb
spec/workers/geo/file_download_dispatch_worker_spec.rb
+2
-2
No files found.
spec/ee/spec/finders/geo/attachment_registry_finder_spec.rb
View file @
b2681e0f
require
'spec_helper'
# Disable transactions via :truncate method because a foreign table
# can't see changes inside a transaction of a different connection.
describe
Geo
::
AttachmentRegistryFinder
,
:geo
,
:truncate
do
describe
Geo
::
AttachmentRegistryFinder
,
:geo
do
include
::
EE
::
GeoHelpers
let
(
:secondary
)
{
create
(
:geo_node
)
}
...
...
@@ -28,7 +26,9 @@ describe Geo::AttachmentRegistryFinder, :geo, :truncate do
stub_current_geo_node
(
secondary
)
end
context
'FDW'
do
# Disable transactions via :truncate method because a foreign table
# can't see changes inside a transaction of a different connection.
context
'FDW'
,
:truncate
do
before
do
skip
(
'FDW is not configured'
)
if
Gitlab
::
Database
.
postgresql?
&&
!
Gitlab
::
Geo
.
fdw?
end
...
...
spec/ee/spec/finders/geo/expire_uploads_finder_spec.rb
View file @
b2681e0f
require
'spec_helper'
# Disable transactions via :truncate method because a foreign table
# can't see changes inside a transaction of a different connection.
describe
Geo
::
ExpireUploadsFinder
,
:geo
,
:truncate
do
describe
Geo
::
ExpireUploadsFinder
,
:geo
do
let
(
:project
)
{
create
(
:project
)
}
context
'FDW'
do
# Disable transactions via :truncate method because a foreign table
# can't see changes inside a transaction of a different connection.
context
'FDW'
,
:truncate
do
before
do
skip
(
'FDW is not configured'
)
if
Gitlab
::
Database
.
postgresql?
&&
!
Gitlab
::
Geo
.
fdw?
end
...
...
spec/ee/spec/finders/geo/project_registry_finder_spec.rb
View file @
b2681e0f
require
'spec_helper'
# Disable transactions via :truncate method because a foreign table
# can't see changes inside a transaction of a different connection.
describe
Geo
::
ProjectRegistryFinder
,
:geo
,
:truncate
do
describe
Geo
::
ProjectRegistryFinder
,
:geo
do
include
::
EE
::
GeoHelpers
let
(
:secondary
)
{
create
(
:geo_node
)
}
...
...
@@ -154,7 +152,9 @@ describe Geo::ProjectRegistryFinder, :geo, :truncate do
end
end
context
'FDW'
do
# Disable transactions via :truncate method because a foreign table
# can't see changes inside a transaction of a different connection.
context
'FDW'
,
:truncate
do
before
do
skip
(
'FDW is not configured'
)
if
Gitlab
::
Database
.
postgresql?
&&
!
Gitlab
::
Geo
.
fdw?
end
...
...
spec/models/geo_node_status_spec.rb
View file @
b2681e0f
require
'spec_helper'
# Disable transactions via :truncate method because a foreign table
# can't see changes inside a transaction of a different connection.
describe
GeoNodeStatus
,
:geo
,
:truncate
do
describe
GeoNodeStatus
,
:geo
do
include
::
EE
::
GeoHelpers
let!
(
:primary
)
{
create
(
:geo_node
,
:primary
)
}
...
...
@@ -52,7 +50,9 @@ describe GeoNodeStatus, :geo, :truncate do
end
end
describe
'#attachments_synced_count'
do
# Disable transactions via :truncate method because a foreign table
# can't see changes inside a transaction of a different connection.
describe
'#attachments_synced_count'
,
:truncate
do
it
'only counts successful syncs'
do
create_list
(
:user
,
3
,
avatar:
fixture_file_upload
(
Rails
.
root
+
'spec/fixtures/dk.png'
,
'image/png'
))
uploads
=
Upload
.
all
.
pluck
(
:id
)
...
...
@@ -95,7 +95,7 @@ describe GeoNodeStatus, :geo, :truncate do
end
end
describe
'#attachments_failed_count'
do
describe
'#attachments_failed_count'
,
:truncate
do
it
'counts failed avatars, attachment, personal snippets and files'
do
# These two should be ignored
create
(
:geo_file_registry
,
:lfs
,
:with_file
,
success:
false
)
...
...
@@ -110,7 +110,7 @@ describe GeoNodeStatus, :geo, :truncate do
end
end
describe
'#attachments_synced_in_percentage'
do
describe
'#attachments_synced_in_percentage'
,
:truncate
do
let
(
:avatar
)
{
fixture_file_upload
(
Rails
.
root
.
join
(
'spec/fixtures/dk.png'
))
}
let
(
:upload_1
)
{
create
(
:upload
,
model:
group
,
path:
avatar
)
}
let
(
:upload_2
)
{
create
(
:upload
,
model:
project_1
,
path:
avatar
)
}
...
...
spec/workers/geo/file_download_dispatch_worker_spec.rb
View file @
b2681e0f
...
...
@@ -2,7 +2,7 @@ require 'spec_helper'
# Disable transactions via :truncate method because a foreign table
# can't see changes inside a transaction of a different connection.
describe
Geo
::
FileDownloadDispatchWorker
,
:geo
,
:truncate
do
describe
Geo
::
FileDownloadDispatchWorker
,
:geo
do
include
::
EE
::
GeoHelpers
let
(
:primary
)
{
create
(
:geo_node
,
:primary
,
host:
'primary-geo-node'
)
}
...
...
@@ -171,7 +171,7 @@ describe Geo::FileDownloadDispatchWorker, :geo, :truncate do
end
end
describe
'when PostgreSQL FDW is available'
,
:geo
do
describe
'when PostgreSQL FDW is available'
,
:geo
,
:truncate
do
# Skip if FDW isn't activated on this database
it_behaves_like
'#perform'
,
Gitlab
::
Database
.
postgresql?
&&
!
Gitlab
::
Geo
.
fdw?
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