Skip to content

Commit

Permalink
tool/logs: print total flush / ingestion counts and durations
Browse files Browse the repository at this point in the history 
Print the total count and duration of flushes and ingestions.

Update the total count column for compactions to be named "count", to
align with the column name for flushes / ingestions.
  • Loading branch information
@nicktrav
nicktrav committed May 23, 2022
1 parent d1cf341 commit bb2c150
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 23 deletions.
9 changes: 7 additions & 2 deletions tool/logs/compaction.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -545,24 +545,29 @@ func (s windowSummary) String() string {
s.flushedTime.Truncate(time.Second))
}

count := s.flushedCount
sum := s.flushedBytes
totalTime := s.flushedTime
for l := 0; l < len(s.ingestedBytes); l++ {
if s.ingestedCount[l] == 0 {
continue
}
maybeWriteHeader()
fmt.Fprintf(&sb, "%-7s %7s %7d %7s\n",
"ingest", fmt.Sprintf("L%d", l), s.ingestedCount[l], humanize.Uint64(s.ingestedBytes[l]))
count += s.ingestedCount[l]
sum += s.ingestedBytes[l]
}
if headerWritten {
fmt.Fprintf(&sb, "total %9s\n", humanize.Uint64(sum))
fmt.Fprintf(&sb, "total %7d %7s %9s\n",
count, humanize.Uint64(sum), totalTime.Truncate(time.Second),
)
}
}

