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.

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

Merge stable 1.13 to master #5623

Merged
merged 15 commits into from
May 10, 2023
Merged

Conversation

janekmi
Copy link
Contributor

@janekmi janekmi commented May 10, 2023

This change is Reviewable

lukaszstolarczuk and others added 13 commits May 4, 2023 16:39
- add workflows' descriptions (and update existing ones),
- simplify workflows,
- update triggers,
- clean up redundant steps, packages,
- general cleanup (like fixing indentation).
don't run bash and python tests sequentially, because failure
of the first run, may hide issue in the second one.
- replace separate script to build pmdk docs with a single command,
- rename check_docs script,
- always use libpmem2 in check_docs - remove redundant parameter.
- clean redundant packages,
- make order in ENV variables,
- update comments,
- update maintainer.
The "sudo ndctl clear-errors" command resets permissions
of the DAX block device and its resource files
because it removes the old files and creates new ones
with default permissions which interrupts further test execution.
The following commands set permissions which should allow
further test execution to work around this issue.

Ref: pmem#5606

Signed-off-by: Lukasz Dorau <lukasz.dorau@intel.com>
ex_libpmem2/TEST6 would require two VALGRIND_SET_CLEAN() calls
to be added to the "src/examples/libpmem2/ringbuf/ringbuf.c"
example (see pmem#5604)
in order to pass under pmemcheck, but it seems that examples
do not use valgrind macros on purpose (to avoid unnecessary
complication), so this test just should not be run under pmemcheck.

Fixes: pmem#5598

Signed-off-by: Lukasz Dorau <lukasz.dorau@intel.com>
…AX-devices-after-clearing-bad-blocks

test: update permissions of DAX devices after clearing bad blocks
…d-not-be-run-under-pmemcheck

test: ex_libpmem2/TEST6 should not be run under pmemcheck
Since this file, is for linux only, there is no need to use #ifndef
pmem2: fix valgrind instrumentation in pmem2_map_from_exisiting
Copy link
Contributor

@grom72 grom72 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 12 of 12 files at r1, 1 of 1 files at r2, 2 of 3 files at r3, 8 of 9 files at r8, 1 of 1 files at r9, 2 of 2 files at r10, 2 of 2 files at r11.
Reviewable status: all files reviewed (commit messages unreviewed), all discussions resolved (waiting on @janekmi)

pmem2: remove unnecessary #ifndef
@janekmi janekmi force-pushed the merge-stable-1.13-to-master branch from dc86bc4 to fecde0c Compare May 10, 2023 08:37
@janekmi janekmi mentioned this pull request May 10, 2023
1 task
@janekmi janekmi added this to the 1.14 milestone May 10, 2023
Copy link
Contributor

@grom72 grom72 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 3 of 3 files at r12, 2 of 2 files at r13, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @janekmi)

Copy link
Member

@ldorau ldorau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewed 1 of 2 files at r11, 1 of 3 files at r12, 2 of 2 files at r13, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @janekmi)

@codecov
Copy link

codecov bot commented May 10, 2023

Codecov Report

Merging #5623 (dc86bc4) into master (8873de5) will increase coverage by 2.01%.
The diff coverage is n/a.

❗ Current head dc86bc4 differs from pull request most recent head fecde0c. Consider uploading reports for the commit fecde0c to get more accurate results

@@            Coverage Diff             @@
##           master    #5623      +/-   ##
==========================================
+ Coverage   72.24%   74.25%   +2.01%     
==========================================
  Files         146      146              
  Lines       22634    22132     -502     
  Branches     3771     3705      -66     
==========================================
+ Hits        16351    16434      +83     
+ Misses       6283     5698     -585     

Copy link
Member

@ldorau ldorau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 1 of 12 files at r1.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @janekmi)

Copy link
Contributor

@grom72 grom72 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @janekmi)

@lukaszstolarczuk
Copy link
Member

FYI, I'd wait for #5622 and (at least) one future PR with CI fixes.

Copy link
Member

@lukaszstolarczuk lukaszstolarczuk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 9 of 12 files at r1, 1 of 1 files at r2, 2 of 3 files at r3, 8 of 9 files at r8, 1 of 1 files at r9, 1 of 2 files at r10, 1 of 3 files at r12, 2 of 2 files at r13, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @janekmi)

Copy link
Contributor

@grom72 grom72 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can do one more merge later. For now, it is most important to fix master branch dax0.2 issue

Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @janekmi)

@janekmi janekmi merged commit 37292d4 into pmem:master May 10, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants