Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
T
tarantool
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
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
tarantool
Commits
e279e65e
Commit
e279e65e
authored
9 years ago
by
Konstantin Osipov
Browse files
Options
Downloads
Patches
Plain Diff
replication: remove redundancy in error messages
parent
5d992786
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/box/relay.cc
+1
-1
1 addition, 1 deletion
src/box/relay.cc
src/box/replica.cc
+7
-15
7 additions, 15 deletions
src/box/replica.cc
with
8 additions
and
16 deletions
src/box/relay.cc
+
1
−
1
View file @
e279e65e
...
...
@@ -89,6 +89,7 @@ replication_join_f(va_list ap)
/* Send snapshot */
engine_join
(
relay
);
say_info
(
"snapshot sent"
);
}
void
...
...
@@ -115,7 +116,6 @@ replication_join(int fd, struct xrow_header *packet,
struct
xrow_header
row
;
xrow_encode_vclock
(
&
row
,
vclockset_last
(
&
r
->
snap_dir
.
index
));
relay_send
(
&
relay
,
&
row
);
say_info
(
"snapshot sent"
);
}
static
void
...
...
This diff is collapsed.
Click to expand it.
src/box/replica.cc
+
7
−
15
View file @
e279e65e
...
...
@@ -114,10 +114,8 @@ replica_connect(struct replica *replica, struct ev_io *coio,
assert
(
coio
->
fd
>=
0
);
coio_readn
(
coio
,
greeting
,
sizeof
(
greeting
));
if
(
!
replica
->
warning_said
)
{
say_info
(
"connected to %s"
,
sio_strfaddr
(
&
replica
->
addr
,
replica
->
addr_len
));
}
say_info
(
"connected to %s"
,
sio_strfaddr
(
&
replica
->
addr
,
replica
->
addr_len
));
/* Don't display previous error messages in box.info.replication */
diag_clear
(
&
fiber
()
->
diag
);
...
...
@@ -150,10 +148,8 @@ static void
replica_process_join
(
struct
replica
*
replica
,
struct
recovery_state
*
r
,
struct
ev_io
*
coio
,
struct
iobuf
*
iobuf
)
{
if
(
!
replica
->
warning_said
)
{
say_info
(
"bootstrapping a replica from %s"
,
sio_strfaddr
(
&
replica
->
addr
,
replica
->
addr_len
));
}
say_info
(
"downloading a snapshot from %s"
,
sio_strfaddr
(
&
replica
->
addr
,
replica
->
addr_len
));
/* Send JOIN request */
struct
xrow_header
row
;
...
...
@@ -198,11 +194,6 @@ static void
replica_process_subscribe
(
struct
replica
*
replica
,
struct
recovery_state
*
r
,
struct
ev_io
*
coio
,
struct
iobuf
*
iobuf
)
{
if
(
!
replica
->
warning_said
)
{
say_info
(
"subscribing to updates from %s"
,
sio_strfaddr
(
&
replica
->
addr
,
replica
->
addr_len
));
}
/* Send SUBSCRIBE request */
struct
xrow_header
row
;
xrow_encode_subscribe
(
&
row
,
&
cluster_id
,
&
r
->
server_uuid
,
&
r
->
vclock
);
...
...
@@ -351,7 +342,8 @@ replica_start(struct replica *replica, struct recovery_state *r)
assert
(
replica
->
reader
==
NULL
);
const
char
*
uri
=
uri_format
(
&
replica
->
uri
);
say_info
(
"starting replication from %s"
,
uri
);
if
(
replica
->
io
.
fd
<
0
)
say_crit
(
"starting replication from %s"
,
uri
);
snprintf
(
name
,
sizeof
(
name
),
"replica/%s"
,
uri
);
struct
fiber
*
f
=
fiber_new
(
name
,
pull_from_replica
);
...
...
@@ -371,7 +363,7 @@ replica_stop(struct replica *replica)
if
(
f
==
NULL
)
return
;
const
char
*
uri
=
uri_format
(
&
replica
->
uri
);
say_
info
(
"shutting down replica %s"
,
uri
);
say_
crit
(
"shutting down replica %s"
,
uri
);
fiber_cancel
(
f
);
/**
* If the replica died from an exception, don't throw it
...
...
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