Skip to content

Add log files into the cache tar for improved debugging #18026

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

Merged
qiluo-msft merged 6 commits into from
Mar 23, 2024
Merged

Add log files into the cache tar for improved debugging #18026

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
404dbc3
Add log files into the cache tar for improved debugging
vivekrnv Jan 12, 2024
4038fdf
Revert to default compression level
vivekrnv Jan 20, 2024
1e10a23
Use a copy of log to write into the tar file
vivekrnv Feb 27, 2024
d747448
Merge branch 'cache_log' of github.com:vivekrnv/sonic-buildimage into…
vivekrnv Feb 27, 2024
7cf8918
Fix merge conflicts
vivekrnv Feb 27, 2024
47b538e
Minor Changes
vivekrnv Feb 27, 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
6 changes: 4 additions & 2 deletions Makefile.cache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,10 +295,12 @@ define SAVE_INTO_CACHE
echo "Target $(1) dependencies are modifed - global save cache skipped" >> $($(1)_DST_PATH)/$(1).log
$(eval $(1)_CACHE_DIR := $(SONIC_DPKG_LOCAL_CACHE_DIR))
)
$($(1)_CACHE_USER) tar -C $($(1)_BASE_PATH) -mczvf $($(1)_CACHE_DIR)/$(MOD_CACHE_FILE) $(2) $(addprefix $($(1)_DST_PATH)/,$($(1)_DERIVED_DEBS) $($(1)_EXTRA_DEBS) ) \
cp $($(1)_DST_PATH)/$(1).log $($(1)_DST_PATH)/$(1).cached.log
$($(1)_CACHE_USER) tar -C $($(1)_BASE_PATH) -mczvf $($(1)_CACHE_DIR)/$(MOD_CACHE_FILE) $(2) $(addprefix $($(1)_DST_PATH)/,$($(1)_DERIVED_DEBS) $($(1)_EXTRA_DEBS) $(1).cached.log) \
1>>$($(1)_DST_PATH)/$(1).log
sudo chmod 777 $($(1)_CACHE_DIR)/$(MOD_CACHE_FILE)

rm -f $($(1)_DST_PATH)/$(1).cached.log

echo "File $($(1)_CACHE_DIR)/$(MOD_CACHE_FILE) saved in cache " >> $($(1)_DST_PATH)/$(1).log
echo "[ CACHE::SAVED ] $($(1)_CACHE_DIR)/$(MOD_CACHE_FILE)" >> $($(1)_DST_PATH)/$(1).log

Expand Down