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

DAOS-16660 No error message on intentional pmemobj transaction abort #43

Merged
merged 10 commits into from
Jan 17, 2025
Merged

DAOS-16660 No error message on intentional pmemobj transaction abort #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
890f16d
DAOS-16660 common: no-error-msg-on-user-abort
grom72 Oct 3, 2024
c1a7150
Fix: documentation and release date update
grom72 Nov 6, 2024
d7ea15b
Fix: disable failing tests
grom72 Nov 7, 2024
b9bbbc8
Fix: update packaging
grom72 Jan 7, 2025
e625038
DAOS-16660 Trigger rebuild
janekmi Jan 8, 2025
132df66
Fix: allow unstable tests of downstream build
grom72 Jan 14, 2025
3113e0b
Fix: allow unstable tests of downstream build
grom72 Jan 14, 2025
cf55039
Fix: allow unstable tests of downstream build
grom72 Jan 14, 2025
4dda74d
Fix: allow unstable tests of downstream build (3rd)
grom72 Jan 14, 2025
8d3e02e
Revert "Fix: allow unstable tests of downstream build"
grom72 Jan 16, 2025
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
7 changes: 7 additions & 0 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
pmdk (2.1.0-3) stable; urgency=medium
* Apply patches to silence annoying error messages on:
* an intentional transaction abort and
* PMDK being used with non-PMem HW.

-- Tomasz Gromadzki <[email protected]> Wed, 06 Nov 2024 10:00:00 +0000

pmdk (2.1.0-2) stable; urgency=medium

* Enable NDCTL on the top of PMDK 2.1.0
Expand Down
8 changes: 8 additions & 0 deletions packaging/Makefile_distro_vars.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,14 @@ DISTRO_VERSION ?= $(VERSION_ID)
ORIG_TARGET_VER := 15.5
SED_EXPR := 1p
endif
ifeq ($(CHROOT_NAME),opensuse-leap-15.6-x86_64)
VERSION_ID := 15.6
DISTRO_ID := sl15.6
DISTRO_BASE := LEAP_15
DISTRO_VERSION ?= $(VERSION_ID)
ORIG_TARGET_VER := 15.6
SED_EXPR := 1p
endif
endif
ifeq ($(ID),centos)
ID = el
Expand Down
2 changes: 1 addition & 1 deletion packaging/get_base_branch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

set -eux -o pipefail
IFS=' ' read -r -a add_bases <<< "${1:-}"
origin=origin
origin="${ORIGIN:-origin}"
mapfile -t all_bases < <(echo "master"
git branch -r | sed -ne "/^ $origin\\/release\\/[0-9]/s/^ $origin\\///p")
all_bases+=("${add_bases[@]}")
Expand Down
16 changes: 14 additions & 2 deletions pmdk.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
%global minor 1
%global bugrelease 0
#%%global prerelease rc1
%global buildrelease 2
%global buildrelease 3

%global _hardened_build 1

Expand All @@ -37,6 +37,13 @@ URL: https://github.com/pmem/pmdk
}

Source: https://github.com/pmem/%{name}/releases/download/%{upstream_version}/%{name}-%{upstream_version}.tar.gz
%if "%{?commit}" != ""
Patch0: %{version}..%{commit}.patch
%endif
# Fix https://github.com/pmem/pmdk/issues/6107 : Annoying error message on user intentional transaction abort
Patch1: https://github.com/pmem/pmdk/commit/61e32285370e629e2b36bbb991b919e44f87d915.patch
# Fix https://github.com/pmem/pmdk/issues/6126 : Unnecessary warning: "Cannot find any matching device, no bad blocks found" for non-pmem HW
Patch2: https://github.com/pmem/pmdk/commit/518b7426a13b21f98b2d2c435fa645770899446a.patch

BuildRequires: gcc
BuildRequires: make
Expand Down Expand Up @@ -403,11 +410,16 @@ make %{make_common_args} check


%changelog
* Wed Nov 06 2024 Tomasz Gromadzki <[email protected]> - 2.1.0-3
- Apply patches to silence annoying error messages on:
- an intentional transaction abort and
- PMDK being used with non-PMem HW.

* Wed Sep 04 2024 Tomasz.Gromadzki <[email protected]> - 2.1.0-2
- Enable NDCTL on the top of PMDK 2.1.0
- remove an option to build PMDK w/o NDCTL.

* Tue Aug 06 2024 Tomasz.Gromadzki <[email protected]> - 2.1.0-1
* Tue Aug 06 2024 Tomasz Gromadzki <[email protected]> - 2.1.0-1
- Update to release 2.1.0 w/o NDCTL support which:
- Introduces the new logging subsystem in the release build for all libraries.
- Messages by default are printed to syslog and stderr but might be redirected to a user-defined function, see pmem(obj)_log_set_function() for details.
Expand Down