-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
To fix the issue: show_techsupport & saidump errors during testbed te…
…sting by replacing redis-rdb-tool with rdb-cli (#19268) * To fix the issue: show_techsupport & saidump errors during testbed testing sonic-net/sonic-sairedis#1387 To use the Redis-db SAVE option to save the snapshot of DB each time and recover later, instead of looping through each entry in the table and saving it. (1) Updated sonic-buildimage repo's platform/broadcom/docker-syncd-brcm-dnx/Dockerfile.j2, install rdb-cli into the syncd containter. (2) Updated sonic-sairedis repo's script file: files/scripts/saidump.sh, replace rdbtools with rdb-cli. (3) Updated sonic-sairedis repo's saidump/saidump.cpp, to process the rdb-cli's ouput json file.
- Loading branch information
1 parent
482d47a
commit 9685498
Showing
7 changed files
with
40 additions
and
27 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
|
||
SPATH := $($(RDB-CLI)_SRC_PATH) | ||
DEP_FILES := $(SONIC_COMMON_FILES_LIST) rules/rdb-cli.mk rules/rdb-cli.dep | ||
DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST) | ||
DEP_FILES += $(shell git ls-files $(SPATH)) | ||
|
||
$(RDB-CLI)_CACHE_MODE := GIT_CONTENT_SHA | ||
$(RDB-CLI)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) | ||
$(RDB-CLI)_DEP_FILES := $(DEP_FILES) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
# librdb package | ||
# | ||
|
||
|
||
RDB_CLI_VERSION_FULL = 0.1 | ||
|
||
export RDB_CLI_VERSION_FULL | ||
|
||
RDB-CLI = rdb-cli | ||
|
||
export RDB-CLI | ||
|
||
$(RDB-CLI)_SRC_PATH = $(SRC_PATH)/rdb-cli | ||
SONIC_MAKE_FILES += rdb-cli |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
.ONESHELL: | ||
SHELL = /bin/bash | ||
.SHELLFLAGS += -e | ||
|
||
MAIN_TARGET = rdb-cli | ||
|
||
$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : | ||
rm -rf ./librdb | ||
git clone https://github.com/redis/librdb.git | ||
pushd ./librdb/ | ||
git checkout 2fdfc0c2bc914d643fe3f86e6715aeb843d8966e | ||
git submodule update --init --recursive | ||
make -j$(SONIC_CONFIG_MAKE_JOBS) | ||
mv bin/rdb-cli $(DEST)/ |