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
e51b79f3
Commit
e51b79f3
authored
Dec 21, 2011
by
antirez
Browse files
sligthly better AOF related logs
parent
b941417c
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/aof.c
View file @
e51b79f3
...
@@ -128,7 +128,12 @@ void flushAppendOnlyFile(int force) {
...
@@ -128,7 +128,12 @@ void flushAppendOnlyFile(int force) {
if
(
nwritten
==
-
1
)
{
if
(
nwritten
==
-
1
)
{
redisLog
(
REDIS_WARNING
,
"Exiting on error writing to the append-only file: %s"
,
strerror
(
errno
));
redisLog
(
REDIS_WARNING
,
"Exiting on error writing to the append-only file: %s"
,
strerror
(
errno
));
}
else
{
}
else
{
redisLog
(
REDIS_WARNING
,
"Exiting on short write while writing to the append-only file: %s"
,
strerror
(
errno
));
redisLog
(
REDIS_WARNING
,
"Exiting on short write while writing to "
"the append-only file: %s (nwritten=%ld, "
"expected=%ld)"
,
strerror
(
errno
),
(
long
)
nwritten
,
(
long
)
sdslen
(
server
.
aof_buf
));
}
}
exit
(
1
);
exit
(
1
);
}
}
...
@@ -673,7 +678,7 @@ int rewriteAppendOnlyFile(char *filename) {
...
@@ -673,7 +678,7 @@ int rewriteAppendOnlyFile(char *filename) {
snprintf
(
tmpfile
,
256
,
"temp-rewriteaof-%d.aof"
,
(
int
)
getpid
());
snprintf
(
tmpfile
,
256
,
"temp-rewriteaof-%d.aof"
,
(
int
)
getpid
());
fp
=
fopen
(
tmpfile
,
"w"
);
fp
=
fopen
(
tmpfile
,
"w"
);
if
(
!
fp
)
{
if
(
!
fp
)
{
redisLog
(
REDIS_WARNING
,
"
Failed rewriting the a
ppend
o
nly
f
ile: %s"
,
strerror
(
errno
));
redisLog
(
REDIS_WARNING
,
"
Opening the temp file for AOF rewrite in rewriteA
ppend
O
nly
F
ile
()
: %s"
,
strerror
(
errno
));
return
REDIS_ERR
;
return
REDIS_ERR
;
}
}
...
@@ -842,7 +847,7 @@ void aofUpdateCurrentSize(void) {
...
@@ -842,7 +847,7 @@ void aofUpdateCurrentSize(void) {
struct
redis_stat
sb
;
struct
redis_stat
sb
;
if
(
redis_fstat
(
server
.
aof_fd
,
&
sb
)
==
-
1
)
{
if
(
redis_fstat
(
server
.
aof_fd
,
&
sb
)
==
-
1
)
{
redisLog
(
REDIS_WARNING
,
"Unable to
check
the AOF length: %s"
,
redisLog
(
REDIS_WARNING
,
"Unable to
obtain
the AOF
file
length
. stat
: %s"
,
strerror
(
errno
));
strerror
(
errno
));
}
else
{
}
else
{
server
.
aof_current_size
=
sb
.
st_size
;
server
.
aof_current_size
=
sb
.
st_size
;
...
@@ -931,7 +936,7 @@ void backgroundRewriteDoneHandler(int exitcode, int bysignal) {
...
@@ -931,7 +936,7 @@ void backgroundRewriteDoneHandler(int exitcode, int bysignal) {
* it exists, because we reference it with "oldfd". */
* it exists, because we reference it with "oldfd". */
if
(
rename
(
tmpfile
,
server
.
aof_filename
)
==
-
1
)
{
if
(
rename
(
tmpfile
,
server
.
aof_filename
)
==
-
1
)
{
redisLog
(
REDIS_WARNING
,
redisLog
(
REDIS_WARNING
,
"Error trying to rename the temporary AOF: %s"
,
strerror
(
errno
));
"Error trying to rename the temporary AOF
file
: %s"
,
strerror
(
errno
));
close
(
newfd
);
close
(
newfd
);
if
(
oldfd
!=
-
1
)
close
(
oldfd
);
if
(
oldfd
!=
-
1
)
close
(
oldfd
);
goto
cleanup
;
goto
cleanup
;
...
@@ -959,7 +964,7 @@ void backgroundRewriteDoneHandler(int exitcode, int bysignal) {
...
@@ -959,7 +964,7 @@ void backgroundRewriteDoneHandler(int exitcode, int bysignal) {
server
.
aof_buf
=
sdsempty
();
server
.
aof_buf
=
sdsempty
();
}
}
redisLog
(
REDIS_NOTICE
,
"Background AOF rewrite successful"
);
redisLog
(
REDIS_NOTICE
,
"Background AOF rewrite
finished
successful
ly
"
);
/* Change state from WAIT_REWRITE to ON if needed */
/* Change state from WAIT_REWRITE to ON if needed */
if
(
server
.
aof_state
==
REDIS_AOF_WAIT_REWRITE
)
if
(
server
.
aof_state
==
REDIS_AOF_WAIT_REWRITE
)
server
.
aof_state
=
REDIS_AOF_ON
;
server
.
aof_state
=
REDIS_AOF_ON
;
...
...
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