gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

redis-check-dump now is RDB version 6 ready.

Browse Source
This commit is contained in:
antirez 2012-04-24 19:05:27 +02:00
parent 7dbc514de7
commit 29c8cf0116
2 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile
View File

@ -102,7 +102,7 @@ REDIS_CLI_OBJ= anet.o sds.o adlist.o redis-cli.o zmalloc.o release.o
REDIS_BENCHMARK_NAME= redis-benchmark REDIS_BENCHMARK_NAME= redis-benchmark
REDIS_BENCHMARK_OBJ= ae.o anet.o redis-benchmark.o sds.o adlist.o zmalloc.o redis-benchmark.o REDIS_BENCHMARK_OBJ= ae.o anet.o redis-benchmark.o sds.o adlist.o zmalloc.o redis-benchmark.o
REDIS_CHECK_DUMP_NAME= redis-check-dump REDIS_CHECK_DUMP_NAME= redis-check-dump
REDIS_CHECK_DUMP_OBJ= redis-check-dump.o lzf_c.o lzf_d.o REDIS_CHECK_DUMP_OBJ= redis-check-dump.o lzf_c.o lzf_d.o crc64.o
REDIS_CHECK_AOF_NAME= redis-check-aof REDIS_CHECK_AOF_NAME= redis-check-aof
REDIS_CHECK_AOF_OBJ= redis-check-aof.o REDIS_CHECK_AOF_OBJ= redis-check-aof.o

38
src/redis-check-dump.c
View File

@ -108,6 +108,9 @@ static double R_Zero, R_PosInf, R_NegInf, R_Nan;
/* store string types for output */ /* store string types for output */
static char types[256][16]; static char types[256][16];
/* Prototypes */
uint64_t crc64(uint64_t crc, const unsigned char *s, uint64_t l);
/* when number of bytes to read is negative, do a peek */ /* when number of bytes to read is negative, do a peek */
int readBytes(void *target, long num) { int readBytes(void *target, long num) {
char peek = (num < 0) ? 1 : 0; char peek = (num < 0) ? 1 : 0;
@ -137,10 +140,10 @@ int processHeader() {
} }
dump_version = (int)strtol(buf + 5, NULL, 10); dump_version = (int)strtol(buf + 5, NULL, 10);
if (dump_version < 1 || dump_version > 4) { if (dump_version < 1 || dump_version > 6) {
ERROR("Unknown RDB format version: %d\n", dump_version); ERROR("Unknown RDB format version: %d\n", dump_version);
} }
return 1; return dump_version;
} }
int loadType(entry *e) { int loadType(entry *e) {
@ -557,7 +560,16 @@ void printErrorStack(entry *e) {
void process() { void process() {
uint64_t num_errors = 0, num_valid_ops = 0, num_valid_bytes = 0; uint64_t num_errors = 0, num_valid_ops = 0, num_valid_bytes = 0;
entry entry; entry entry;
processHeader(); int dump_version = processHeader();
/* Exclude the final checksum for RDB >= 5. Will be checked at the end. */
if (dump_version >= 5) {
if (positions[0].size < 8) {
printf("RDB version >= 5 but no room for checksum.\n");
exit(1);
}
positions[0].size -= 8;;
}
level = 1; level = 1;
while(positions[0].offset < positions[0].size) { while(positions[0].offset < positions[0].size) {
@ -622,6 +634,26 @@ void process() {
num_errors++; num_errors++;
} }
/* Verify checksum */
if (dump_version >= 5) {
uint64_t crc = crc64(0,positions[0].data,positions[0].size);
uint64_t crc2;
unsigned char *p = (unsigned char*)positions[0].data+positions[0].size;
crc2 = ((uint64_t)p[0] << 0) |
((uint64_t)p[1] << 8) |
((uint64_t)p[2] << 16) |
((uint64_t)p[3] << 24) |
((uint64_t)p[4] << 32) |
((uint64_t)p[5] << 40) |
((uint64_t)p[6] << 48) |
((uint64_t)p[7] << 56);
if (crc != crc2) {
SHIFT_ERROR(positions[0].offset, "RDB CRC64 does not match.");
} else {
printf("CRC64 checksum is OK\n");
}
}
/* print summary on errors */ /* print summary on errors */
if (num_errors) { if (num_errors) {
printf("\n"); printf("\n");