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

Bug 1562822 - P3. Reset all the tables that fail to apply a Safe Browsing update. r=gcp

Browse Source 
Before this patch, when Safe Browsing updating process discovers an error, it
quits and resets the table failing to update.
After this patch, updating process will continue to run when an error
occurs to find all the tables failing to apply an update.

Differential Revision: https://phabricator.services.mozilla.com/D42615

--HG--
extra : moz-landing-system : lando
This commit is contained in:
dlee 2019-08-21 12:08:12 +00:00
parent 25f266e670
commit 419e1534b0
2 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
toolkit/components/url-classifier/Classifier.cpp
View File

@ -729,7 +729,7 @@ nsresult Classifier::AsyncApplyUpdates(const TableUpdateArray& aUpdates,
"MUST be on update thread");
nsresult bgRv;
nsCString failedTableName;
nsTArray<nsCString> failedTableNames;
TableUpdateArray updates;
@ -737,7 +737,7 @@ nsresult Classifier::AsyncApplyUpdates(const TableUpdateArray& aUpdates,
// we process them on the background thread.
if (updates.AppendElements(aUpdates, fallible)) {
LOG(("Step 1. ApplyUpdatesBackground on update thread."));
bgRv = self->ApplyUpdatesBackground(updates, failedTableName);
bgRv = self->ApplyUpdatesBackground(updates, failedTableNames);
} else {
LOG(
("Step 1. Not enough memory to run ApplyUpdatesBackground on "
@ -747,12 +747,13 @@ nsresult Classifier::AsyncApplyUpdates(const TableUpdateArray& aUpdates,
nsCOMPtr<nsIRunnable> fgRunnable = NS_NewRunnableFunction(
"safebrowsing::Classifier::AsyncApplyUpdates",
[self, aCallback, bgRv, failedTableName, callerThread] {
[self, aCallback, bgRv, failedTableNames, callerThread] {
MOZ_ASSERT(NS_GetCurrentThread() == callerThread,
"MUST be on caller thread");
LOG(("Step 2. ApplyUpdatesForeground on caller thread"));
nsresult rv = self->ApplyUpdatesForeground(bgRv, failedTableName);
nsresult rv =
self->ApplyUpdatesForeground(bgRv, failedTableNames);
LOG(("Step 3. Updates applied! Fire callback."));
aCallback(rv);
@ -763,8 +764,8 @@ nsresult Classifier::AsyncApplyUpdates(const TableUpdateArray& aUpdates,
return mUpdateThread->Dispatch(bgRunnable, NS_DISPATCH_NORMAL);
}
nsresult Classifier::ApplyUpdatesBackground(TableUpdateArray& aUpdates,
nsACString& aFailedTableName) {
nsresult Classifier::ApplyUpdatesBackground(
TableUpdateArray& aUpdates, nsTArray<nsCString>& aFailedTableNames) {
// |mUpdateInterrupted| is guaranteed to have been unset.
// If |mUpdateInterrupted| is set at any point, Reset() must have
// been called then we need to interrupt the update process.
@ -826,13 +827,27 @@ nsresult Classifier::ApplyUpdatesBackground(TableUpdateArray& aUpdates,
rv = UpdateTableV4(aUpdates, updateTable);
}
if (NS_FAILED(rv)) {
aFailedTableName = updateTable;
RemoveUpdateIntermediaries();
return rv;
if (NS_WARN_IF(NS_FAILED(rv))) {
LOG(("Failed to update table: %s", updateTable.get()));
// We don't quit the updating process immediately when we discover
// a failure. Instead, we continue to apply updates to the
// remaining tables to find other tables which may also fail to
// apply an update. This help us reset all the corrupted tables
// within a single update.
// Note that changes that result from successful updates don't take
// effect after the updating process is finished. This is because
// when an error occurs during the updating process, we ignore all
// changes that have happened during the udpating process.
aFailedTableNames.AppendElement(updateTable);
continue;
}
}
if (!aFailedTableNames.IsEmpty()) {
RemoveUpdateIntermediaries();
return NS_ERROR_FAILURE;
}
if (LOG_ENABLED()) {
PRIntervalTime clockEnd = PR_IntervalNow();
LOG(("update took %dms\n",
@ -843,7 +858,7 @@ nsresult Classifier::ApplyUpdatesBackground(TableUpdateArray& aUpdates,
}
nsresult Classifier::ApplyUpdatesForeground(
nsresult aBackgroundRv, const nsACString& aFailedTableName) {
nsresult aBackgroundRv, const nsTArray<nsCString>& aFailedTableNames) {
if (ShouldAbort()) {
LOG(("Update is interrupted! Just remove update intermediaries."));
RemoveUpdateIntermediaries();
@ -857,7 +872,7 @@ nsresult Classifier::ApplyUpdatesForeground(
return SwapInNewTablesAndCleanup();
}
if (NS_ERROR_OUT_OF_MEMORY != aBackgroundRv) {
ResetTables(Clear_All, nsTArray<nsCString>{nsCString(aFailedTableName)});
ResetTables(Clear_All, aFailedTableNames);
}
return aBackgroundRv;
}

4
toolkit/components/url-classifier/Classifier.h
View File

@ -187,7 +187,7 @@ class Classifier {
* successful or not.
*/
nsresult ApplyUpdatesBackground(TableUpdateArray& aUpdates,
nsACString& aFailedTableName);
nsTArray<nsCString>& aFailedTableNames);
/**
* The "foreground" part of ApplyUpdates. The in-use data (in-memory and
@ -200,7 +200,7 @@ class Classifier {
* |aBackgroundRv| will be returned to forward the background update result.
*/
nsresult ApplyUpdatesForeground(nsresult aBackgroundRv,
const nsACString& aFailedTableName);
const nsTArray<nsCString>& aFailedTableNames);
// Used by worker thread and update thread to abort current operation.
bool ShouldAbort() const;