Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
perxis-go
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Package Registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
perxis
perxis-go
Commits
0d948715
Commit
0d948715
authored
1 year ago
by
ko_oler
Browse files
Options
Downloads
Patches
Plain Diff
правка по ПР
parent
46500e38
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
pkg/setup/setup.go
+1
-1
1 addition, 1 deletion
pkg/setup/setup.go
pkg/spaces/service.go
+14
-9
14 additions, 9 deletions
pkg/spaces/service.go
pkg/spaces/service_test.go
+2
-2
2 additions, 2 deletions
pkg/spaces/service_test.go
with
17 additions
and
12 deletions
pkg/setup/setup.go
+
1
−
1
View file @
0d948715
...
...
@@ -180,7 +180,7 @@ func (s *Setup) Install(ctx context.Context) error {
// Check выполняет проверку требований
func
(
s
*
Setup
)
Check
(
ctx
context
.
Context
)
error
{
if
s
.
waitSpaceAvailable
{
if
err
:=
spaces
.
WaitReadAvailable
(
ctx
,
s
.
content
.
Spaces
,
s
.
SpaceID
,
s
.
logger
);
err
!=
nil
{
if
err
:=
spaces
.
Wait
Space
ReadAvailable
(
ctx
,
s
.
content
.
Spaces
,
s
.
SpaceID
,
s
.
logger
);
err
!=
nil
{
return
err
}
}
...
...
This diff is collapsed.
Click to expand it.
pkg/spaces/service.go
+
14
−
9
View file @
0d948715
...
...
@@ -54,6 +54,11 @@ type Spaces interface {
Move
(
ctx
context
.
Context
,
spaceID
,
orgID
string
)
(
err
error
)
}
const
(
delay
=
500
*
time
.
Millisecond
attempts
=
1800
)
var
(
ErrSpaceNotAvailable
=
errors
.
New
(
"space not available"
)
)
...
...
@@ -69,7 +74,7 @@ func IsSpaceAvailable(ctx context.Context, svc Spaces, spaceID string) error {
return
ErrSpaceNotAvailable
}
func
IsReadAvailable
(
ctx
context
.
Context
,
svc
Spaces
,
spaceID
string
)
error
{
func
Is
Space
ReadAvailable
(
ctx
context
.
Context
,
svc
Spaces
,
spaceID
string
)
error
{
sp
,
err
:=
svc
.
Get
(
ctx
,
spaceID
)
if
err
!=
nil
{
return
errors
.
Wrap
(
err
,
"fail to get space"
)
...
...
@@ -87,25 +92,25 @@ func WaitSpaceAvailable(ctx context.Context, svc Spaces, spaceID string, logger
},
retry
.
RetryIf
(
func
(
err
error
)
bool
{
return
errors
.
Is
(
err
,
ErrSpaceNotAvailable
)
}),
retry
.
OnRetry
(
func
(
n
uint
,
err
error
)
{
logger
.
Warn
(
"Space not
available"
,
zap
.
String
(
"spaceID"
,
spaceID
),
zap
.
Uint
(
"Retry"
,
n
),
zap
.
Error
(
err
))
logger
.
Info
(
"Waiting for space to be
available"
,
zap
.
String
(
"spaceID"
,
spaceID
),
zap
.
Uint
(
"Retry"
,
n
),
zap
.
Error
(
err
))
}),
retry
.
Delay
(
500
*
time
.
Millisecond
),
retry
.
Attempts
(
1800
),
retry
.
Delay
(
delay
),
retry
.
Attempts
(
attempts
),
retry
.
Context
(
ctx
),
)
}
func
WaitReadAvailable
(
ctx
context
.
Context
,
svc
Spaces
,
spaceID
string
,
logger
*
zap
.
Logger
)
error
{
func
Wait
Space
ReadAvailable
(
ctx
context
.
Context
,
svc
Spaces
,
spaceID
string
,
logger
*
zap
.
Logger
)
error
{
return
retry
.
Do
(
func
()
error
{
return
IsReadAvailable
(
ctx
,
svc
,
spaceID
)
return
Is
Space
ReadAvailable
(
ctx
,
svc
,
spaceID
)
},
retry
.
RetryIf
(
func
(
err
error
)
bool
{
return
errors
.
Is
(
err
,
ErrSpaceNotAvailable
)
}),
retry
.
OnRetry
(
func
(
n
uint
,
err
error
)
{
logger
.
Warn
(
"Space is migrating
"
,
zap
.
String
(
"spaceID"
,
spaceID
),
zap
.
Uint
(
"Retry"
,
n
),
zap
.
Error
(
err
))
logger
.
Info
(
"Waiting for space to be available for read
"
,
zap
.
String
(
"spaceID"
,
spaceID
),
zap
.
Uint
(
"Retry"
,
n
),
zap
.
Error
(
err
))
}),
retry
.
Delay
(
500
*
time
.
Millisecond
),
retry
.
Attempts
(
1800
),
retry
.
Delay
(
delay
),
retry
.
Attempts
(
attempts
),
retry
.
Context
(
ctx
),
)
}
This diff is collapsed.
Click to expand it.
pkg/spaces/service_test.go
+
2
−
2
View file @
0d948715
...
...
@@ -81,8 +81,8 @@ func TestIsReadAvailable(t *testing.T) {
for
_
,
tt
:=
range
tests
{
t
.
Run
(
tt
.
name
,
func
(
t
*
testing
.
T
)
{
spaces
:=
&
dummySpaces
{
space
:
tt
.
space
}
if
err
:=
IsReadAvailable
(
context
.
Background
(),
spaces
,
"space"
);
(
err
!=
nil
)
!=
tt
.
wantErr
{
t
.
Errorf
(
"IsReadAvailable() error = %v, wantErr %v"
,
err
,
tt
.
wantErr
)
if
err
:=
Is
Space
ReadAvailable
(
context
.
Background
(),
spaces
,
"space"
);
(
err
!=
nil
)
!=
tt
.
wantErr
{
t
.
Errorf
(
"Is
Space
ReadAvailable() error = %v, wantErr %v"
,
err
,
tt
.
wantErr
)
}
})
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment