Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add new flag in CLIENT LIST for import-source client #1398

Merged
merged 4 commits into from
Dec 10, 2024
Merged

Add new flag in CLIENT LIST for import-source client #1398

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
477d64b
Add client flag for import-source && allow to close import-source whe…
lyq2333 Dec 6, 2024
0330a10
add DEBUG_CONFIG for import-mode
lyq2333 Dec 6, 2024
3d514d1
Apply suggestions from code review
lyq2333 Dec 9, 2024
83792d0
Update tests/unit/expire.tcl
lyq2333 Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3209,7 +3209,7 @@ standardConfig static_configs[] = {
createBoolConfig("enable-debug-assert", NULL, IMMUTABLE_CONFIG | HIDDEN_CONFIG, server.enable_debug_assert, 0, NULL, NULL),
createBoolConfig("cluster-slot-stats-enabled", NULL, MODIFIABLE_CONFIG, server.cluster_slot_stats_enabled, 0, NULL, NULL),
createBoolConfig("hide-user-data-from-log", NULL, MODIFIABLE_CONFIG, server.hide_user_data_from_log, 1, NULL, NULL),
createBoolConfig("import-mode", NULL, MODIFIABLE_CONFIG, server.import_mode, 0, NULL, NULL),
createBoolConfig("import-mode", NULL, DEBUG_CONFIG | MODIFIABLE_CONFIG, server.import_mode, 0, NULL, NULL),

/* String Configs */
createStringConfig("aclfile", NULL, IMMUTABLE_CONFIG, ALLOW_EMPTY_STRING, server.acl_filename, "", NULL, NULL),
Expand Down
3 changes: 2 additions & 1 deletion src/networking.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3340,6 +3340,7 @@ sds catClientInfoString(sds s, client *client, int hide_user_data) {
if (client->flag.readonly) *p++ = 'r';
if (client->flag.no_evict) *p++ = 'e';
if (client->flag.no_touch) *p++ = 'T';
if (client->flag.import_source) *p++ = 'I';
if (p == flags) *p++ = 'N';
*p++ = '\0';

Expand Down Expand Up @@ -4101,7 +4102,7 @@ void clientCommand(client *c) {
addReply(c, shared.ok);
} else if (!strcasecmp(c->argv[1]->ptr, "import-source")) {
/* CLIENT IMPORT-SOURCE ON|OFF */
if (!server.import_mode) {
if (!server.import_mode && strcasecmp(c->argv[2]->ptr, "off")) {
addReplyError(c, "Server is not in import mode");
return;
}
Expand Down
18 changes: 18 additions & 0 deletions tests/unit/expire.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -833,6 +833,24 @@ start_server {tags {"expire"}} {
assert_equal [r debug set-active-expire 1] {OK}
} {} {needs:debug}

test {import-source can be closed when import-mode is off} {
r flushall
set id [r client id]

catch {r client import-source on} err
assert_match {ERR*} $err

r config set import-mode yes
assert_equal [r client import-source on] {OK}

assert_match {*flags=I*} [r client list id $id]

r config set import-mode no
assert_equal [r client import-source off] {OK}

assert_match {*flags=N*} [r client list id $id]
}

test {Import mode should forbid active expiration} {
r flushall

Expand Down
Loading