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

tests: fix osd-scrub-repair.sh #12072

Merged
merged 2 commits into from Nov 22, 2016
Merged

tests: fix osd-scrub-repair.sh #12072

merged 2 commits into from Nov 22, 2016

Conversation

dzafman
Copy link
Contributor

@dzafman dzafman commented Nov 18, 2016

No description provided.

@dzafman dzafman changed the title Wip test 17830 DNM: Wip test 17830 Nov 18, 2016
@dzafman
Copy link
Contributor Author

dzafman commented Nov 19, 2016

There be only 1 more bug before this pull request can be merged:

http://tracker.ceph.com/issues/17966

There is only the 1 failure on the last Jenkins run.

@dzafman dzafman changed the title DNM: Wip test 17830 Fix for osd-scrub-repair.sh and too little timeout in wait_for_clean() Nov 19, 2016
@dzafman
Copy link
Contributor Author

dzafman commented Nov 20, 2016

Ready to be reviewed and merged.

@ghost
Copy link

ghost commented Nov 21, 2016

@dzafman I propose an alternate fix for 0b1d42a at #12095

@ghost
Copy link

ghost commented Nov 21, 2016

When running the test from within an emacs buffer,

[loic@rex001 build]$ stty -a | head -1 | sed -e 's/.*columns \([0-9]*\).*/\1/'                                                                                                 
0                                                                                                                                                                              
[loic@rex001 build]$ stty -a                                                                                                                                                   
speed 38400 baud; rows 0; columns 0; line = 0;                                                                                                                                 
intr = ^C; quit = ^\; erase = ; kill = ; eof = ^D; eol = ; eol2 = ; swtch = ; start = ^Q; stop = ^S; susp = ^Z; rprnt = ^R; werase = ^W;    
lnext = ^V; flush = ^O; min = 1; time = 0;                                                                                                                                     
-parenb -parodd cs8 -hupcl -cstopb cread -clocal -crtscts                                                                                                                      
-ignbrk -brkint -ignpar -parmrk -inpck -istrip -inlcr -igncr icrnl ixon -ixoff -iuclc -ixany -imaxbel -iutf8                                                                   
opost -olcuc -ocrnl -onlcr -onocr -onlret -ofill -ofdel nl0 cr0 tab0 bs0 vt0 ff0                                                                                               
isig icanon iexten -echo echoe echok -echonl -noflsh -xcase -tostop -echoprt echoctl echoke                                                                                    
[loic@rex001 build]$ 

and the test fail with

/home/loic/ceph-ubuntu-14.04-loic/src/test/osd/osd-scrub-repair.sh:1811: TEST_corrupt_scrub_erasure:  diff -y -W 0 td/osd-scrub-repair/checkcsjson td/osd-scrub-repair/csjson
diff: invalid width '0'
diff: Try 'diff --help' for more information.
/home/loic/ceph-ubuntu-14.04-loic/src/test/osd/osd-scrub-repair.sh:1811: TEST_corrupt_scrub_erasure:  test no = yes
/home/loic/ceph-ubuntu-14.04-loic/src/test/osd/osd-scrub-repair.sh:1811: TEST_corrupt_scrub_erasure:  return 1

@ghost
Copy link

ghost commented Nov 21, 2016

Now running

while : ; do echo -n . ; ctest -R osd-scrub-repair.sh >& ../out || break ; sleep 1 ; done

and I'll let it run until tomorrow morning.
In parallel on the same machine the following is running in a container to create high load

while : ; do echo -n . ; rm -fr build ; ./run-make-check.sh >& out || break ; sleep 10 ; done

if (hinfo->get_total_chunk_size() != pos) {
dout(0) << "_scan_list " << poid << " got incorrect size on read" << dendl;
if (hinfo->get_chunk_hash(get_parent()->whoami_shard().shard) != h.digest()) {
dout(0) << "_scan_list " << poid << " got incorrect hash on read" << dendl;
Copy link
Contributor

Choose a reason for hiding this comment

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

this commit looks good to me.

Caused by: 1e95f2c

Signed-off-by: David Zafman <dzafman@redhat.com>
Signed-off-by: David Zafman <dzafman@redhat.com>
@dzafman dzafman changed the title Fix for osd-scrub-repair.sh and too little timeout in wait_for_clean() Fix for osd-scrub-repair.sh Nov 21, 2016
@athanatos athanatos removed their assignment Nov 21, 2016
@liewegas liewegas changed the title Fix for osd-scrub-repair.sh tests: fix osd-scrub-repair.sh Nov 21, 2016
@tchaikov tchaikov merged commit 013d4b2 into ceph:master Nov 22, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants