Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
77acc63e
Commit
77acc63e
authored
Jun 04, 2018
by
shenlongxing
Committed by
antirez
Jun 12, 2018
Browse files
Fix write() errno error
parent
3ddc5376
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/cluster.c
View file @
77acc63e
...
...
@@ -2120,7 +2120,7 @@ void clusterWriteHandler(aeEventLoop *el, int fd, void *privdata, int mask) {
nwritten
=
write
(
fd
,
link
->
sndbuf
,
sdslen
(
link
->
sndbuf
));
if
(
nwritten
<=
0
)
{
serverLog
(
LL_DEBUG
,
"I/O error writing to node link: %s"
,
strerror
(
errno
)
);
(
nwritten
==
-
1
)
?
strerror
(
errno
)
:
"short write"
);
handleLinkIOError
(
link
);
return
;
}
...
...
src/redis-cli.c
View file @
77acc63e
...
...
@@ -5575,7 +5575,7 @@ static void getRDB(void) {
nwritten
=
write
(
fd
,
buf
,
nread
);
if
(
nwritten
!=
nread
)
{
fprintf
(
stderr
,
"Error writing data to file: %s
\n
"
,
strerror
(
errno
)
);
(
nwritten
==
-
1
)
?
strerror
(
errno
)
:
"short write"
);
exit
(
1
);
}
payload
-=
nread
;
...
...
src/replication.c
View file @
77acc63e
...
...
@@ -1105,7 +1105,7 @@ void restartAOF() {
#define REPL_MAX_WRITTEN_BEFORE_FSYNC (1024*1024*8)
/* 8 MB */
void
readSyncBulkPayload
(
aeEventLoop
*
el
,
int
fd
,
void
*
privdata
,
int
mask
)
{
char
buf
[
4096
];
ssize_t
nread
,
readlen
;
ssize_t
nread
,
readlen
,
nwritten
;
off_t
left
;
UNUSED
(
el
);
UNUSED
(
privdata
);
...
...
@@ -1206,8 +1206,9 @@ void readSyncBulkPayload(aeEventLoop *el, int fd, void *privdata, int mask) {
}
server
.
repl_transfer_lastio
=
server
.
unixtime
;
if
(
write
(
server
.
repl_transfer_fd
,
buf
,
nread
)
!=
nread
)
{
serverLog
(
LL_WARNING
,
"Write error or short write writing to the DB dump file needed for MASTER <-> SLAVE synchronization: %s"
,
strerror
(
errno
));
if
((
nwritten
=
write
(
server
.
repl_transfer_fd
,
buf
,
nread
))
!=
nread
)
{
serverLog
(
LL_WARNING
,
"Write error or short write writing to the DB dump file needed for MASTER <-> SLAVE synchronization: %s"
,
(
nwritten
==
-
1
)
?
strerror
(
errno
)
:
"short write"
);
goto
error
;
}
server
.
repl_transfer_read
+=
nread
;
...
...
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