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

Fix removal cancel #9259

Merged
merged 1 commit into from
Sep 3, 2019
Merged

Conversation

ikozhukhov
Copy link
Contributor

test failed due to fast operations on DilOS

original fail:

Test: /opt/zfs-tests/tests/functional/removal/removal_cancel.ksh (run as root) [00:05] [FAIL]

in log:
cat removal/removal_cancel/stderr:
cannot cancel removal: operation is not in progress

after update - increase test data - this test PASS on DilOS

ztest@zfs-tests2:~$ ./z2.sh
Test: /opt/zfs-tests/tests/functional/removal/removal_cancel.ksh (run as root) [00:30] [PASS]
Test: /opt/zfs-tests/tests/functional/removal/cleanup.ksh (run as root) [00:00] [PASS]

Results Summary
PASS       2

Running Time:   00:00:31
Percent passed: 100.0%
Log directory:  /var/tmp/test_results/20190830T192745

Motivation and Context

Description

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:

Signed-off-by: Igor Kozhukhov <[email protected]>
@behlendorf behlendorf added Status: Code Review Needed Ready for review and testing Component: Test Suite Indicates an issue with the test framework or a test case labels Aug 30, 2019
@behlendorf behlendorf requested a review from jwk404 August 30, 2019 17:06
Copy link
Contributor

@behlendorf behlendorf left a comment

Choose a reason for hiding this comment

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

It looks like we've observed this at least once as well in the CI.

Test: /usr/share/zfs/zfs-tests/tests/functional/removal/removal_cancel (run as root) [00:17] [FAIL]
16:56:10.78 NOTE: begin default_setup_noexit
16:56:10.95 SUCCESS: zpool create -f testpool loop0
16:56:10.97 SUCCESS: zfs create testpool/testfs
16:56:11.04 SUCCESS: zfs set mountpoint=/mnt/testdir testpool/testfs
16:56:11.04 SUCCESS: default_setup_noexit loop0
16:56:11.05 SUCCESS: mkfile -n 1g //mnt/testdir/00
16:56:18.82 SUCCESS: randwritecomp //mnt/testdir/00 12500
16:56:19.19 SUCCESS: zpool add -f testpool loop2
16:56:26.84 SUCCESS: zpool remove testpool loop0
16:56:27.84 SUCCESS: sleep 1
16:56:27.85 SUCCESS: set_tunable32 zfs_removal_suspend_progress 1
16:56:27.85   pool: testpool
16:56:27.85  state: ONLINE
16:56:27.85   scan: none requested
16:56:27.85 remove: Removal of vdev 0 copied 801M in 0h0m, completed on Thu Aug 22 16:56:27 2019
16:56:27.85     54.3K memory used for removed device mappings
16:56:27.85 config:
16:56:27.85 
16:56:27.85 	NAME          STATE     READ WRITE CKSUM
16:56:27.85 	testpool      ONLINE       0     0     0
16:56:27.85 	  loop2       ONLINE       0     0     0
16:56:27.85 
16:56:27.85 errors: No known data errors
16:56:27.86 SUCCESS: zpool status testpool
16:56:27.86 cannot cancel removal: operation is not in progress
16:56:27.86 ERROR: zpool remove -s testpool exited 1

@codecov
Copy link

codecov bot commented Aug 31, 2019

Codecov Report

Merging #9259 into master will decrease coverage by 0.21%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #9259      +/-   ##
==========================================
- Coverage   79.18%   78.97%   -0.22%     
==========================================
  Files         400      400              
  Lines      122035   122034       -1     
==========================================
- Hits        96634    96376     -258     
- Misses      25401    25658     +257
Flag Coverage Δ
#kernel 79.63% <ø> (-0.14%) ⬇️
#user 66.52% <ø> (-0.24%) ⬇️

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 d39c71d...c39d901. Read the comment docs.

@behlendorf behlendorf added Status: Accepted Ready to integrate (reviewed, tested) and removed Status: Code Review Needed Ready for review and testing labels Sep 3, 2019
@behlendorf behlendorf merged commit 1a504d2 into openzfs:master Sep 3, 2019
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Dec 24, 2019
Create a larger file to extend the time required to perform the
removal.  Occasional failures were observed due to the removal
completing before the cancel could be requested.

Reviewed-by: George Melikov <[email protected]>
Reviewed-by: John Kennedy <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Igor Kozhukhov <[email protected]>
Closes openzfs#9259
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Dec 27, 2019
Create a larger file to extend the time required to perform the
removal.  Occasional failures were observed due to the removal
completing before the cancel could be requested.

Reviewed-by: George Melikov <[email protected]>
Reviewed-by: John Kennedy <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Igor Kozhukhov <[email protected]>
Closes openzfs#9259
tonyhutter pushed a commit that referenced this pull request Jan 23, 2020
Create a larger file to extend the time required to perform the
removal.  Occasional failures were observed due to the removal
completing before the cancel could be requested.

Reviewed-by: George Melikov <[email protected]>
Reviewed-by: John Kennedy <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Igor Kozhukhov <[email protected]>
Closes #9259
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Component: Test Suite Indicates an issue with the test framework or a test case Status: Accepted Ready to integrate (reviewed, tested)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants