From fe0c1e75e5208524ca02d59206e1ebdb6396cda8 Mon Sep 17 00:00:00 2001 From: frank chen Date: Fri, 15 Jan 2021 09:33:14 +0800 Subject: [PATCH] show leader in Services Tab Signed-off-by: frank chen --- web-console/src/views/services-view/services-view.tsx | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/web-console/src/views/services-view/services-view.tsx b/web-console/src/views/services-view/services-view.tsx index a51d9f2caf7f..b854e40696b5 100644 --- a/web-console/src/views/services-view/services-view.tsx +++ b/web-console/src/views/services-view/services-view.tsx @@ -114,6 +114,7 @@ interface ServiceQueryResultRow { service: string; service_type: string; tier: string; + is_leader: number; curr_size: number; host: string; max_size: number; @@ -164,7 +165,7 @@ export class ServicesView extends React.PureComponent 1 static SERVICE_SQL = `SELECT - "server" AS "service", "server_type" AS "service_type", "tier", "host", "plaintext_port", "tls_port", "curr_size", "max_size", + "server" AS "service", "server_type" AS "service_type", "tier", "host", "plaintext_port", "tls_port", "curr_size", "max_size", "is_leader", ( CASE "server_type" WHEN 'coordinator' THEN 8 @@ -484,7 +485,7 @@ ORDER BY "rank" DESC, "service" DESC`; }, { Header: 'Detail', - show: capabilities.hasCoordinatorAccess() && hiddenColumns.exists('Detail'), + show: hiddenColumns.exists('Detail'), id: 'queue', width: 400, filterable: false, @@ -500,6 +501,8 @@ ORDER BY "rank" DESC, "service" DESC`; details.push(`Blacklisted until: ${row.blacklistedUntil}`); } return details.join(' '); + } else if (oneOf(row.service_type, 'coordinator', 'overlord')) { + return (row.is_leader || 0) === 1 ? 'leader' : ''; } else { return (row.segmentsToLoad || 0) + (row.segmentsToDrop || 0); } @@ -526,6 +529,10 @@ ORDER BY "rank" DESC, "service" DESC`; case 'middle_manager': return row.value; + case 'coordinator': + case 'overlord': + return row.value; + default: return ''; }