PR#12: Fix for mix transcoded/untranscoded transactions - rpms/rpm

rpms / rpm

#12 Fix for mix transcoded/untranscoded transactions

Merged 8 months ago by anitazha. Opened 8 months ago by richardphibel.

rpms/ richardphibel/rpm fix-for-mix-transactions into c9s-sig-hyperscale

Fix for mix transcoded/untranscoded transactions

Richard Phibel • 8 months ago

2e61d0

0034-rpmcow-fix-issue-for-transaction-with-transcoded-and-untranscoded-packages.patch

file added

+28

		`@@ -0,0 +1,28 @@`
		`+ From a3b6102b4d2e79a8b74b036c6a29272a7f6e5c6a Mon Sep 17 00:00:00 2001`
		`+ From: Richard Phibel <richardphibel@meta.com>`
		`+ Date: Fri, 11 Aug 2023 00:43:21 +0200`
		`+ Subject: [PATCH] Fix issue for transaction with transcoded and non-transcoded`
		`+ packages`
		`+`
		`+ The flag saying whether a package is transcoded is not clean-up between`
		`+ each packages. Because of that if a non-transcoded package is treated`
		`+ after a transcoded one, the package is treated as transcoded`
		`+ ---`
		`+ plugins/reflink.c \| 1 +`
		`+ 1 file changed, 1 insertion(+)`
		`+`
		`+ diff --git a/plugins/reflink.c b/plugins/reflink.c`
		`+ index 986cbd172..20d35eefd 100644`
		`+ --- a/plugins/reflink.c`
		`+ +++ b/plugins/reflink.c`
		`+ @@ -234,6 +234,7 @@ static rpmRC reflink_psm_post(rpmPlugin plugin, rpmte te, int res)`
		`+ inodeIndexHashFree(state->inodeIndexes);`
		`+ state->inodeIndexes = NULL;`
		`+ }`
		`+ + state->transcoded = 0;`
		`+ return RPMRC_OK;`
		`+ }`
		`+`
		`+ --`
		`+ 2.40.1`
		`+`

rpm.spec

file modified

+5 -1

		`@@ -42,7 +42,7 @@`

		`%global rpmver 4.16.1.3`
		`#global snapver rc1`
		`- %global rel 22.4`
		`+ %global rel 22.5`
		`%global sover 9`

		`%global srcver %{rpmver}%{?snapver:-%{snapver}}`
		`@@ -191,6 +191,7 @@`
		`Patch9931: 0031-rpmcow-denylist.patch`
		`Patch9932: 0032-rpmcow-workaround.patch`
		`Patch9933: 0033-rpmcow-fix-stack-overflow-in-rpm2extents.patch`
		`+ Patch9934: 0034-rpmcow-fix-issue-for-transaction-with-transcoded-and-untranscoded-packages.patch`
		`Provides: rpm(pr1470)`
		`Provides: rpm(pr1470_1)`

		`@@ -776,6 +777,9 @@`
		`%doc doc/librpm/html/*`

		`%changelog`
		`+ * Fri Aug 11 2023 Richard Phibel <richardphibel@meta.com> - 4.16.1.3-22.5`
		`+ - Fix issue for transaction with transcoded and non-transcoded packages`
		`+`
		`* Mon May 22 2023 Richard Phibel <richardphibel@meta.com> - 4.16.1.3-22.4`
		`- Fix stack overflow in rpm2extents and various memory leaks`

richardphibel commented 8 months ago

The flag saying whether a package is transcoded is not clean-up between
each packages. Because of that if a non-transcoded package is treated
after a transcoded one, the package is treated as transcoded