qa/standalone/scrub/osd-scrub-repair: no -y to diff

[liewegas]

With -y you can't see the entire line when it is long, which is
needed to identify the diff failure in
http://tracker.ceph.com/issues/21618

Signed-off-by: Sage Weil sage@redhat.com

[yuriw]

wip-yuri-testing-2017-10-02-1923

[joscollin]

The testing Label wip-jcollin-testing was added by the ptl-tool during its testing. Please ignore it. I will create some test PRs for testing ptl-tool. Thanks.

[dzafman]

If you run the test in a wide terminal you can see more of the line. I suggest that we change the value of DIFFCOLOPTS to reflect how we want to diff to be generated. It is possible that under circumstances like a terminal width below a certain value we don't put the -y in. I'd prefer we don't remove ${DIFFCOLOPTS} as the way to change this.

[dzafman]

@liewegas The value of DIFFCOLOPTS is set in ceph-helpers.sh. I started using -y because it was hard to determine where the differences were since the line numbers don't mean anything with the inline JSON. We could replace the -y with much more context (-C) or as I previously suggested suppress the -y with narrow terminal widths.

We could also allow an environment variable if set to replace the DIFFCOLOPTS.

[liewegas]

In this case there's no terminal.. it was run via teuthology, and there wasn't enough info to tell what was different. How about leaving the env var in there, but don't define it in the file, so when running it interactively you can add -y (or whatever)?

[wjwithagen]

@liewegas @dzafman
I created DIFFCOLOPTS to work around the fact that diff on FreeBSD does not have these.
Using the value from an ENV setting would make most use of the fact that it is only really usefull when run on a terminal. Could perhaps even test if we are running on a terminal in the script.

[dzafman]

3 suggestions.

1. Don't set $DIFFCOLOPTS in ceph-helpers.sh must be set in environment

DIFFCOLOPTS="-y -W 400" ../qa/run-standalone.sh osd-scrub-repair.sh

2. ceph-helpers.sh doesn't set DIFFCOLOPTS if there isn't a terminal involved. We already make sure there is a non-zero terminal width before adding the -W option.

I assume the teuthology run had a diff -y without a -W showing that there was no terminal.

3. Instead of calling diff directly create new function do_diff() that runs diff without $DIFFCOLOPTS and if there is a difference also outputs a diff with $DIFFCOLOPTS if it isn't empty.

I like this one since we can see the complete lines and when -y is available where those differences are.

[yuriw]

@liewegas @liewegas this PR passed thru rados tests, ready to merge

[liewegas]

Opting for (1) for simplicity!

[dzafman]

@liewegas Maybe I'll make the changes later if osd-scrub-repair.sh and/or osd-scrub-snaps.sh tests are updated.