Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-22 01:35:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 1405299 - Key loadArchivedPing's stopwatches for re-entrancy r=Dexter

Browse Source 
loadArchivedPing is asynchronous, so it may be re-entrant. Key the stopwatches
against the ping id so it measures what it should and stops complaining.

MozReview-Commit-ID: GdHH5N8B4V7

--HG--
extra : rebase_source : 2ae8fba3bd38bb17ab3aae8443f7d2b9871ed963
This commit is contained in:
Chris H-C 2017-10-11 12:53:37 -04:00
parent 09f831b269
commit da011b0adc
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
toolkit/components/telemetry/TelemetryStorage.jsm
View File

@ -703,10 +703,11 @@ var TelemetryStorageImpl = {
* @return {promise<object>} Promise that is resolved with the ping data.
*/
async loadArchivedPing(id) {
TelemetryStopwatch.start("TELEMETRY_ARCHIVE_LOAD_MS");
let idAsObject = {id};
TelemetryStopwatch.start("TELEMETRY_ARCHIVE_LOAD_MS", idAsObject);
const data = this._archivedPings.get(id);
if (!data) {
TelemetryStopwatch.cancel("TELEMETRY_ARCHIVE_LOAD_MS");
TelemetryStopwatch.cancel("TELEMETRY_ARCHIVE_LOAD_MS", idAsObject);
this._log.trace("loadArchivedPing - no ping with id: " + id);
return Promise.reject(new Error("TelemetryStorage.loadArchivedPing - no ping with id " + id));
}
@ -721,7 +722,7 @@ var TelemetryStorageImpl = {
Telemetry.getHistogramById("TELEMETRY_DISCARDED_ARCHIVED_PINGS_SIZE_MB")
.add(Math.floor(fileSize / 1024 / 1024));
Telemetry.getHistogramById("TELEMETRY_PING_SIZE_EXCEEDED_ARCHIVED").add();
TelemetryStopwatch.cancel("TELEMETRY_ARCHIVE_LOAD_MS");
TelemetryStopwatch.cancel("TELEMETRY_ARCHIVE_LOAD_MS", idAsObject);
await OS.File.remove(path, {ignoreAbsent: true});
throw new Error("loadArchivedPing - exceeded the maximum ping size: " + fileSize);
}
@ -735,7 +736,7 @@ var TelemetryStorageImpl = {
ping = await this.loadPingFile(pathCompressed, /* compressed*/ true);
} catch (ex) {
if (!ex.becauseNoSuchFile) {
TelemetryStopwatch.cancel("TELEMETRY_ARCHIVE_LOAD_MS");
TelemetryStopwatch.cancel("TELEMETRY_ARCHIVE_LOAD_MS", idAsObject);
throw ex;
}
// If that fails, look for the uncompressed version.
@ -744,7 +745,7 @@ var TelemetryStorageImpl = {
ping = await this.loadPingFile(path, /* compressed*/ false);
}
TelemetryStopwatch.finish("TELEMETRY_ARCHIVE_LOAD_MS");
TelemetryStopwatch.finish("TELEMETRY_ARCHIVE_LOAD_MS", idAsObject);
return ping;
},