DAOS-13520 control: Show unchecked pools in dmg check query (#17091)

- Include listing of unchecked pools returned by dmg check query,
  even in non-verbose mode.

Signed-off-by: Kris Jacque <[email protected]>

Author: kjacque

src/control/cmd/dmg/pretty/check.go

@@ -50,26 +50,40 @@ func PrintCheckerPolicies(out io.Writer, flags control.SystemCheckFlags, policie
 	tf.Format(table)
 }
 
-func countResultPools(resp *control.SystemCheckQueryResp) int {
+func countResultPools(resp *control.SystemCheckQueryResp) (int, int) {
 	if resp == nil {
-		return 0
+		return 0, 0
 	}
 
-	poolMap := make(map[string]struct{})
+	checkedMap := make(map[string]struct{})
+	uncheckedMap := make(map[string]struct{})
 	for _, pool := range resp.Pools {
-		// Don't include pools that were not checked.
 		if pool.Unchecked() {
-			continue
+			uncheckedMap[pool.UUID] = struct{}{}
+		} else {
+			checkedMap[pool.UUID] = struct{}{}
 		}
-		poolMap[pool.UUID] = struct{}{}
 	}
 	for _, report := range resp.Reports {
 		if report.IsRemovedPool() && report.PoolUuid != "" {
-			poolMap[report.PoolUuid] = struct{}{}
+			checkedMap[report.PoolUuid] = struct{}{}
 		}
 	}
 
-	return len(poolMap)
+	return len(checkedMap), len(uncheckedMap)
+}
+
+func printSystemCheckPoolInfo(out io.Writer, pools []*control.SystemCheckPoolInfo, verbose bool) {
+	if verbose {
+		fmt.Fprintln(out, "\nPer-Pool Checker Info:")
+	} else {
+		fmt.Fprintln(out, "\nUnchecked Pools:")
+	}
+	for _, pool := range pools {
+		if verbose || pool.Unchecked() {
+			fmt.Fprintf(out, "  %+v\n", pool)
+		}
+	}
 }
 
 // PrintCheckQueryResp prints the checker results to the console.
@@ -91,26 +105,23 @@ func PrintCheckQueryResp(out io.Writer, resp *control.SystemCheckQueryResp, verb
 	// should show the number of pools being checked. If the checker has completed,
 	// we should show the number of unique pools found in the reports.
 	action := "Checking"
-	poolCount := countResultPools(resp)
+	checkedCount, uncheckedCount := countResultPools(resp)
 	if resp.Status == control.SystemCheckStatusCompleted {
 		action = "Checked"
 	}
-	if poolCount > 0 {
-		fmt.Fprintf(out, "  %s %s\n", action, english.Plural(poolCount, "pool", ""))
+	if checkedCount > 0 {
+		fmt.Fprintf(out, "  %s %s\n", action, english.Plural(checkedCount, "pool", ""))
 	}
 
-	if len(resp.Pools) > 0 && verbose {
+	if len(resp.Pools) > 0 && (verbose || uncheckedCount > 0) {
 		pools := make([]*control.SystemCheckPoolInfo, 0, len(resp.Pools))
 		for _, pool := range resp.Pools {
 			pools = append(pools, pool)
 		}
 		sort.Slice(pools, func(i, j int) bool {
 			return pools[i].UUID < pools[j].UUID
 		})
-		fmt.Fprintln(out, "\nPer-Pool Checker Info:")
-		for _, pool := range pools {
-			fmt.Fprintf(out, "  %+v\n", pool)
-		}
+		printSystemCheckPoolInfo(out, pools, verbose)
 	}
 
 	fmt.Fprintln(out)

src/control/cmd/dmg/pretty/check_test.go

@@ -203,11 +203,6 @@ Inconsistency Reports:
 						Phase:     chkpb.CheckScanPhase_CSP_DONE.String(),
 						StartTime: checkTime,
 					},
-					"pool-5": {
-						UUID:   "pool-5",
-						Status: chkpb.CheckPoolStatus_CPS_UNCHECKED.String(),
-						Phase:  chkpb.CheckScanPhase_CSP_PREPARE.String(),
-					},
 				},
 				Reports: []*control.SystemCheckReport{
 					{
@@ -264,6 +259,85 @@ ID  Class                        Pool   Resolution
 0x3 POOL_LESS_SVC_WITHOUT_QUORUM pool-3 TRUST_PS          
 0x4 POOL_NONEXIST_ON_ENGINE      pool-4 DISCARD (dry run) 
 
+`,
+		},
+		"non-verbose with unchecked pools": {
+			resp: &control.SystemCheckQueryResp{
+				Status:    control.SystemCheckStatusCompleted,
+				ScanPhase: control.SystemCheckScanPhaseDone,
+				Pools: map[string]*control.SystemCheckPoolInfo{
+					"pool-1": {
+						UUID:      "pool-1",
+						Status:    chkpb.CheckPoolStatus_CPS_CHECKED.String(),
+						Phase:     chkpb.CheckScanPhase_CSP_DONE.String(),
+						StartTime: checkTime,
+					},
+					"pool-2": {
+						UUID:   "pool-2",
+						Status: chkpb.CheckPoolStatus_CPS_UNCHECKED.String(),
+						Phase:  chkpb.CheckScanPhase_CSP_DONE.String(),
+					},
+					"pool-3": {
+						UUID:      "pool-3",
+						Status:    chkpb.CheckPoolStatus_CPS_CHECKED.String(),
+						Phase:     chkpb.CheckScanPhase_CSP_DONE.String(),
+						StartTime: checkTime,
+					},
+					"pool-5": {
+						UUID:   "pool-5",
+						Status: chkpb.CheckPoolStatus_CPS_UNCHECKED.String(),
+						Phase:  chkpb.CheckScanPhase_CSP_PREPARE.String(),
+					},
+				},
+				Reports: []*control.SystemCheckReport{
+					{
+						CheckReport: chkpb.CheckReport{
+							Seq:      1,
+							Class:    chkpb.CheckInconsistClass_CIC_POOL_BAD_SVCL,
+							Action:   chkpb.CheckInconsistAction_CIA_IGNORE,
+							Msg:      "message 1",
+							PoolUuid: "pool-1",
+						},
+					},
+					{
+						CheckReport: chkpb.CheckReport{
+							Seq:      3,
+							Class:    chkpb.CheckInconsistClass_CIC_POOL_LESS_SVC_WITHOUT_QUORUM,
+							Action:   chkpb.CheckInconsistAction_CIA_TRUST_PS,
+							Msg:      "message 3",
+							PoolUuid: "pool-3",
+						},
+					},
+					{
+						CheckReport: chkpb.CheckReport{
+							Seq:      4,
+							Result:   int32(chkpb.CheckResult_DRY_RUN),
+							Class:    chkpb.CheckInconsistClass_CIC_POOL_NONEXIST_ON_ENGINE,
+							Action:   chkpb.CheckInconsistAction_CIA_DISCARD,
+							Msg:      "message 4",
+							PoolUuid: "pool-4",
+						},
+					},
+				},
+			},
+			expOut: `
+DAOS System Checker Info
+  Current status: COMPLETED
+  Current phase: DONE (Check completed)
+  Checked 3 pools
+
+Unchecked Pools:
+  Pool pool-2: 0 ranks, status: CPS_UNCHECKED, phase: CSP_DONE
+  Pool pool-5: 0 ranks, status: CPS_UNCHECKED, phase: CSP_PREPARE
+
+Inconsistency Reports:
+- Resolved:
+ID  Class                        Pool   Resolution        
+--  -----                        ----   ----------        
+0x1 POOL_BAD_SVCL                pool-1 IGNORE            
+0x3 POOL_LESS_SVC_WITHOUT_QUORUM pool-3 TRUST_PS          
+0x4 POOL_NONEXIST_ON_ENGINE      pool-4 DISCARD (dry run) 
+
 `,
 		},
 		"non-verbose with container": {