xapi-project / sm / 733 / 1

33%

master: 47%

Pull #435

travis-ci

CA-273708: improve VHD scan for file-based SR

The current "vhd-util scan" command makes use of the "-c" (NOFAIL) flag, so
that if it has difficulties scanning a particular VHD image file, it will
simply skip it, and the command always returns success. In a stressed
environment (e.g. CPU high load or poor connection to the storage), it might
return a partial list without giving any warnings.

With this change, we try without the NOFAIL flag first. If it fails, we
continue trying (ioretry). If it continues to fail, we'll log the result and
then go with the NOFAIL flag as the last resort, which should always succeed
(as before), but we'll additionally log its output in this case.

In addition, we improve logging in two places. If a line from the output of
"vhd-util scan" fails to parse, we'll log the line instead of ignoring it. For
file-based SR, we'll cross check the number of VHDs in the result of "vhd-util
scan" against the result from plain file globbing, and we'll log the difference
if any.

Signed-off-by: Zheng Li <zheng.li3@citrix.com>

828 of 6400 branches covered (12.94%)

7003 of 20925 relevant lines covered (33.47%)

0.33 hits per line