mirrors/valkey
1
0
Fork 0
mirror of http://github.com/valkey-io/valkey synced 2024-11-23 03:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix missing sections for INFO ALL with module (#11291)

Browse Source 
When using `INFO ALL <section>`, when `section` is a specific module section. 
Redis will not print the additional section(s).

The fix in this case, will search the modules info sections if the user provided additional sections to `ALL`.

Co-authored-by: Oran Agra <oran@redislabs.com>
This commit is contained in:
Shay Fadida 2022-09-21 08:10:03 +03:00 committed by GitHub
parent c2b0c13d5c
commit eedb8b1724
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/server.c
View File

@ -6010,9 +6010,13 @@ sds genRedisInfoString(dict *section_dict, int all_sections, int everything) {
}
/* Get info from modules.
* if user asked for "everything" or "modules", or a specific section
* that's not found yet. */
if (everything || dictFind(section_dict, "modules") != NULL || sections < (int)dictSize(section_dict)) {
* Returned when the user asked for "everything", "modules", or a specific module section.
* We're not aware of the module section names here, and we rather avoid the search when we can.
* so we proceed if there's a requested section name that's not found yet, or when the user asked
* for "all" with any additional section names. */
if (everything || dictFind(section_dict, "modules") != NULL || sections < (int)dictSize(section_dict) ||
(all_sections && dictSize(section_dict)))
{
info = modulesCollectInfo(info,
everything || dictFind(section_dict, "modules") != NULL ? NULL: section_dict,

8
tests/unit/moduleapi/infotest.tcl
View File

@ -44,6 +44,14 @@ start_server {tags {"modules"}} {
assert { [string match "*used_memory*" $info] }
}
test {module info all infotest} {
set info [r info all infotest]
# info all infotest should contain both ALL and the module information
assert { [string match "*Spanish*" $info] }
assert { [string match "*infotest_*" $info] }
assert { [string match "*used_memory*" $info] }
}
test {module info everything} {
set info [r info everything]
# info everything contains all default sections, but not ones for crash report