Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
73c2bcca
Commit
73c2bcca
authored
Mar 14, 2014
by
Matt Stancliff
Committed by
antirez
Mar 24, 2014
Browse files
Sentinel: Notify user when config can't be saved
parent
65e04528
Changes
1
Show whitespace changes
Inline
Side-by-side
src/sentinel.c
View file @
73c2bcca
...
@@ -1562,19 +1562,22 @@ void rewriteConfigSentinelOption(struct rewriteConfigState *state) {
...
@@ -1562,19 +1562,22 @@ void rewriteConfigSentinelOption(struct rewriteConfigState *state) {
void
sentinelFlushConfig
(
void
)
{
void
sentinelFlushConfig
(
void
)
{
int
fd
;
int
fd
;
int
saved_hz
=
server
.
hz
;
int
saved_hz
=
server
.
hz
;
int
rewrite_status
;
server
.
hz
=
REDIS_DEFAULT_HZ
;
server
.
hz
=
REDIS_DEFAULT_HZ
;
if
(
rewriteConfig
(
server
.
configfile
)
!=
-
1
)
{
rewrite_status
=
rewriteConfig
(
server
.
configfile
);
/* Rewrite succeded, fsync it. */
if
((
fd
=
open
(
server
.
configfile
,
O_RDONLY
))
!=
-
1
)
{
fsync
(
fd
);
close
(
fd
);
}
}
else
{
redisLog
(
REDIS_WARNING
,
"WARNING: Sentinel was not able to save the new configuration on disk!!!: %s"
,
strerror
(
errno
));
}
server
.
hz
=
saved_hz
;
server
.
hz
=
saved_hz
;
if
(
rewrite_status
==
-
1
)
goto
werr
;
if
((
fd
=
open
(
server
.
configfile
,
O_RDONLY
))
==
-
1
)
goto
werr
;
if
(
fsync
(
fd
)
==
-
1
)
goto
werr
;
if
(
close
(
fd
)
==
EOF
)
goto
werr
;
return
;
return
;
werr:
if
(
fd
!=
-
1
)
close
(
fd
);
redisLog
(
REDIS_WARNING
,
"WARNING: Sentinel was not able to save the new configuration on disk!!!: %s"
,
strerror
(
errno
));
}
}
/* ====================== hiredis connection handling ======================= */
/* ====================== hiredis connection handling ======================= */
...
...
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