diff --git a/DEPS.bzl b/DEPS.bzl index 0065265cdaa8..5763daa75831 100644 --- a/DEPS.bzl +++ b/DEPS.bzl @@ -1505,10 +1505,10 @@ def go_deps(): patches = [ "@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch", ], - sha256 = "10635b775b3be21b36e4a2594db1026246dacb826f9717e38450f110faca593f", - strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20230131225459-7540fdf23780", + sha256 = "2ec90dd7f152417825d77ee6f4221060a04be5f9573fd4588e8ccc5394d91e56", + strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20230202171745-e9d3bb388ad6", urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20230131225459-7540fdf23780.zip", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20230202171745-e9d3bb388ad6.zip", ], ) go_repository( diff --git a/build/bazelutil/distdir_files.bzl b/build/bazelutil/distdir_files.bzl index f02792973048..d8ac51caeb57 100644 --- a/build/bazelutil/distdir_files.bzl +++ b/build/bazelutil/distdir_files.bzl @@ -195,7 +195,7 @@ DISTDIR_FILES = { "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/google-api-go-client/com_github_cockroachdb_google_api_go_client-v0.80.1-0.20221117193156-6a9f7150cb93.zip": "b3378c579f4f4340403038305907d672c86f615f8233118a8873ebe4229c4f39", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/gostdlib/com_github_cockroachdb_gostdlib-v1.19.0.zip": "c4d516bcfe8c07b6fc09b8a9a07a95065b36c2855627cb3514e40c98f872b69e", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/logtags/com_github_cockroachdb_logtags-v0.0.0-20230118201751-21c54148d20b.zip": "ca7776f47e5fecb4c495490a679036bfc29d95bd7625290cfdb9abb0baf97476", - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20230131225459-7540fdf23780.zip": "10635b775b3be21b36e4a2594db1026246dacb826f9717e38450f110faca593f", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20230202171745-e9d3bb388ad6.zip": "2ec90dd7f152417825d77ee6f4221060a04be5f9573fd4588e8ccc5394d91e56", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/redact/com_github_cockroachdb_redact-v1.1.3.zip": "7778b1e4485e4f17f35e5e592d87eb99c29e173ac9507801d000ad76dd0c261e", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/returncheck/com_github_cockroachdb_returncheck-v0.0.0-20200612231554-92cdbca611dd.zip": "ce92ba4352deec995b1f2eecf16eba7f5d51f5aa245a1c362dfe24c83d31f82b", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/sentry-go/com_github_cockroachdb_sentry_go-v0.6.1-cockroachdb.2.zip": "fbb2207d02aecfdd411b1357efe1192dbb827959e36b7cab7491731ac55935c9", diff --git a/go.mod b/go.mod index bf74212a7d73..55a7d0d49559 100644 --- a/go.mod +++ b/go.mod @@ -112,7 +112,7 @@ require ( github.com/cockroachdb/go-test-teamcity v0.0.0-20191211140407-cff980ad0a55 github.com/cockroachdb/gostdlib v1.19.0 github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b - github.com/cockroachdb/pebble v0.0.0-20230131225459-7540fdf23780 + github.com/cockroachdb/pebble v0.0.0-20230202171745-e9d3bb388ad6 github.com/cockroachdb/redact v1.1.3 github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd github.com/cockroachdb/stress v0.0.0-20220803192808-1806698b1b7b diff --git a/go.sum b/go.sum index 05afa92cb43c..1f5f69b057c6 100644 --- a/go.sum +++ b/go.sum @@ -476,8 +476,8 @@ github.com/cockroachdb/gostdlib v1.19.0/go.mod h1:+dqqpARXbE/gRDEhCak6dm0l14AaTy github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= -github.com/cockroachdb/pebble v0.0.0-20230131225459-7540fdf23780 h1:cPiiouYJWWpaqnWzr7LPnHlS5m38Q184wr3PY4DBX88= -github.com/cockroachdb/pebble v0.0.0-20230131225459-7540fdf23780/go.mod h1:aTUOWxjt8RcnlEANMlnkJoRJ5TBiBs+p1v1OJWrEXGU= +github.com/cockroachdb/pebble v0.0.0-20230202171745-e9d3bb388ad6 h1:CM8nnTeBpEXqf0KobrrFj7B1peUmahHTinYfm7DVuOw= +github.com/cockroachdb/pebble v0.0.0-20230202171745-e9d3bb388ad6/go.mod h1:aTUOWxjt8RcnlEANMlnkJoRJ5TBiBs+p1v1OJWrEXGU= github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5wfSQ= github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd h1:KFOt5I9nEKZgCnOSmy8r4Oykh8BYQO8bFOTgHDS8YZA= diff --git a/pkg/ui/workspaces/db-console/src/views/cluster/containers/nodesOverview/index.tsx b/pkg/ui/workspaces/db-console/src/views/cluster/containers/nodesOverview/index.tsx index 97a5831f203b..df5465defd37 100644 --- a/pkg/ui/workspaces/db-console/src/views/cluster/containers/nodesOverview/index.tsx +++ b/pkg/ui/workspaces/db-console/src/views/cluster/containers/nodesOverview/index.tsx @@ -213,6 +213,20 @@ const NodeLocalityColumn: React.FC<{ record: NodeStatusRow }> = ({ ); }; +const formatWithPossibleStaleIndicator = ( + text: string, + record: NodeStatusRow, +): string => { + if ( + record.status === LivenessStatus.NODE_STATUS_DEAD || + record.status === AggregatedNodeStatus.DEAD + ) { + return `${text} (stale)`; + } + + return text; +}; + /** * LiveNodeList displays a sortable table of all "live" nodes, which includes * both healthy and suspect nodes. Included is a side-bar with summary @@ -268,6 +282,7 @@ export class NodeList extends React.Component { { key: "uptime", dataIndex: "uptime", + render: formatWithPossibleStaleIndicator, title: Uptime, sorter: true, className: "column--align-right", @@ -277,6 +292,7 @@ export class NodeList extends React.Component { { key: "replicas", dataIndex: "replicas", + render: formatWithPossibleStaleIndicator, title: Replicas, sorter: true, className: "column--align-right", @@ -290,7 +306,10 @@ export class NodeList extends React.Component { ), render: (_text: string, record: NodeStatusRow) => - util.Percentage(record.usedCapacity, record.availableCapacity), + formatWithPossibleStaleIndicator( + util.Percentage(record.usedCapacity, record.availableCapacity), + record, + ), sorter: (a: NodeStatusRow, b: NodeStatusRow) => a.usedCapacity / a.availableCapacity - b.usedCapacity / b.availableCapacity, @@ -301,7 +320,10 @@ export class NodeList extends React.Component { key: "memoryUse", title: Memory Use, render: (_text: string, record: NodeStatusRow) => - util.Percentage(record.usedMemory, record.availableMemory), + formatWithPossibleStaleIndicator( + util.Percentage(record.usedMemory, record.availableMemory), + record, + ), sorter: (a: NodeStatusRow, b: NodeStatusRow) => a.usedMemory / a.availableMemory - b.usedMemory / b.availableMemory, className: "column--align-right",