Skip to content

Modified Monitor to always show table structure #6401

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
dlmarion merged 4 commits into from
May 29, 2026
Merged

Modified Monitor to always show table structure #6401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1647cb3
Modified Monitor to always show table structure
dlmarion May 29, 2026
5367f86
Stop hiding running compactions table
DomGarguilo May 29, 2026
06af601
Stop altering compactions table when manager is down
DomGarguilo May 29, 2026
4af6618
Avoid pulling manager data when not needed
DomGarguilo May 29, 2026
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
4 changes: 0 additions & 4 deletions server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/coordinator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,6 @@ function refresh() {
refreshTable(queuesHtmlTable, COORDINATOR_QUEUE_PROCESS_VIEW);
ajaxReloadTable(tableRunning);
ajaxReloadTable(queueRunning);
$(coordinatorHtmlTable).hide();
$(queuesHtmlTable).hide();
$(runningTableHtmlTable).hide();
$(runningQueueHtmlTable).hide();
});
}

Expand Down
20 changes: 5 additions & 15 deletions server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/ec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,46 +290,36 @@ $(function () {
}
});

refreshManagerStatus();
refreshRunningCompactions();
});

/**
* Used to redraw the page
*/
function refresh() {
refreshManagerStatus();
refreshRunningCompactions();
}

/**
* Refreshes the running compactions
*/
function refreshRunningCompactions() {
refreshManagerStatus().then(function (managerStatus) {
// tables will not be shown, avoid reloading
if (managerStatus === 'ERROR') {
return;
}

// user paging is not reset on reload
ajaxReloadTable(runningTable);
});
// user paging is not reset on reload
ajaxReloadTable(runningTable);
}

/**
* Updates session storage then checks if the manager is running. If it is,
* show the tables and hide the 'manager not running' banner. Else, vice-versa.
* Updates session storage then checks if the manager is running and updates the banner.
*/
async function refreshManagerStatus() {
return getStatus().then(function () {
var managerStatus = getComponentStatus(getStoredStatusData(), 'MANAGER');
if (managerStatus === 'ERROR') {
// show banner and hide tables
$('#managerBanner').show();
$('#runningDiv').hide();
} else {
// otherwise, hide banner and show tables
$('#managerBanner').hide();
$('#runningDiv').show();
}
return managerStatus;
});
Expand Down
8 changes: 0 additions & 8 deletions server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/manager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,9 @@ function updateManagerGoalStateBanner() {
function refreshManagerBanners() {
var managerRows = getStoredRows(MANAGER_SERVER_PROCESS_VIEW);
if (!Array.isArray(managerRows) || managerRows.length === 0) {
// show the manager error banner and hide manager table
$(runningBanner).show();
$(htmlTable).hide();
$(fateHtmlTable).hide();
} else {
// otherwise, hide the error banner and show manager table
$(runningBanner).hide();
$(fateHtmlTable).show();
$(htmlTable).show();
}
updateManagerGoalStateBanner();
}
Expand All @@ -74,8 +68,6 @@ function refresh() {
refreshTable(htmlTable, MANAGER_SERVER_PROCESS_VIEW);
refreshTable(fateHtmlTable, MANAGER_FATE_SERVER_PROCESS_VIEW);
$(runningBanner).show();
$(htmlTable).hide();
$(fateHtmlTable).hide();
$(managerStateBanner).hide();
showBannerError(htmlBanner, htmlBannerMessage);
});
Expand Down
12 changes: 0 additions & 12 deletions server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/recovery.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,6 @@ function getReplaying() {
return getStoredView(RECOVERY).serversRecoveringTablets;
}

function showOrHide(divElement, dataArray) {
if (dataArray.length == 0) {
$(divElement).hide();
} else {
$(divElement).show();
}
}

function refresh() {
$.when(getRecoveryInformation()).then(function () {
ajaxReloadTable(overviewDataTable);
Expand All @@ -82,10 +74,6 @@ function refresh() {
ajaxReloadTable(sortingDataTable);
ajaxReloadTable(replayingDataTable);
});
showOrHide(overviewTableDivElement, getOverview());
showOrHide(tabletRecoveryDivElement, getTablets());
showOrHide(sortingServersDivElement, getSorting());
showOrHide(replayingServersDivElement, getReplaying());
}

$(function () {
Expand Down
2 changes: 0 additions & 2 deletions server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/tservers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,9 @@ function refreshTServersBanner() {
if (getComponentStatus(statusData, 'MANAGER') === 'ERROR') {
$('#tserversManagerBanner').show();
$(htmlBanner).hide();
$('#tservers_wrapper').hide();
$('#recovery-caption').hide();
} else {
$('#tserversManagerBanner').hide();
$('#tservers_wrapper').show();
}
});
}
Expand Down
2 changes: 1 addition & 1 deletion server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/ec.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<h3>${title}</h3>
</div>
</div>
<div id="runningDiv" style="display: none;">
<div id="runningDiv">
<div class="row">
<div class="col-xs-12">
<table id="runningTable" class="table caption-top table-bordered table-striped table-condensed">
Expand Down