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
fad758b3
Commit
fad758b3
authored
Feb 03, 2015
by
antirez
Browse files
Check RDB automatically in a few more cases.
parent
7d1e1580
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/rdb.c
View file @
fad758b3
...
@@ -48,7 +48,7 @@
...
@@ -48,7 +48,7 @@
void
rdbCheckThenExit
(
char
*
reason
,
int
where
)
{
void
rdbCheckThenExit
(
char
*
reason
,
int
where
)
{
redisLog
(
REDIS_WARNING
,
"Corrupt RDB detected at rdb.c:%d (%s). "
redisLog
(
REDIS_WARNING
,
"Corrupt RDB detected at rdb.c:%d (%s). "
"Running 'redis-check-rdb
--dbfilename
%s'"
,
"Running 'redis-check-rdb %s'"
,
where
,
reason
,
server
.
rdb_filename
);
where
,
reason
,
server
.
rdb_filename
);
redis_check_rdb
(
server
.
rdb_filename
);
redis_check_rdb
(
server
.
rdb_filename
);
exit
(
1
);
exit
(
1
);
...
@@ -1375,7 +1375,7 @@ int rdbLoad(char *filename) {
...
@@ -1375,7 +1375,7 @@ int rdbLoad(char *filename) {
redisLog
(
REDIS_WARNING
,
"RDB file was saved with checksum disabled: no check performed."
);
redisLog
(
REDIS_WARNING
,
"RDB file was saved with checksum disabled: no check performed."
);
}
else
if
(
cksum
!=
expected
)
{
}
else
if
(
cksum
!=
expected
)
{
redisLog
(
REDIS_WARNING
,
"Wrong RDB checksum. Aborting now."
);
redisLog
(
REDIS_WARNING
,
"Wrong RDB checksum. Aborting now."
);
exit
(
1
);
rdbExitReportCorruptRDB
(
"RDB CRC error"
);
}
}
}
}
...
@@ -1385,7 +1385,7 @@ int rdbLoad(char *filename) {
...
@@ -1385,7 +1385,7 @@ int rdbLoad(char *filename) {
eoferr:
/* unexpected end of file is handled here with a fatal exit */
eoferr:
/* unexpected end of file is handled here with a fatal exit */
redisLog
(
REDIS_WARNING
,
"Short read or OOM loading DB. Unrecoverable error, aborting now."
);
redisLog
(
REDIS_WARNING
,
"Short read or OOM loading DB. Unrecoverable error, aborting now."
);
exit
(
1
);
rdbExitReportCorruptRDB
(
"Unexpected EOF reading RDB file"
);
return
REDIS_ERR
;
/* Just to avoid warning */
return
REDIS_ERR
;
/* Just to avoid warning */
}
}
...
...
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