Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Minor refactoring for rioConnRead and adding errno #9280

Merged
merged 4 commits into from Jul 30, 2021
Merged

Minor refactoring for rioConnRead and adding errno #9280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d0cb12c
minor refactoring for rioConnRead and adding errno
Jul 28, 2021
8320dba
minor styling fix to fit our convention, and also reduce LOC diff
oranagra Jul 29, 2021
8cf9689
Merge branch 'redis:unstable' into unstable
Ewg-c Jul 29, 2021
a398f9f
Log error first in rdbLoadRio failure handling code
Jul 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/replication.c
View file
Open in desktop
Expand Up @@ -1756,10 +1756,10 @@ void readSyncBulkPayload(connection *conn) {

if (rdbLoadRio(&rdb,RDBFLAGS_REPLICATION,&rsi) != C_OK) {
/* RDB loading failed. */
stopLoading(0);
serverLog(LL_WARNING,
"Failed trying to load the MASTER synchronization DB "
"from socket");
"Failed trying to load the MASTER synchronization DB "
"from socket: %s", strerror(errno));
stopLoading(0);
cancelReplicationHandshake(1);
rioFreeConn(&rdb, NULL);

Expand Down
18 changes: 9 additions & 9 deletions src/rio.c
View file
Open in desktop
Expand Up @@ -187,6 +187,14 @@ static size_t rioConnRead(rio *r, void *buf, size_t len) {
r->io.conn.pos = 0;
}

/* Make sure the caller didn't request to read past the limit.
* If they didn't we'll buffer till the limit, if they did, we'll
* return an error. */
if (r->io.conn.read_limit != 0 && r->io.conn.read_limit < r->io.conn.read_so_far + len) {
errno = EOVERFLOW;
return 0;
}

/* If we don't already have all the data in the sds, read more */
while (len > sdslen(r->io.conn.buf) - r->io.conn.pos) {
size_t buffered = sdslen(r->io.conn.buf) - r->io.conn.pos;
Expand All @@ -198,15 +206,7 @@ static size_t rioConnRead(rio *r, void *buf, size_t len) {
if (r->io.conn.read_limit != 0 &&
r->io.conn.read_so_far + buffered + toread > r->io.conn.read_limit)
{
/* Make sure the caller didn't request to read past the limit.
* If they didn't we'll buffer till the limit, if they did, we'll
* return an error. */
if (r->io.conn.read_limit >= r->io.conn.read_so_far + len)
toread = r->io.conn.read_limit - r->io.conn.read_so_far - buffered;
else {
errno = EOVERFLOW;
return 0;
}
toread = r->io.conn.read_limit - r->io.conn.read_so_far - buffered;
}
int retval = connRead(r->io.conn.conn,
(char*)r->io.conn.buf + sdslen(r->io.conn.buf),
Expand Down