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
e6f39338
Commit
e6f39338
authored
Jul 28, 2015
by
antirez
Browse files
CLIENT_MASTER introduced.
parent
c1e94b6b
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/config.c
View file @
e6f39338
...
...
@@ -90,7 +90,7 @@ configEnum aof_fsync_enum[] = {
};
/* Output buffer limits presets. */
clientBufferLimitsConfig
clientBufferLimitsDefaults
[
CLIENT_TYPE_COUNT
]
=
{
clientBufferLimitsConfig
clientBufferLimitsDefaults
[
CLIENT_TYPE_
OBUF_
COUNT
]
=
{
{
0
,
0
,
0
},
/* normal */
{
1024
*
1024
*
256
,
1024
*
1024
*
64
,
60
},
/* slave */
{
1024
*
1024
*
32
,
1024
*
1024
*
8
,
60
}
/* pubsub */
...
...
@@ -1163,13 +1163,13 @@ void configGetCommand(client *c) {
sds
buf
=
sdsempty
();
int
j
;
for
(
j
=
0
;
j
<
CLIENT_TYPE_COUNT
;
j
++
)
{
for
(
j
=
0
;
j
<
CLIENT_TYPE_
OBUF_
COUNT
;
j
++
)
{
buf
=
sdscatprintf
(
buf
,
"%s %llu %llu %ld"
,
getClientTypeName
(
j
),
server
.
client_obuf_limits
[
j
].
hard_limit_bytes
,
server
.
client_obuf_limits
[
j
].
soft_limit_bytes
,
(
long
)
server
.
client_obuf_limits
[
j
].
soft_limit_seconds
);
if
(
j
!=
CLIENT_TYPE_COUNT
-
1
)
if
(
j
!=
CLIENT_TYPE_
OBUF_
COUNT
-
1
)
buf
=
sdscatlen
(
buf
,
" "
,
1
);
}
addReplyBulkCString
(
c
,
"client-output-buffer-limit"
);
...
...
@@ -1566,7 +1566,7 @@ void rewriteConfigClientoutputbufferlimitOption(struct rewriteConfigState *state
int
j
;
char
*
option
=
"client-output-buffer-limit"
;
for
(
j
=
0
;
j
<
CLIENT_TYPE_COUNT
;
j
++
)
{
for
(
j
=
0
;
j
<
CLIENT_TYPE_
OBUF_
COUNT
;
j
++
)
{
int
force
=
(
server
.
client_obuf_limits
[
j
].
hard_limit_bytes
!=
clientBufferLimitsDefaults
[
j
].
hard_limit_bytes
)
||
(
server
.
client_obuf_limits
[
j
].
soft_limit_bytes
!=
...
...
src/networking.c
View file @
e6f39338
...
...
@@ -1567,12 +1567,13 @@ unsigned long getClientOutputBufferMemoryUsage(client *c) {
* CLIENT_TYPE_NORMAL -> Normal client
* CLIENT_TYPE_SLAVE -> Slave or client executing MONITOR command
* CLIENT_TYPE_PUBSUB -> Client subscribed to Pub/Sub channels
* CLIENT_TYPE_MASTER -> The client representing our replication master.
*/
int
getClientType
(
client
*
c
)
{
if
(
c
->
flags
&
CLIENT_MASTER
)
return
CLIENT_TYPE_MASTER
;
if
((
c
->
flags
&
CLIENT_SLAVE
)
&&
!
(
c
->
flags
&
CLIENT_MONITOR
))
return
CLIENT_TYPE_SLAVE
;
if
(
c
->
flags
&
CLIENT_PUBSUB
)
return
CLIENT_TYPE_PUBSUB
;
if
(
c
->
flags
&
CLIENT_PUBSUB
)
return
CLIENT_TYPE_PUBSUB
;
return
CLIENT_TYPE_NORMAL
;
}
...
...
@@ -1580,6 +1581,7 @@ int getClientTypeByName(char *name) {
if
(
!
strcasecmp
(
name
,
"normal"
))
return
CLIENT_TYPE_NORMAL
;
else
if
(
!
strcasecmp
(
name
,
"slave"
))
return
CLIENT_TYPE_SLAVE
;
else
if
(
!
strcasecmp
(
name
,
"pubsub"
))
return
CLIENT_TYPE_PUBSUB
;
else
if
(
!
strcasecmp
(
name
,
"master"
))
return
CLIENT_TYPE_MASTER
;
else
return
-
1
;
}
...
...
@@ -1588,6 +1590,7 @@ char *getClientTypeName(int class) {
case
CLIENT_TYPE_NORMAL
:
return
"normal"
;
case
CLIENT_TYPE_SLAVE
:
return
"slave"
;
case
CLIENT_TYPE_PUBSUB
:
return
"pubsub"
;
case
CLIENT_TYPE_MASTER
:
return
"master"
;
default:
return
NULL
;
}
}
...
...
@@ -1603,6 +1606,10 @@ int checkClientOutputBufferLimits(client *c) {
unsigned
long
used_mem
=
getClientOutputBufferMemoryUsage
(
c
);
class
=
getClientType
(
c
);
/* For the purpose of output buffer limiting, masters are handled
* like normal clients. */
if
(
class
==
CLIENT_TYPE_MASTER
)
class
=
CLIENT_TYPE_NORMAL
;
if
(
server
.
client_obuf_limits
[
class
].
hard_limit_bytes
&&
used_mem
>=
server
.
client_obuf_limits
[
class
].
hard_limit_bytes
)
hard
=
1
;
...
...
src/server.c
View file @
e6f39338
...
...
@@ -1533,7 +1533,7 @@ void initServerConfig(void) {
server
.
repl_no_slaves_since
=
time
(
NULL
);
/* Client output buffer limits */
for
(
j
=
0
;
j
<
CLIENT_TYPE_COUNT
;
j
++
)
for
(
j
=
0
;
j
<
CLIENT_TYPE_
OBUF_
COUNT
;
j
++
)
server
.
client_obuf_limits
[
j
]
=
clientBufferLimitsDefaults
[
j
];
/* Double constants initialization */
...
...
src/server.h
View file @
e6f39338
...
...
@@ -276,7 +276,10 @@ typedef long long mstime_t; /* millisecond time type. */
#define CLIENT_TYPE_NORMAL 0
/* Normal req-reply clients + MONITORs */
#define CLIENT_TYPE_SLAVE 1
/* Slaves. */
#define CLIENT_TYPE_PUBSUB 2
/* Clients subscribed to PubSub channels. */
#define CLIENT_TYPE_COUNT 3
#define CLIENT_TYPE_MASTER 3
/* Master. */
#define CLIENT_TYPE_OBUF_COUNT 3
/* Number of clients to expose to output
buffer configuration. Just the first
three: normal, slave, pubsub. */
/* Slave replication state. Used in server.repl_state for slaves to remember
* what to do next. */
...
...
@@ -625,7 +628,7 @@ typedef struct clientBufferLimitsConfig {
time_t
soft_limit_seconds
;
}
clientBufferLimitsConfig
;
extern
clientBufferLimitsConfig
clientBufferLimitsDefaults
[
CLIENT_TYPE_COUNT
];
extern
clientBufferLimitsConfig
clientBufferLimitsDefaults
[
CLIENT_TYPE_
OBUF_
COUNT
];
/* The redisOp structure defines a Redis Operation, that is an instance of
* a command with an argument vector, database ID, propagation target
...
...
@@ -751,7 +754,7 @@ struct redisServer {
int
supervised
;
/* 1 if supervised, 0 otherwise. */
int
supervised_mode
;
/* See SUPERVISED_* */
int
daemonize
;
/* True if running as a daemon */
clientBufferLimitsConfig
client_obuf_limits
[
CLIENT_TYPE_COUNT
];
clientBufferLimitsConfig
client_obuf_limits
[
CLIENT_TYPE_
OBUF_
COUNT
];
/* AOF persistence */
int
aof_state
;
/* AOF_(ON|OFF|WAIT_REWRITE) */
int
aof_fsync
;
/* Kind of fsync() policy */
...
...
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