fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-19 17:10:50 +00:00
Code Issues Projects Releases Wiki Activity

Fix write() errno error

Browse Source
This commit is contained in:
shenlongxing 2018-06-04 23:59:21 +08:00 committed by antirez
parent b61416bdf4
commit c85ae56edc
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cluster.c
View File

@ -2120,7 +2120,7 @@ void clusterWriteHandler(aeEventLoop *el, int fd, void *privdata, int mask) {
nwritten = write(fd, link->sndbuf, sdslen(link->sndbuf)); nwritten = write(fd, link->sndbuf, sdslen(link->sndbuf));
if (nwritten <= 0) { if (nwritten <= 0) {
serverLog(LL_DEBUG,"I/O error writing to node link: %s", serverLog(LL_DEBUG,"I/O error writing to node link: %s",
strerror(errno)); (nwritten == -1) ? strerror(errno) : "short write");
handleLinkIOError(link); handleLinkIOError(link);
return; return;
} }

2
src/redis-cli.c
View File

@ -5575,7 +5575,7 @@ static void getRDB(void) {
nwritten = write(fd, buf, nread); nwritten = write(fd, buf, nread);
if (nwritten != nread) { if (nwritten != nread) {
fprintf(stderr,"Error writing data to file: %s\n", fprintf(stderr,"Error writing data to file: %s\n",
strerror(errno)); (nwritten == -1) ? strerror(errno) : "short write");
exit(1); exit(1);
} }
payload -= nread; payload -= nread;

7
src/replication.c
View File

@ -1105,7 +1105,7 @@ void restartAOF() {
#define REPL_MAX_WRITTEN_BEFORE_FSYNC (1024*1024*8) /* 8 MB */ #define REPL_MAX_WRITTEN_BEFORE_FSYNC (1024*1024*8) /* 8 MB */
void readSyncBulkPayload(aeEventLoop *el, int fd, void *privdata, int mask) { void readSyncBulkPayload(aeEventLoop *el, int fd, void *privdata, int mask) {
char buf[4096]; char buf[4096];
ssize_t nread, readlen; ssize_t nread, readlen, nwritten;
off_t left; off_t left;
UNUSED(el); UNUSED(el);
UNUSED(privdata); UNUSED(privdata);
@ -1206,8 +1206,9 @@ void readSyncBulkPayload(aeEventLoop *el, int fd, void *privdata, int mask) {
} }
server.repl_transfer_lastio = server.unixtime; server.repl_transfer_lastio = server.unixtime;
if (write(server.repl_transfer_fd,buf,nread) != nread) { 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", strerror(errno)); 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; goto error;
} }
server.repl_transfer_read += nread; server.repl_transfer_read += nread;