Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
picodata
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository 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
core
picodata
Commits
255ae9e0
Commit
255ae9e0
authored
1 year ago
by
Georgy Moshkin
Committed by
Yaroslav Dynnikov
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
fix: used to not provide pico_service password on initial replication configuration
parent
cadcb4e3
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!895
fix: wrong pico_service password + picodata expel --user
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/tarantool.rs
+2
-1
2 additions, 1 deletion
src/tarantool.rs
test/int/test_joining.py
+4
-2
4 additions, 2 deletions
test/int/test_joining.py
with
6 additions
and
3 deletions
src/tarantool.rs
+
2
−
1
View file @
255ae9e0
...
...
@@ -164,8 +164,9 @@ impl Cfg {
/// initialized cluster.
pub
fn
for_instance_join
(
config
:
&
PicodataConfig
,
resp
:
&
join
::
Response
)
->
Self
{
let
mut
replication_cfg
=
Vec
::
with_capacity
(
resp
.box_replication
.len
());
let
password
=
crate
::
pico_service
::
pico_service_password
();
for
address
in
&
resp
.box_replication
{
replication_cfg
.push
(
format!
(
"{PICO_SERVICE_USER_NAME}:@{address}"
))
replication_cfg
.push
(
format!
(
"{PICO_SERVICE_USER_NAME}:
{password}
@{address}"
))
}
let
mut
res
=
Self
{
...
...
This diff is collapsed.
Click to expand it.
test/int/test_joining.py
+
4
−
2
View file @
255ae9e0
...
...
@@ -117,7 +117,9 @@ def test_parallel(cluster3: Cluster):
def
test_replication
(
cluster
:
Cluster
):
cluster
.
deploy
(
instance_count
=
2
,
init_replication_factor
=
2
)
cluster
.
deploy
(
instance_count
=
2
,
init_replication_factor
=
2
,
service_password
=
"
secret
"
)
i1
,
i2
=
cluster
.
instances
assert
i1
.
replicaset_uuid
()
==
i2
.
replicaset_uuid
()
...
...
@@ -125,7 +127,7 @@ def test_replication(cluster: Cluster):
def
check_replicated
(
instance
):
box_replication
=
instance
.
eval
(
"
return box.cfg.replication
"
)
assert
set
(
box_replication
)
==
set
(
(
f
"
pico_service:@
{
addr
}
"
for
addr
in
[
i1
.
listen
,
i2
.
listen
])
(
f
"
pico_service:
secret
@
{
addr
}
"
for
addr
in
[
i1
.
listen
,
i2
.
listen
])
),
instance
for
instance
in
cluster
.
instances
:
...
...
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