X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/07ad3d1e604624893a945d08666046cc69568dab..f2652e70c70db7a9a068c5a9bc8c6ec6566a14c6:/apps/workbench/app/assets/javascripts/event_log.js diff --git a/apps/workbench/app/assets/javascripts/event_log.js b/apps/workbench/app/assets/javascripts/event_log.js index d94c001f22..2c4fe526b4 100644 --- a/apps/workbench/app/assets/javascripts/event_log.js +++ b/apps/workbench/app/assets/javascripts/event_log.js @@ -61,120 +61,135 @@ $(document).on('ajax:complete ready', function() { window.jobGraphData = []; window.jobGraphSeries = []; window.jobGraphMaxima = {}; - - TODO: make this more robust: many type conversions etc problems could theoretically go wrong in here */ function processLogLineForChart( logLine ) { - var recreate = false; - var rescale = false; - var match = logLine.match(/(\S+) (\S+) (\S+) (\S+) stderr crunchstat: (\S+) (.*) -- interval (.*)/); - if( match ) { - // the timestamp comes first - var timestamp = match[1].replace('_','T'); - // for the series use the first word after 'crunchstat:' - var series = match[5]; - // and append the task number (the 4th term) - series += '-' + match[4] - if( $.inArray( series, jobGraphSeries) < 0 ) { - jobGraphSeries.push(series); - jobGraphMaxima[series] = null; - recreate = true; - } - var intervalData = match[7].trim().split(' '); - var dt = parseFloat(intervalData[0]); - var dsum = 0.0; - for(var i=2; i < intervalData.length; i += 2 ) { - dsum += parseFloat(intervalData[i]); - } - var datum = dsum/dt; - if( datum !== 0 && ( jobGraphMaxima[series] === null || jobGraphMaxima[series] < datum ) ) { - if( isJobSeriesRescalable(series) ) { - // use old maximum to get a scale conversion - var scaleConversion = jobGraphMaxima[series]/datum; - // set new maximum and rescale the series - jobGraphMaxima[series] = datum; - rescaleJobGraphSeries( series, scaleConversion ); + try { + var match = logLine.match(/(\S+) (\S+) (\S+) (\S+) stderr crunchstat: (\S+) (.*) -- interval (.*)/); + if( match ) { + // the timestamp comes first + var timestamp = match[1].replace('_','T'); + // for the series use the first word after 'crunchstat:' + var series = match[5]; + // and append the task number (the 4th term) + series += '-' + match[4] + if( $.inArray( series, jobGraphSeries) < 0 ) { + jobGraphSeries.push(series); + jobGraphMaxima[series] = null; + window.recreate = true; } - // and special calculation for cpus - if( /^cpu-/.test(series) ) { - // divide the stat by the number of cpus - var cpuCountMatch = match[6].match(/(\d+) cpus/); - if( cpuCountMatch ) { - datum = datum / cpuCountMatch[1]; + var intervalData = match[7].trim().split(' '); + var dt = parseFloat(intervalData[0]); + var dsum = 0.0; + for(var i=2; i < intervalData.length; i += 2 ) { + dsum += parseFloat(intervalData[i]); + } + var datum = dsum/dt; + if( datum !== 0 && ( jobGraphMaxima[series] === null || jobGraphMaxima[series] < datum ) ) { + if( isJobSeriesRescalable(series) ) { + // use old maximum to get a scale conversion + var scaleConversion = jobGraphMaxima[series]/datum; + // set new maximum and rescale the series + jobGraphMaxima[series] = datum; + rescaleJobGraphSeries( series, scaleConversion ); + } + // and special calculation for cpus + if( /^cpu-/.test(series) ) { + // divide the stat by the number of cpus + var cpuCountMatch = match[6].match(/(\d+) cpus/); + if( cpuCountMatch ) { + datum = datum / cpuCountMatch[1]; + } } } - } - // scale - var scaledDatum = null; - if( isJobSeriesRescalable(series) && jobGraphMaxima[series] !== null && jobGraphMaxima[series] !== 0 ) { - scaledDatum = datum/jobGraphMaxima[series] - } else { - scaledDatum = datum; - } - // identify x axis point, searching from the end of the array (most recent) - var found = false; - for( var i = jobGraphData.length - 1; i >= 0; i-- ) { - if( jobGraphData[i]['t'] === timestamp ) { - found = true; - jobGraphData[i][series] = scaledDatum; - jobGraphData[i]['raw-'+series] = match[7]; - break; - } else if( jobGraphData[i]['t'] < timestamp ) { - // we've gone far enough back in time and this data is supposed to be sorted - break; + // scale + var scaledDatum = null; + if( isJobSeriesRescalable(series) && jobGraphMaxima[series] !== null && jobGraphMaxima[series] !== 0 ) { + scaledDatum = datum/jobGraphMaxima[series] + } else { + scaledDatum = datum; } - } - // index counter from previous loop will have gone one too far, so add one - var insertAt = i+1; - if(!found) { - // create a new x point for this previously unrecorded timestamp - var entry = { 't': timestamp }; - entry[series] = scaledDatum; - entry['raw-'+series] = match[7]; - jobGraphData.splice( insertAt, 0, entry ); - var shifted = []; - // now let's see about "scrolling" the graph, dropping entries that are too old (>10 minutes) - while( jobGraphData.length > 0 - && (Date.parse( jobGraphData[0]['t'] ).valueOf() + 10*60000 < Date.parse( jobGraphData[jobGraphData.length-1]['t'] ).valueOf()) ) { - shifted.push(jobGraphData.shift()); + // identify x axis point, searching from the end of the array (most recent) + var found = false; + for( var i = jobGraphData.length - 1; i >= 0; i-- ) { + if( jobGraphData[i]['t'] === timestamp ) { + found = true; + jobGraphData[i][series] = scaledDatum; + jobGraphData[i]['raw-'+series] = match[7]; + break; + } else if( jobGraphData[i]['t'] < timestamp ) { + // we've gone far enough back in time and this data is supposed to be sorted + break; + } } - if( shifted.length > 0 ) { - // from those that we dropped, are any of them maxima? if so we need to rescale - jobGraphSeries.forEach( function(series) { - // test that every shifted entry in this series was either not a number (in which case we don't care) - // or else approximately (to 2 decimal places) smaller than the scaled maximum (i.e. 1), - // because otherwise we just scrolled off something that was a maximum point - // and so we need to recalculate a new maximum point by looking at all remaining displayed points in the series - if( isJobSeriesRescalable(series) && jobGraphMaxima[series] !== null - && !shifted.every( function(e) { return( !$.isNumeric(e[series]) || e[series].toFixed(2) < 1.0 ) } ) ) { - // check the remaining displayed points and find the new (scaled) maximum - var seriesMax = null; - jobGraphData.forEach( function(entry) { - if( $.isNumeric(entry[series]) && (seriesMax === null || entry[series] > seriesMax)) { - seriesMax = entry[series]; + // index counter from previous loop will have gone one too far, so add one + var insertAt = i+1; + if(!found) { + // create a new x point for this previously unrecorded timestamp + var entry = { 't': timestamp }; + entry[series] = scaledDatum; + entry['raw-'+series] = match[7]; + jobGraphData.splice( insertAt, 0, entry ); + var shifted = []; + // now let's see about "scrolling" the graph, dropping entries that are too old (>10 minutes) + while( jobGraphData.length > 0 + && (Date.parse( jobGraphData[0]['t'] ).valueOf() + 10*60000 < Date.parse( jobGraphData[jobGraphData.length-1]['t'] ).valueOf()) ) { + shifted.push(jobGraphData.shift()); + } + if( shifted.length > 0 ) { + // from those that we dropped, are any of them maxima? if so we need to rescale + jobGraphSeries.forEach( function(series) { + // test that every shifted entry in this series was either not a number (in which case we don't care) + // or else approximately (to 2 decimal places) smaller than the scaled maximum (i.e. 1), + // because otherwise we just scrolled off something that was a maximum point + // and so we need to recalculate a new maximum point by looking at all remaining displayed points in the series + if( isJobSeriesRescalable(series) && jobGraphMaxima[series] !== null + && !shifted.every( function(e) { return( !$.isNumeric(e[series]) || e[series].toFixed(2) < 1.0 ) } ) ) { + // check the remaining displayed points and find the new (scaled) maximum + var seriesMax = null; + jobGraphData.forEach( function(entry) { + if( $.isNumeric(entry[series]) && (seriesMax === null || entry[series] > seriesMax)) { + seriesMax = entry[series]; + } + }); + if( seriesMax !== null && seriesMax !== 0 ) { + // set new actual maximum using the new maximum as the conversion conversion and rescale the series + jobGraphMaxima[series] *= seriesMax; + var scaleConversion = 1/seriesMax; + rescaleJobGraphSeries( series, scaleConversion ); + } + else { + // we no longer have any data points displaying for this series + jobGraphMaxima[series] = null; } - }); - if( seriesMax !== null && seriesMax !== 0 ) { - // set new actual maximum using the new maximum as the conversion conversion and rescale the series - jobGraphMaxima[series] *= seriesMax; - var scaleConversion = 1/seriesMax; - rescaleJobGraphSeries( series, scaleConversion ); - } - else { - // we no longer have any data points displaying for this series - jobGraphMaxima[series] = null; } - } - }); + }); + } + // add a 10 minute old null data point to keep the chart honest if the oldest point is less than 9.5 minutes old + if( jobGraphData.length > 0 + && (Date.parse( jobGraphData[0]['t'] ).valueOf() + 9.5*60000 > Date.parse( jobGraphData[jobGraphData.length-1]['t'] ).valueOf()) ) { + var tenMinutesBefore = (new Date(Date.parse( jobGraphData[jobGraphData.length-1]['t'] ).valueOf() - 600*1000)).toISOString().replace('Z',''); + jobGraphData.unshift( { 't': tenMinutesBefore } ); + } } + window.redraw = true; } + } catch( err ) { + console.log( 'Ignoring error trying to process log line: ' + err); } - return recreate; } function createJobGraph(elementName) { delete jobGraph; - window.jobGraph = Morris.Line( { + var emptyGraph = false; + if( jobGraphData.length === 0 ) { + // If there is no data we still want to show an empty graph, + // so add an empty datum and placeholder series to fool it into displaying itself. + // Note that when finally a new series is added, the graph will be recreated anyway. + jobGraphData.push( {} ); + jobGraphSeries.push( '' ); + emptyGraph = true; + } + var graphteristics = { element: elementName, data: jobGraphData, ymax: 1.0, @@ -182,7 +197,9 @@ function createJobGraph(elementName) { xkey: 't', ykeys: jobGraphSeries, labels: jobGraphSeries, + resize: true, hideHover: 'auto', + parseTime: true, hoverCallback: function(index, options, content) { var s = "
"; s += options.data[index][options.xkey]; @@ -217,7 +234,17 @@ function createJobGraph(elementName) { } return s; } - }); + } + if( emptyGraph ) { + graphteristics['axes'] = false; + graphteristics['parseTime'] = false; + graphteristics['hideHover'] = 'always'; + } + window.jobGraph = Morris.Line( graphteristics ); + if( emptyGraph ) { + jobGraphData = []; + jobGraphSeries = []; + } } function rescaleJobGraphSeries( series, scaleConversion ) { @@ -237,12 +264,7 @@ function isJobSeriesRescalable( series ) { $(document).on('arv-log-event', '#log_graph_div', function(event, eventData) { if( eventData.properties.text ) { - var causeRecreate = processLogLineForChart( eventData.properties.text ); - if( causeRecreate && !window.recreate ) { - window.recreate = true; - } else { - window.redraw = true; - } + processLogLineForChart( eventData.properties.text ); } } ); @@ -252,6 +274,7 @@ $(document).on('ready', function(){ setInterval( function() { if( recreate ) { window.recreate = false; + window.redraw = false; // series have changed, draw entirely new graph $('#log_graph_div').html(''); createJobGraph('log_graph_div');