Skip to content

Commit 1ba1337

Browse files
Fixes for SNAP-2422: (#112)
- Code changes for displaying error message if loading Google charts library fails. - Code changes for retrying loading of Google charts library. - Update Auto-Refresh error message to guide user to go to lead logs if there is any connectivity issue.
1 parent a6aab48 commit 1ba1337

File tree

2 files changed

+34
-4
lines changed

2 files changed

+34
-4
lines changed

core/src/main/resources/org/apache/spark/ui/static/snappydata/snappy-commons.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,5 +140,7 @@ var ajaxRequestErrorHandler = function (jqXHR, status, error) {
140140
displayMessage += status + " : "+error;;
141141
}
142142

143+
displayMessage += "<br>Please check lead logs to know more.";
144+
143145
$("#AutoUpdateErrorMsg").html(displayMessage).show();
144146
}

core/src/main/resources/org/apache/spark/ui/static/snappydata/snappy-dashboard.js

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11

2+
var isGoogleChartLoaded = false;
23
var isMemberCellExpanded = {};
34

45
function updateCoreDetails(coresInfo) {
@@ -351,6 +352,14 @@ function getExternalTableStatsGridConf() {
351352
}
352353

353354
function updateUsageCharts(statsData){
355+
356+
// Load charts library if not already loaded
357+
if(!isGoogleChartLoaded) {
358+
// Set error message
359+
$("#googleChartsErrorMsg").show();
360+
return;
361+
}
362+
354363
var cpuChartData = new google.visualization.DataTable();
355364
cpuChartData.addColumn('datetime', 'Time of Day');
356365
cpuChartData.addColumn('number', 'CPU');
@@ -457,16 +466,35 @@ function updateUsageCharts(statsData){
457466
diskSpaceUsageChart.draw(diskSpaceUsageChartData, diskSpaceUsageChartOptions);
458467
}
459468

460-
function loadGoogleCharts(){
461-
google.charts.load('current', {'packages':['corechart']});
462-
google.charts.setOnLoadCallback(googleChartsLoaded);
469+
function loadGoogleCharts() {
470+
471+
if((typeof google === 'object' && typeof google.charts === 'object')) {
472+
$("#googleChartsErrorMsg").hide();
473+
google.charts.load('current', {'packages':['corechart']});
474+
google.charts.setOnLoadCallback(googleChartsLoaded);
475+
isGoogleChartLoaded = true;
476+
} else {
477+
$("#googleChartsErrorMsg").show();
478+
}
479+
463480
}
464481

465-
function googleChartsLoaded(){
482+
function googleChartsLoaded() {
466483
loadClusterInfo();
467484
}
468485

469486
function loadClusterInfo() {
487+
488+
if(!isGoogleChartLoaded) {
489+
$.ajax({
490+
url: "https://www.gstatic.com/charts/loader.js",
491+
dataType: "script",
492+
success: function() {
493+
loadGoogleCharts()
494+
}
495+
});
496+
}
497+
470498
$.ajax({
471499
url:"/snappy-api/services/clusterinfo",
472500
dataType: 'json',

0 commit comments

Comments
 (0)