// Print compactions statistics.
if len(s.compactionCounts) > 0 {
sb.WriteString("_kind______from______to___default____move___elide__delete___total___bytes______time\n")
sb.WriteString("_kind______from______to___default____move___elide__delete___count___bytes______time\n")
var totalDef, totalMove, totalElision, totalDel int
var totalBytes uint64
var totalTime time.Duration
Expand Down
42 changes: 21 additions & 21 deletions tool/logs/testdata/compactions
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ node: 1, store: 1
from: 211215 00:00
to: 211215 00:01
r-amp: NaN
_kind______from______to___default____move___elide__delete___total___bytes______time
_kind______from______to___default____move___elide__delete___count___bytes______time
compact L2 L3 1 0 0 0 1 13 M 10s
total 1 0 0 0 1 13 M 10s
node: 1, store: 1
Expand All @@ -24,7 +24,7 @@ node: 1, store: 1
r-amp: NaN
_kind______from______to_____________________________________count___bytes______time
flush L0 1 1.0 M 10s
total 1.0 M
total 1 1.0 M 10s

# Same as the previous case, except that the start and end events are are split
# across multiple files (one log line per file).
Expand Down Expand Up @@ -58,7 +58,7 @@ node: 1, store: 1
from: 211215 00:00
to: 211215 00:01
r-amp: NaN
_kind______from______to___default____move___elide__delete___total___bytes______time
_kind______from______to___default____move___elide__delete___count___bytes______time
compact L2 L3 1 0 0 0 1 13 M 10s
total 1 0 0 0 1 13 M 10s
node: 1, store: 1
Expand All @@ -67,7 +67,7 @@ node: 1, store: 1
r-amp: NaN
_kind______from______to_____________________________________count___bytes______time
flush L0 1 1.0 M 10s
total 1.0 M
total 1 1.0 M 10s

# Read amplification from the Cockroach log, one within an existing window,
# another outside of the existing window. The latter is not included.
Expand Down Expand Up @@ -113,7 +113,7 @@ node: 1, store: 1
from: 211215 00:00
to: 211215 00:01
r-amp: 5.0
_kind______from______to___default____move___elide__delete___total___bytes______time
_kind______from______to___default____move___elide__delete___count___bytes______time
compact L2 L3 1 0 0 0 1 13 M 10s
total 1 0 0 0 1 13 M 10s

Expand All @@ -134,7 +134,7 @@ node: 1, store: 1
from: 211215 00:01
to: 211215 00:02
r-amp: NaN
_kind______from______to___default____move___elide__delete___total___bytes______time
_kind______from______to___default____move___elide__delete___count___bytes______time
compact L2 L3 1 0 0 0 1 13 M 2m10s
total 1 0 0 0 1 13 M 2m10s
long-running events (descending runtime):
Expand All @@ -161,14 +161,14 @@ node: 1, store: 1
from: 211215 00:01
to: 211215 00:02
r-amp: NaN
_kind______from______to___default____move___elide__delete___total___bytes______time
_kind______from______to___default____move___elide__delete___count___bytes______time
compact L2 L3 1 0 0 0 1 13 M 10s
total 1 0 0 0 1 13 M 10s
node: 1, store: 2
from: 211215 00:01
to: 211215 00:02
r-amp: NaN
_kind______from______to___default____move___elide__delete___total___bytes______time
_kind______from______to___default____move___elide__delete___count___bytes______time
compact L3 L4 1 0 0 0 1 13 M 10s
total 1 0 0 0 1 13 M 10s

Expand All @@ -195,14 +195,14 @@ node: 1, store: 1
from: 211215 00:01
to: 211215 00:02
r-amp: NaN
_kind______from______to___default____move___elide__delete___total___bytes______time
_kind______from______to___default____move___elide__delete___count___bytes______time
compact L2 L3 1 0 0 0 1 13 M 10s
total 1 0 0 0 1 13 M 10s
node: 2, store: 1
from: 211215 00:01
to: 211215 00:02
r-amp: NaN
_kind______from______to___default____move___elide__delete___total___bytes______time
_kind______from______to___default____move___elide__delete___count___bytes______time
compact L3 L4 1 0 0 0 1 13 M 10s
total 1 0 0 0 1 13 M 10s

Expand Down Expand Up @@ -236,28 +236,28 @@ node: 2, store: 1
from: 211215 00:00
to: 211215 00:01
r-amp: NaN
_kind______from______to___default____move___elide__delete___total___bytes______time
_kind______from______to___default____move___elide__delete___count___bytes______time
compact L3 L4 1 0 0 0 1 13 M 10s
total 1 0 0 0 1 13 M 10s
node: 1, store: 1
from: 211215 00:01
to: 211215 00:02
r-amp: NaN
_kind______from______to___default____move___elide__delete___total___bytes______time
_kind______from______to___default____move___elide__delete___count___bytes______time
compact L2 L3 1 0 0 0 1 13 M 10s
total 1 0 0 0 1 13 M 10s
node: 1, store: 2
from: 211215 00:02
to: 211215 00:03
r-amp: NaN
_kind______from______to___default____move___elide__delete___total___bytes______time
_kind______from______to___default____move___elide__delete___count___bytes______time
compact L1 L2 1 0 0 0 1 13 M 10s
total 1 0 0 0 1 13 M 10s
node: 2, store: 2
from: 211215 00:02
to: 211215 00:03
r-amp: NaN
_kind______from______to___default____move___elide__delete___total___bytes______time
_kind______from______to___default____move___elide__delete___count___bytes______time
compact L4 L5 1 0 0 0 1 13 M 10s
total 1 0 0 0 1 13 M 10s

Expand Down Expand Up @@ -293,7 +293,7 @@ node: ?, store: ?
from: 211215 00:01
to: 211215 00:02
r-amp: 5.0
_kind______from______to___default____move___elide__delete___total___bytes______time
_kind______from______to___default____move___elide__delete___count___bytes______time
compact L2 L3 1 0 0 0 1 13 M 10s
total 1 0 0 0 1 13 M 10s

Expand All @@ -316,14 +316,14 @@ node: 1, store: 1
from: 211215 00:01
to: 211215 00:02
r-amp: NaN
_kind______from______to___default____move___elide__delete___total___bytes______time
_kind______from______to___default____move___elide__delete___count___bytes______time
compact L2 L3 1 0 0 0 1 13 M 10s
total 1 0 0 0 1 13 M 10s
node: 2, store: 2
from: 211215 00:02
to: 211215 00:03
r-amp: NaN
_kind______from______to___default____move___elide__delete___total___bytes______time
_kind______from______to___default____move___elide__delete___count___bytes______time
compact L4 L5 1 0 0 0 1 13 M 10s
total 1 0 0 0 1 13 M 10s

Expand Down Expand Up @@ -372,7 +372,7 @@ node: 1, store: 1
from: 220301 00:00
to: 220301 00:01
r-amp: 1.0
_kind______from______to___default____move___elide__delete___total___bytes______time
_kind______from______to___default____move___elide__delete___count___bytes______time
compact L2 L3 1 0 0 0 1 13 M 10s
total 1 0 0 0 1 13 M 10s

Expand Down Expand Up @@ -418,7 +418,7 @@ node: 24, store: 24
r-amp: NaN
_kind______from______to_____________________________________count___bytes______time
flush L0 1 19 M 0s
total 19 M
total 1 19 M 0s

reset
----
Expand All @@ -438,11 +438,11 @@ node: 24, store: 24
_kind______from______to_____________________________________count___bytes______time
ingest L0 9 140 M
ingest L5 3 3.0 K
total 140 M
total 12 140 M 0s
node: 24, store: 24
from: 220228 16:01
to: 220228 16:02
r-amp: NaN
_kind______from______to_____________________________________count___bytes______time
ingest L0 12 160 M
total 160 M
total 12 160 M 0s

0 comments on commit bb2c150

Please sign in to comment.