1689967 - Simplify QuotaManager::CleanupTemporaryStorage

Status: RESOLVED FIXED

(Core :: Storage: Quota Manager, task)

Description

[Simon Giesecke [:sg] [he/him]]

Currently, QuotaManager::CleanupTemporaryStorage clears origins only after selecting both origins to evict because of exceeding their group limit as well as the global limit, which makes the second step quite complex, since it needs to adjust the usage values for the intended eviction of the first step. This was meant as an optimization, but, if it's an optimization at all, the effect is likely negligible. This could be simplified by doing just:

ClearOrigins(GetOriginInfosExceedingGroupLimit());
ClearOrigins(GetOriginInfosExceedingGlobalLimit());

Comment 1

[Simon Giesecke [:sg] [he/him]]

Attachment: Bug 1689967 - Simplify CleanupTemporaryStorage and the functions it calls. r=#dom-workers-and-storage

Instead of collection both origins exceeding their group limit and the global
limit before clearing any origin, do that separately. This removes the need
to adjust the global usage while determining which origins to evict simulating
the effects of evicting the origins exceeding their group limit.

This requires moving the lock into the GetOrigin* functions (thus removing
"Locked" from their names). Also, the arguments to GetOriginInfosExceedingGlobalLimit
are removed.

As an effect, the predicate passed into MaybeInsertOriginInfos is the same in
both uses, and just checks the IsPersisted property, so the predicate argument
is removed and the function is renamed to MaybeInsertNonPersistedOriginInfos.

Comment 2

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/129b45a961fb
Simplify CleanupTemporaryStorage and the functions it calls. r=dom-workers-and-storage-reviewers,janv

Comment 3

[Natalia Csoregi [:nataliaCs]]

Backed out along with Bug 1685677 for causing bustage on TestFlatten.cpp - see https://bugzilla.mozilla.org/show_bug.cgi?id=1685677#c17

Comment 4

[Pulsebot]

Backout by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/49fff125656d
Backed out 5 changesets (bug 1689967, bug 1685677) for bustage on TestFlatten.cpp. CLOSED TREE

Comment 5

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/db5df9a01429
Simplify CleanupTemporaryStorage and the functions it calls. r=dom-workers-and-storage-reviewers,janv

Comment 6

[Alexandru Michis [:malexandru]]

https://hg.mozilla.org/mozilla-central/rev/db5df9a01429