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

To fix the issue: show_techsupport & saidump errors during testbed testing by replacing redis-rdb-tool with rdb-cli #19268

Merged
merged 3 commits into from
Nov 7, 2024
Merged

To fix the issue: show_techsupport & saidump errors during testbed testing by replacing redis-rdb-tool with rdb-cli #19268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f042307
To fix the issue: show_techsupport & saidump errors during testbed te…
JunhongMao Jun 11, 2024
6b5dbc5
According to the review comments, update the rdb-cli installation loc…
JunhongMao Aug 2, 2024
5dc10e6
According to reivew comments, build librdb just like any other regul…
JunhongMao Oct 16, 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
12 changes: 0 additions & 12 deletions dockers/docker-base-bookworm/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,18 +81,6 @@ RUN pip3 install supervisord-dependent-startup==1.4.0

RUN mkdir -p /var/log/supervisor /etc/supervisor/conf.d

# Install gcc, libc6-dev and python3-dev for compiling python-lzf
RUN apt-get -y install build-essential libc6-dev python3-dev

# Install python-lzf
RUN pip3 install 'python-lzf==0.2.4'

# Install rdbtools
RUN pip3 install 'rdbtools==0.1.15'

# Uninstall gcc, libc6-dev and python3-dev for compiling python-lzf
RUN apt-get -y purge build-essential libc6-dev python3-dev

# Uninstall unused dependencies
RUN apt autoremove -y --purge

Expand Down
12 changes: 0 additions & 12 deletions dockers/docker-base-bullseye/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,18 +83,6 @@ RUN pip3 install supervisord-dependent-startup==1.4.0

RUN mkdir -p /var/log/supervisor /etc/supervisor/conf.d

# Install gcc, libc6-dev and python3-dev for compiling python-lzf
RUN apt-get -y install build-essential libc6-dev python3-dev

# Install python-lzf
RUN pip3 install 'python-lzf==0.2.4'

# Install rdbtools
RUN pip3 install 'rdbtools==0.1.15'

# Uninstall gcc, libc6-dev and python3-dev for compiling python-lzf
RUN apt-get -y purge build-essential libc6-dev python3-dev

# Uninstall unused dependencies
RUN apt autoremove -y --purge

Expand Down
2 changes: 1 addition & 1 deletion platform/broadcom/docker-syncd-brcm.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ include $(PLATFORM_PATH)/../template/docker-syncd-bullseye.mk

$(DOCKER_SYNCD_BASE)_DEPENDS += $(SYNCD)
$(DOCKER_SYNCD_BASE)_DEPENDS += $(BRCM_XGS_SAI)
$(DOCKER_SYNCD_BASE)_FILES += $(DSSERVE) $(BCMCMD)
$(DOCKER_SYNCD_BASE)_FILES += $(DSSERVE) $(BCMCMD) $(RDB-CLI)

$(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(SYNCD_DBG) \
$(LIBSWSSCOMMON_DBG) \
Expand Down
4 changes: 2 additions & 2 deletions platform/broadcom/docker-syncd-brcm/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ RUN apt-get install -yf kmod
## BRCM uses ethtool to set host interface speed
RUN apt-get install -y ethtool

COPY ["files/dsserve", "files/bcmcmd", "start.sh", "start_led.sh", "bcmsh", "/usr/bin/"]
RUN chmod +x /usr/bin/dsserve /usr/bin/bcmcmd
COPY ["files/dsserve", "files/bcmcmd", "start.sh", "start_led.sh", "bcmsh", "files/rdb-cli", "/usr/bin/"]
RUN chmod +x /usr/bin/dsserve /usr/bin/bcmcmd /usr/bin/rdb-cli

COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
COPY ["files/supervisor-proc-exit-listener", "/usr/bin"]
Expand Down
9 changes: 9 additions & 0 deletions rules/rdb-cli.dep
View file
Open in desktop
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)
14 changes: 14 additions & 0 deletions rules/rdb-cli.mk
View file
Open in desktop
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
14 changes: 14 additions & 0 deletions src/rdb-cli/Makefile
View file
Open in desktop
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
JunhongMao marked this conversation as resolved.
Show resolved Hide resolved
git submodule update --init --recursive
make -j$(SONIC_CONFIG_MAKE_JOBS)
mv bin/rdb-cli $(DEST)/
Loading