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
5a6cfbf4
Commit
5a6cfbf4
authored
Feb 06, 2020
by
Guy Benoish
Committed by
antirez
Feb 12, 2020
Browse files
Some refactroing using getClientType instead of CLIENT_SLAVE
parent
fae306b3
Changes
2
Show whitespace changes
Inline
Side-by-side
src/networking.c
View file @
5a6cfbf4
...
...
@@ -369,9 +369,10 @@ void addReplyErrorLength(client *c, const char *s, size_t len) {
* Where the master must propagate the first change even if the second
* will produce an error. However it is useful to log such events since
* they are rare and may hint at errors in a script or a bug in Redis. */
if
(
c
->
flags
&
(
CLIENT_MASTER
|
CLIENT_SLAVE
)
&&
!
(
c
->
flags
&
CLIENT_MONITOR
))
{
char
*
to
=
c
->
flags
&
CLIENT_MASTER
?
"master"
:
"replica"
;
char
*
from
=
c
->
flags
&
CLIENT_MASTER
?
"replica"
:
"master"
;
int
ctype
=
getClientType
(
c
);
if
(
ctype
==
CLIENT_TYPE_MASTER
||
ctype
==
CLIENT_TYPE_SLAVE
)
{
char
*
to
=
ctype
==
CLIENT_TYPE_MASTER
?
"master"
:
"replica"
;
char
*
from
=
ctype
==
CLIENT_TYPE_MASTER
?
"replica"
:
"master"
;
char
*
cmdname
=
c
->
lastcmd
?
c
->
lastcmd
->
name
:
"<unknown>"
;
serverLog
(
LL_WARNING
,
"== CRITICAL == This %s is sending an error "
"to its %s: '%s' after processing the command "
...
...
@@ -1074,7 +1075,7 @@ void freeClient(client *c) {
}
/* Log link disconnection with slave */
if
(
(
c
->
flags
&
CLIENT_SLAVE
)
&&
!
(
c
->
flags
&
CLIENT_MONITOR
)
)
{
if
(
getClientType
(
c
)
==
CLIENT_TYPE_SLAVE
)
{
serverLog
(
LL_WARNING
,
"Connection with replica %s lost."
,
replicationGetSlaveName
(
c
));
}
...
...
src/object.c
View file @
5a6cfbf4
...
...
@@ -974,38 +974,29 @@ struct redisMemOverhead *getMemoryOverheadData(void) {
mh
->
repl_backlog
=
mem
;
mem_total
+=
mem
;
mem
=
0
;
if
(
listLength
(
server
.
slaves
))
{
listIter
li
;
listNode
*
ln
;
listRewind
(
server
.
slaves
,
&
li
);
while
((
ln
=
listNext
(
&
li
)))
{
client
*
c
=
listNodeValue
(
ln
);
mem
+=
getClientOutputBufferMemoryUsage
(
c
);
mem
+=
sdsAllocSize
(
c
->
querybuf
);
mem
+=
sizeof
(
client
);
}
}
mh
->
clients_slaves
=
mem
;
mem_total
+=
mem
;
mem
=
0
;
if
(
listLength
(
server
.
clients
))
{
listIter
li
;
listNode
*
ln
;
size_t
mem_normal
=
0
,
mem_slaves
=
0
;
listRewind
(
server
.
clients
,
&
li
);
while
((
ln
=
listNext
(
&
li
)))
{
size_t
mem_curr
=
0
;
client
*
c
=
listNodeValue
(
ln
);
if
(
c
->
flags
&
CLIENT_SLAVE
&&
!
(
c
->
flags
&
CLIENT_MONITOR
))
continue
;
mem
+=
getClientOutputBufferMemoryUsage
(
c
);
mem
+=
sdsAllocSize
(
c
->
querybuf
);
mem
+=
sizeof
(
client
);
int
type
=
getClientType
(
c
);
mem_curr
+=
getClientOutputBufferMemoryUsage
(
c
);
mem_curr
+=
sdsAllocSize
(
c
->
querybuf
);
mem_curr
+=
sizeof
(
client
);
if
(
type
==
CLIENT_TYPE_SLAVE
)
mem_slaves
+=
mem_curr
;
else
mem_normal
+=
mem_curr
;
}
mh
->
clients_slaves
=
mem_slaves
;
mh
->
clients_normal
=
mem_normal
;
mem
=
mem_slaves
+
mem_normal
;
}
mh
->
clients_normal
=
mem
;
mem_total
+=
mem
;
mem
=
0
;
...
...
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