Skip to content

fix: Pinot Dashboard tenant view shows incorrect amount of servers and brokers #8115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jackie-Jiang merged 1 commit into from
Feb 3, 2022
Merged

fix: Pinot Dashboard tenant view shows incorrect amount of servers and brokers #8115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions pinot-controller/src/main/resources/app/pages/Tenants.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,9 @@ const TenantPage = ({ match }: RouteComponentProps<Props>) => {
const brokersData = await PinotMethodUtils.getBrokerOfTenant(tenantName);
const serversData = await PinotMethodUtils.getServerOfTenant(tenantName);
setTableData(tenantData);
setBrokerData(brokersData || []);
let separatedServers = Array.isArray(serversData) ? serversData.map((elm) => [elm]) : [];
const separatedBrokers = Array.isArray(brokersData) ? brokersData.map((elm) => [elm]) : [];
setBrokerData(separatedBrokers || []);
const separatedServers = Array.isArray(serversData) ? serversData.map((elm) => [elm]) : [];
setServerData(separatedServers || []);
setFetching(false);
};
Expand Down Expand Up @@ -119,7 +120,7 @@ const TenantPage = ({ match }: RouteComponentProps<Props>) => {
title="Brokers"
data={{
columns: ['Instance Name'],
records: brokerData.length > 0 ? [brokerData] : []
records: brokerData.length > 0 ? brokerData : []
}}
isPagination
addLinks
Expand Down
27 changes: 19 additions & 8 deletions pinot-controller/src/main/resources/app/utils/PinotMethodUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,22 +79,33 @@ const JSONbig = require('json-bigint')({'storeAsString': true})
const getTenantsData = () => {
return getTenants().then(({ data }) => {
const records = _.union(data.SERVER_TENANTS, data.BROKER_TENANTS);
const promiseArr = [];
const serverPromiseArr = [], brokerPromiseArr = [], tablePromiseArr = [];
const finalResponse = {
columns: ['Tenant Name', 'Server', 'Broker', 'Tables'],
records: []
};
records.map((record)=>{
finalResponse.records.push([
record,
data.SERVER_TENANTS.indexOf(record) > -1 ? 1 : 0,
data.BROKER_TENANTS.indexOf(record) > -1 ? 1 : 0
record
]);
promiseArr.push(getTenantTable(record));
serverPromiseArr.push(getServerOfTenant(record));
brokerPromiseArr.push(getBrokerOfTenant(record));
tablePromiseArr.push(getTenantTable(record));
});
return Promise.all(promiseArr).then((results)=>{
results.map((result, index)=>{
finalResponse.records[index].push(result.data.tables.length);
return Promise.all([
Promise.all(serverPromiseArr),
Promise.all(brokerPromiseArr),
Promise.all(tablePromiseArr)
]).then((results)=>{
const serversResponseData = results[0];
const brokersResponseData = results[1];
const tablesResponseData = results[2];

tablesResponseData.map((tableResult, index)=>{
const serverCount = serversResponseData[index]?.length || 0;
const brokerCount = brokersResponseData[index]?.length || 0;
const tablesCount = tableResult.data.tables.length
finalResponse.records[index].push(serverCount, brokerCount, tablesCount);
});
return finalResponse;
});
Expand Down