diff --git a/docs/overview/transaction.md b/docs/overview/transaction.md index c1652138618..4c89666b334 100644 --- a/docs/overview/transaction.md +++ b/docs/overview/transaction.md @@ -68,7 +68,7 @@ accessed concurrently by uncoordinated clients. All I/O operations the same epoch. The DAOS transaction mechanism automatically detects the traditional read/write, write/read and write/write conflicts and aborts one of the conflicting transactions (the transaction fails to commit -with `-DER_RESTART`). The failed transaction then has to be restarted +with `-DER_TX_RESTART`). The failed transaction then has to be restarted by the user/application. In the initial implementation, the transaction API does not support reading diff --git a/src/control/cmd/dmg/pretty/pool.go b/src/control/cmd/dmg/pretty/pool.go index c3496d84274..35667e8909b 100644 --- a/src/control/cmd/dmg/pretty/pool.go +++ b/src/control/cmd/dmg/pretty/pool.go @@ -50,10 +50,10 @@ func PrintPoolQueryResponse(pqr *control.PoolQueryResp, out io.Writer, opts ...P } fmt.Fprintln(w, "Pool space info:") if pqr.EnabledRanks != nil { - fmt.Fprintf(w, "- Enabled targets: %s\n", pqr.EnabledRanks) + fmt.Fprintf(w, "- Enabled ranks: %s\n", pqr.EnabledRanks) } if pqr.DisabledRanks != nil { - fmt.Fprintf(w, "- Disabled targets: %s\n", pqr.DisabledRanks) + fmt.Fprintf(w, "- Disabled ranks: %s\n", pqr.DisabledRanks) } fmt.Fprintf(w, "- Target(VOS) count:%d\n", pqr.ActiveTargets) if pqr.TierStats != nil { diff --git a/src/control/cmd/dmg/pretty/pool_test.go b/src/control/cmd/dmg/pretty/pool_test.go index abc389b0b2c..1a28ec85f74 100644 --- a/src/control/cmd/dmg/pretty/pool_test.go +++ b/src/control/cmd/dmg/pretty/pool_test.go @@ -112,7 +112,7 @@ Rebuild busy, 42 objs, 21 recs Pool %s, ntarget=2, disabled=1, leader=42, version=100, state=Degraded Pool layout out of date (1 < 2) -- see `+backtickStr+` for details. Pool space info: -- Enabled targets: 0-2 +- Enabled ranks: 0-2 - Target(VOS) count:1 - Storage tier 0 (SCM): Total size: 2 B @@ -157,7 +157,7 @@ Rebuild busy, 42 objs, 21 recs Pool %s, ntarget=2, disabled=1, leader=42, version=100, state=Degraded Pool layout out of date (1 < 2) -- see `+backtickStr+` for details. Pool space info: -- Disabled targets: 0-1,3 +- Disabled ranks: 0-1,3 - Target(VOS) count:1 - Storage tier 0 (SCM): Total size: 2 B @@ -202,7 +202,7 @@ Rebuild busy, 42 objs, 21 recs Pool %s, ntarget=2, disabled=1, leader=42, version=100, state=Degraded Pool layout out of date (1 < 2) -- see `+backtickStr+` for details. Pool space info: -- Disabled targets: 0-1,3 +- Disabled ranks: 0-1,3 - Target(VOS) count:1 - Storage tier 0 (SCM): Total size: 2 B