Merge pull request #6867 from chu11/issue6860_fsck_error_message

flux-fsck: fix error message output

Author: mergify[bot]

src/cmd/builtin/fsck.c

@@ -147,7 +147,7 @@ static void fsck_valref (flux_t *h, const char *path, json_t *treeobj)
     if (fvd.errorcount) {
         /* each invalid blobref will be output in verbose mode */
         if (!verbose) {
-            if (errno == ENOENT)
+            if (fvd.errnum == ENOENT)
                 read_error ("%s: missing blobref(s)", path);
             else
                 read_error ("%s: error retrieving blobref(s): %s",

t/t2816-fsck-cmd.t

@@ -39,12 +39,12 @@ test_expect_success 'save some treeobjs for later' '
 test_expect_success 'unload kvs' '
 	flux module remove kvs
 '
-test_expect_success 'flux-fsck works' '
+test_expect_success 'flux-fsck works (simple)' '
 	flux fsck 2> simple.out &&
 	grep "Checking integrity" simple.out &&
 	grep "Total errors: 0" simple.out
 '
-test_expect_success 'flux-fsck verbose works' '
+test_expect_success 'flux-fsck verbose works (simple)' '
 	flux fsck --verbose 2> verbose.out &&
 	grep "dir\.a" verbose.out &&
 	grep "dir\.b" verbose.out &&
@@ -66,7 +66,7 @@ test_expect_success LONGTEST 'call sync to ensure we have checkpointed' '
 test_expect_success LONGTEST 'unload kvs' '
        flux module remove kvs
 '
-test_expect_success LONGTEST 'flux-fsck works' '
+test_expect_success LONGTEST 'flux-fsck works (big)' '
 	flux fsck --verbose 2> bigval.out &&
 	grep "Checking integrity" bigval.out &&
 	grep "bigval" bigval.out &&
@@ -77,7 +77,7 @@ test_expect_success 'load kvs' '
 '
 # unfortunately we don't have a `flux content remove` command, so we'll corrupt
 # a valref by overwriting a treeobj with a bad reference
-test_expect_success 'make a reference invalid' '
+test_expect_success 'make a reference invalid (dir.b)' '
 	cat dirb.out | jq -c .data[1]=\"sha1-1234567890123456789012345678901234567890\" > dirbbad.out &&
 	flux kvs put --treeobj dir.b="$(cat dirbbad.out)"
 '
@@ -88,27 +88,30 @@ test_expect_success 'unload kvs' '
 	flux module remove kvs
 '
 # line count includes extra diagnostic messages
-test_expect_success 'flux-fsck detects errors' '
+test_expect_success 'flux-fsck detects errors (dir.b)' '
 	test_must_fail flux fsck 2> fsckerrors1.out &&
+	test_debug "cat fsckerrors1.out" &&
 	count=$(cat fsckerrors1.out | wc -l) &&
 	test $count -eq 3 &&
 	grep "dir\.b" fsckerrors1.out | grep "missing blobref(s)" &&
 	grep "Total errors: 1" fsckerrors1.out
 '
-test_expect_success 'flux-fsck --verbose outputs details' '
+test_expect_success 'flux-fsck --verbose outputs details (dir.b)' '
 	test_must_fail flux fsck --verbose 2> fsckerrors1V.out &&
+	test_debug "cat fsckerrors1V.out" &&
 	grep "dir\.b" fsckerrors1V.out | grep "missing blobref" | grep "index=1" &&
 	grep "Total errors: 1" fsckerrors1V.out
 '
-test_expect_success 'flux-fsck no output with --quiet' '
+test_expect_success 'flux-fsck no output with --quiet (dir.b)' '
 	test_must_fail flux fsck --quiet 2> fsckerrors2.out &&
+	test_debug "cat fsckerrors2.out" &&
 	count=$(cat fsckerrors2.out | wc -l) &&
 	test $count -eq 0
 '
 test_expect_success 'load kvs' '
 	flux module load kvs
 '
-test_expect_success 'make a reference invalid' '
+test_expect_success 'make a reference invalid (dir.c)' '
 	cat dirc.out | jq -c .data[1]=\"sha1-1234567890123456789012345678901234567890\" > dircbad1.out &&
 	cat dircbad1.out | jq -c .data[2]=\"sha1-1234567890123456789012345678901234567890\" > dircbad2.out &&
 	flux kvs put --treeobj dir.c="$(cat dircbad2.out)"
@@ -120,23 +123,26 @@ test_expect_success 'unload kvs' '
 	flux module remove kvs
 '
 # line count includes extra diagnostic messages
-test_expect_success 'flux-fsck detects errors' '
+test_expect_success 'flux-fsck detects errors (dir.b & c)' '
 	test_must_fail flux fsck 2> fsckerrors3.out &&
+	test_debug "cat fsckerrors3.out" &&
 	count=$(cat fsckerrors3.out | wc -l) &&
 	test $count -eq 4 &&
 	grep "dir\.b" fsckerrors3.out | grep "missing blobref(s)" &&
 	grep "dir\.c" fsckerrors3.out | grep "missing blobref(s)" &&
 	grep "Total errors: 2" fsckerrors3.out
 '
-test_expect_success 'flux-fsck --verbose outputs details' '
+test_expect_success 'flux-fsck --verbose outputs details (dir.b & c)' '
 	test_must_fail flux fsck --verbose 2> fsckerrors3V.out &&
+	test_debug "cat fsckerrors3V.out" &&
 	grep "dir\.b" fsckerrors3V.out | grep "missing blobref" | grep "index=1" &&
 	grep "dir\.c" fsckerrors3V.out | grep "missing blobref" | grep "index=1" &&
 	grep "dir\.c" fsckerrors3V.out | grep "missing blobref" | grep "index=2" &&
 	grep "Total errors: 2" fsckerrors3V.out
 '
-test_expect_success 'flux-fsck no output with --quiet' '
+test_expect_success 'flux-fsck no output with --quiet (dir.b & c)' '
 	test_must_fail flux fsck --quiet 2> fsckerrors4.out &&
+	test_debug "cat fsckerrors4.out" &&
 	count=$(cat fsckerrors4.out | wc -l) &&
 	test $count -eq 0
 '