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

ZTS: clean up leftover ibackup_trunc files #7430

Merged
merged 1 commit into from
Apr 13, 2018
Merged

ZTS: clean up leftover ibackup_trunc files #7430

merged 1 commit into from
Apr 13, 2018

Conversation

bunder2015
Copy link
Contributor

@bunder2015 bunder2015 commented Apr 12, 2018

Description

zfs_receive_raw_incremental did not clean up ibackup_trunc.* files left over from running the test.

Motivation and Context

Cleans up /var/tmp a little

How Has This Been Tested?

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Performance enhancement (non-breaking change which improves efficiency)
  • Code cleanup (non-breaking change which makes code smaller or more readable)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentation (a change to man pages or other documentation)

Checklist:

  • My code follows the ZFS on Linux code style requirements.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.
  • All commit messages are properly formatted and contain Signed-off-by.
  • Change has been approved by a ZFS on Linux member.

@@ -49,6 +49,7 @@ function cleanup
log_must zfs destroy -r $TESTPOOL/$TESTFS2

[[ -f $ibackup ]] && log_must rm -f $ibackup
[[ -f $ibackup_trunc ]] && log_must rm -f $ibackup_trunc
Copy link
Contributor

Choose a reason for hiding this comment

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

We should also change ibackup and ibackup_trunc's location to $TEST_BASE_DIR. Which is normally /var/tmp but it set by the buildbot to an alternate path for its testing.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done thanks!

zfs_receive_raw_incremental did not clean up ibackup_trunc.* files
left over from running the test.

Also changing the path of the ibackup files so they can be placed
in the correct directories when /var/tmp is not the temporary
directory.

Signed-off-by: bunder2015 <omfgbunder@gmail.com>
@codecov
Copy link

codecov bot commented Apr 13, 2018

Codecov Report

Merging #7430 into master will increase coverage by 0.15%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #7430      +/-   ##
==========================================
+ Coverage    76.2%   76.35%   +0.15%     
==========================================
  Files         330      330              
  Lines      104294   104289       -5     
==========================================
+ Hits        79474    79633     +159     
+ Misses      24820    24656     -164
Flag Coverage Δ
#kernel 76.17% <ø> (+0.23%) ⬆️
#user 65.75% <ø> (+0.35%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7fab636...1a1d0fb. Read the comment docs.

@behlendorf behlendorf merged commit 1e37dee into openzfs:master Apr 13, 2018
@bunder2015 bunder2015 deleted the ibackup-cleanup branch April 13, 2018 20:53
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.

3 participants