[Dashboard] Don't show GPU columns if no GPU in cluster (#11704)

This commit is contained in:
Max Fitton
2020-11-02 16:07:27 -08:00
committed by GitHub
parent 0ba777af99
commit 3202ff74c2
2 changed files with 15 additions and 5 deletions
@@ -200,14 +200,24 @@ const NodeInfo: React.FC<{}> = () => {
)?.workerAccessor;
const sortWorkerComparator =
sortWorkerAccessor && getFnComparator(order, sortWorkerAccessor);
// Show GPU features only if there is at least one GPU in cluster.
const showGPUs =
nodes.map((n) => n.gpus).filter((gpus) => gpus.length !== 0).length !== 0;
const filterPredicate = (
feature: NodeInfoFeature | HeaderInfo<nodeInfoColumnId>,
) => showGPUs || (feature.id !== "gpu" && feature.id !== "gram");
const filteredFeatures = nodeInfoFeatures.filter(filterPredicate);
const filteredHeaders = nodeInfoHeaders.filter(filterPredicate);
const tableContents = isGrouped
? makeGroupedTableContents(
nodes,
sortWorkerComparator,
sortNodeComparator,
nodeInfoFeatures,
filteredFeatures,
)
: makeUngroupedTableContents(nodes, sortWorkerComparator, nodeInfoFeatures);
: makeUngroupedTableContents(nodes, sortWorkerComparator, filteredFeatures);
return (
<React.Fragment>
<FormControlLabel
@@ -230,7 +240,7 @@ const NodeInfo: React.FC<{}> = () => {
setOrder("asc");
}
}}
headerInfo={nodeInfoHeaders}
headerInfo={filteredHeaders}
order={order}
orderBy={orderBy}
firstColumnEmpty={true}
@@ -240,7 +250,7 @@ const NodeInfo: React.FC<{}> = () => {
<TotalRow
clusterTotalWorkers={clusterTotalWorkers}
nodes={nodes}
features={nodeInfoFeatures.map(
features={filteredFeatures.map(
(feature) => feature.ClusterFeatureRenderFn,
)}
/>
@@ -31,7 +31,7 @@ export const ClusterObjectStoreMemory: ClusterFeatureRenderFn = ({ nodes }) => {
export const NodeObjectStoreMemory: NodeFeatureRenderFn = ({ node }) => {
const total = node.raylet.objectStoreAvailableMemory;
const used = node.raylet.objectStoreUsedMemory;
if (!used || !total) {
if (used === undefined || total === undefined || total === 0) {
return (
<Typography color="textSecondary" component="span" variant="inherit">
N/A