<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[200598] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/200598">200598</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-05-09 16:59:55 -0700 (Mon, 09 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modern IDB: Prevent the same transaction from being commited/aborted twice.
https://bugs.webkit.org/show_bug.cgi?id=157494
Reviewed by Tim Horton.
When a page navigates or a worker terminates, in rare cases with specific unfortunate timing, the IDBServer
might receive a request to commit/abort a transaction that is already in the process of committing/aborting.
By moving transactions that are finishing into their own map we can at least detect this situation and
return an error. This seems like an improvement over some mysterious ASSERTs/timeouts.
No new tests:
While apparent that this is at least partially to blame for some existing timeouts/ASSERTs, I could not nail
down a reliable way to reproduce this with a dedicated test.
* Modules/indexeddb/server/UniqueIDBDatabase.cpp:
(WebCore::IDBServer::UniqueIDBDatabase::~UniqueIDBDatabase):
(WebCore::IDBServer::UniqueIDBDatabase::performCurrentDeleteOperation):
(WebCore::IDBServer::UniqueIDBDatabase::didDeleteBackingStore):
(WebCore::IDBServer::UniqueIDBDatabase::prepareToFinishTransaction):
(WebCore::IDBServer::UniqueIDBDatabase::commitTransaction):
(WebCore::IDBServer::UniqueIDBDatabase::didPerformCommitTransaction):
(WebCore::IDBServer::UniqueIDBDatabase::abortTransaction):
(WebCore::IDBServer::UniqueIDBDatabase::didPerformAbortTransaction):
(WebCore::IDBServer::UniqueIDBDatabase::hasUnfinishedTransactions):
(WebCore::IDBServer::UniqueIDBDatabase::operationAndTransactionTimerFired):
(WebCore::IDBServer::UniqueIDBDatabase::takeNextRunnableTransaction):
(WebCore::IDBServer::UniqueIDBDatabase::transactionCompleted): Renamed from inProgressTransactionCompleted.
(WebCore::IDBServer::UniqueIDBDatabase::inProgressTransactionCompleted): Deleted.
* Modules/indexeddb/server/UniqueIDBDatabase.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabasecpp">trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabaseh">trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200597 => 200598)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-09 23:51:20 UTC (rev 200597)
+++ trunk/Source/WebCore/ChangeLog 2016-05-09 23:59:55 UTC (rev 200598)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2016-05-09 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: Prevent the same transaction from being commited/aborted twice.
+ https://bugs.webkit.org/show_bug.cgi?id=157494
+
+ Reviewed by Tim Horton.
+
+ When a page navigates or a worker terminates, in rare cases with specific unfortunate timing, the IDBServer
+ might receive a request to commit/abort a transaction that is already in the process of committing/aborting.
+
+ By moving transactions that are finishing into their own map we can at least detect this situation and
+ return an error. This seems like an improvement over some mysterious ASSERTs/timeouts.
+
+ No new tests:
+ While apparent that this is at least partially to blame for some existing timeouts/ASSERTs, I could not nail
+ down a reliable way to reproduce this with a dedicated test.
+
+ * Modules/indexeddb/server/UniqueIDBDatabase.cpp:
+ (WebCore::IDBServer::UniqueIDBDatabase::~UniqueIDBDatabase):
+ (WebCore::IDBServer::UniqueIDBDatabase::performCurrentDeleteOperation):
+ (WebCore::IDBServer::UniqueIDBDatabase::didDeleteBackingStore):
+ (WebCore::IDBServer::UniqueIDBDatabase::prepareToFinishTransaction):
+ (WebCore::IDBServer::UniqueIDBDatabase::commitTransaction):
+ (WebCore::IDBServer::UniqueIDBDatabase::didPerformCommitTransaction):
+ (WebCore::IDBServer::UniqueIDBDatabase::abortTransaction):
+ (WebCore::IDBServer::UniqueIDBDatabase::didPerformAbortTransaction):
+ (WebCore::IDBServer::UniqueIDBDatabase::hasUnfinishedTransactions):
+ (WebCore::IDBServer::UniqueIDBDatabase::operationAndTransactionTimerFired):
+ (WebCore::IDBServer::UniqueIDBDatabase::takeNextRunnableTransaction):
+ (WebCore::IDBServer::UniqueIDBDatabase::transactionCompleted): Renamed from inProgressTransactionCompleted.
+ (WebCore::IDBServer::UniqueIDBDatabase::inProgressTransactionCompleted): Deleted.
+ * Modules/indexeddb/server/UniqueIDBDatabase.h:
+
</ins><span class="cx"> 2016-05-09 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Draw border and correct icon for placeholder attachments
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp (200597 => 200598)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp 2016-05-09 23:51:20 UTC (rev 200597)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp 2016-05-09 23:59:55 UTC (rev 200598)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "UniqueIDBDatabase::~UniqueIDBDatabase() (%p) %s", this, m_identifier.debugString().utf8().data());
</span><span class="cx"> ASSERT(!hasAnyPendingCallbacks());
</span><del>- ASSERT(m_inProgressTransactions.isEmpty());
</del><ins>+ ASSERT(!hasUnfinishedTransactions());
</ins><span class="cx"> ASSERT(m_pendingTransactions.isEmpty());
</span><span class="cx"> ASSERT(m_openDatabaseConnections.isEmpty());
</span><span class="cx"> ASSERT(m_closePendingDatabaseConnections.isEmpty());
</span><span class="lines">@@ -194,7 +194,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!m_inProgressTransactions.isEmpty())
</del><ins>+ if (hasUnfinishedTransactions())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> ASSERT(!hasAnyPendingCallbacks());
</span><span class="lines">@@ -250,7 +250,7 @@
</span><span class="cx"> ASSERT(m_currentOpenDBRequest);
</span><span class="cx"> ASSERT(m_currentOpenDBRequest->isDeleteRequest());
</span><span class="cx"> ASSERT(!hasAnyPendingCallbacks());
</span><del>- ASSERT(m_inProgressTransactions.isEmpty());
</del><ins>+ ASSERT(!hasUnfinishedTransactions());
</ins><span class="cx"> ASSERT(m_pendingTransactions.isEmpty());
</span><span class="cx"> ASSERT(m_openDatabaseConnections.isEmpty());
</span><span class="cx">
</span><span class="lines">@@ -983,6 +983,18 @@
</span><span class="cx"> performGetResultCallback(callbackIdentifier, error, result);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool UniqueIDBDatabase::prepareToFinishTransaction(UniqueIDBDatabaseTransaction& transaction)
+{
+ auto takenTransaction = m_inProgressTransactions.take(transaction.info().identifier());
+ if (!takenTransaction)
+ return false;
+
+ ASSERT(!m_finishingTransactions.contains(transaction.info().identifier()));
+ m_finishingTransactions.set(transaction.info().identifier(), WTFMove(takenTransaction));
+
+ return true;
+}
+
</ins><span class="cx"> void UniqueIDBDatabase::commitTransaction(UniqueIDBDatabaseTransaction& transaction, ErrorCallback callback)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="lines">@@ -990,14 +1002,13 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(&transaction.databaseConnection().database() == this);
</span><span class="cx">
</span><del>- if (m_versionChangeTransaction == &transaction) {
- ASSERT(!m_versionChangeDatabaseConnection || &m_versionChangeTransaction->databaseConnection() == m_versionChangeDatabaseConnection);
- ASSERT(m_databaseInfo->version() == transaction.info().newVersion());
</del><ins>+ uint64_t callbackID = storeCallback(callback);
</ins><span class="cx">
</span><del>- invokeOperationAndTransactionTimer();
</del><ins>+ if (!prepareToFinishTransaction(transaction)) {
+ performErrorCallback(callbackID, { IDBDatabaseException::UnknownError, ASCIILiteral("Attempt to commit transaction that is already finishing") });
+ return;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- uint64_t callbackID = storeCallback(callback);
</del><span class="cx"> m_server.postDatabaseTask(createCrossThreadTask(*this, &UniqueIDBDatabase::performCommitTransaction, callbackID, transaction.info().identifier()));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1017,7 +1028,7 @@
</span><span class="cx">
</span><span class="cx"> performErrorCallback(callbackIdentifier, error);
</span><span class="cx">
</span><del>- inProgressTransactionCompleted(transactionIdentifier);
</del><ins>+ transactionCompleted(m_finishingTransactions.take(transactionIdentifier));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::abortTransaction(UniqueIDBDatabaseTransaction& transaction, ErrorCallback callback)
</span><span class="lines">@@ -1028,6 +1039,12 @@
</span><span class="cx"> ASSERT(&transaction.databaseConnection().database() == this);
</span><span class="cx">
</span><span class="cx"> uint64_t callbackID = storeCallback(callback);
</span><ins>+
+ if (!prepareToFinishTransaction(transaction)) {
+ performErrorCallback(callbackID, { IDBDatabaseException::UnknownError, ASCIILiteral("Attempt to abort transaction that is already finishing") });
+ return;
+ }
+
</ins><span class="cx"> m_server.postDatabaseTask(createCrossThreadTask(*this, &UniqueIDBDatabase::performAbortTransaction, callbackID, transaction.info().identifier()));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1059,7 +1076,11 @@
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> LOG(IndexedDB, "(main) UniqueIDBDatabase::didPerformAbortTransaction");
</span><span class="cx">
</span><ins>+ auto transaction = m_finishingTransactions.take(transactionIdentifier);
+ ASSERT(transaction);
+
</ins><span class="cx"> if (m_versionChangeTransaction && m_versionChangeTransaction->info().identifier() == transactionIdentifier) {
</span><ins>+ ASSERT(m_versionChangeTransaction == transaction);
</ins><span class="cx"> ASSERT(!m_versionChangeDatabaseConnection || &m_versionChangeTransaction->databaseConnection() == m_versionChangeDatabaseConnection);
</span><span class="cx"> ASSERT(m_versionChangeTransaction->originalDatabaseInfo());
</span><span class="cx"> m_databaseInfo = std::make_unique<IDBDatabaseInfo>(*m_versionChangeTransaction->originalDatabaseInfo());
</span><span class="lines">@@ -1067,7 +1088,7 @@
</span><span class="cx">
</span><span class="cx"> performErrorCallback(callbackIdentifier, error);
</span><span class="cx">
</span><del>- inProgressTransactionCompleted(transactionIdentifier);
</del><ins>+ transactionCompleted(WTFMove(transaction));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::transactionDestroyed(UniqueIDBDatabaseTransaction& transaction)
</span><span class="lines">@@ -1127,6 +1148,11 @@
</span><span class="cx"> return !m_openDatabaseConnections.isEmpty() || !m_closePendingDatabaseConnections.isEmpty() || !m_pendingOpenDBRequests.isEmpty() || m_currentOpenDBRequest || m_versionChangeDatabaseConnection || m_versionChangeTransaction || m_isOpeningBackingStore || m_deleteBackingStoreInProgress;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool UniqueIDBDatabase::hasUnfinishedTransactions() const
+{
+ return !m_inProgressTransactions.isEmpty() || !m_finishingTransactions.isEmpty();
+}
+
</ins><span class="cx"> void UniqueIDBDatabase::invokeOperationAndTransactionTimer()
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "UniqueIDBDatabase::invokeOperationAndTransactionTimer()");
</span><span class="lines">@@ -1144,7 +1170,7 @@
</span><span class="cx"> // Assuming it is not ephemeral, the server should now close it to free up resources.
</span><span class="cx"> if (!m_backingStoreIsEphemeral && !isCurrentlyInUse()) {
</span><span class="cx"> ASSERT(m_pendingTransactions.isEmpty());
</span><del>- ASSERT(m_inProgressTransactions.isEmpty());
</del><ins>+ ASSERT(!hasUnfinishedTransactions());
</ins><span class="cx"> m_server.closeUniqueIDBDatabase(*this);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -1223,7 +1249,7 @@
</span><span class="cx"> RefPtr<UniqueIDBDatabaseTransaction> UniqueIDBDatabase::takeNextRunnableTransaction(bool& hadDeferredTransactions)
</span><span class="cx"> {
</span><span class="cx"> hadDeferredTransactions = false;
</span><del>- if (!m_backingStoreSupportsSimultaneousTransactions && !m_inProgressTransactions.isEmpty()) {
</del><ins>+ if (!m_backingStoreSupportsSimultaneousTransactions && hasUnfinishedTransactions()) {
</ins><span class="cx"> LOG(IndexedDB, "UniqueIDBDatabase::takeNextRunnableTransaction - Backing store only supports 1 transaction, and we already have 1");
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -1279,10 +1305,11 @@
</span><span class="cx"> return currentTransaction;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UniqueIDBDatabase::inProgressTransactionCompleted(const IDBResourceIdentifier& transactionIdentifier)
</del><ins>+void UniqueIDBDatabase::transactionCompleted(RefPtr<UniqueIDBDatabaseTransaction>&& transaction)
</ins><span class="cx"> {
</span><del>- auto transaction = m_inProgressTransactions.take(transactionIdentifier);
</del><span class="cx"> ASSERT(transaction);
</span><ins>+ ASSERT(!m_inProgressTransactions.contains(transaction->info().identifier()));
+ ASSERT(!m_finishingTransactions.contains(transaction->info().identifier()));
</ins><span class="cx">
</span><span class="cx"> for (auto objectStore : transaction->objectStoreIdentifiers()) {
</span><span class="cx"> if (!transaction->isReadOnly()) {
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h (200597 => 200598)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h 2016-05-09 23:51:20 UTC (rev 200597)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h 2016-05-09 23:59:55 UTC (rev 200598)
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> bool isVersionChangeInProgress();
</span><span class="cx">
</span><span class="cx"> void activateTransactionInBackingStore(UniqueIDBDatabaseTransaction&);
</span><del>- void inProgressTransactionCompleted(const IDBResourceIdentifier&);
</del><ins>+ void transactionCompleted(RefPtr<UniqueIDBDatabaseTransaction>&&);
</ins><span class="cx">
</span><span class="cx"> // Database thread operations
</span><span class="cx"> void deleteBackingStore(const IDBDatabaseIdentifier&);
</span><span class="lines">@@ -176,11 +176,14 @@
</span><span class="cx">
</span><span class="cx"> bool hasAnyPendingCallbacks() const;
</span><span class="cx"> bool isCurrentlyInUse() const;
</span><ins>+ bool hasUnfinishedTransactions() const;
</ins><span class="cx">
</span><span class="cx"> void invokeOperationAndTransactionTimer();
</span><span class="cx"> void operationAndTransactionTimerFired();
</span><span class="cx"> RefPtr<UniqueIDBDatabaseTransaction> takeNextRunnableTransaction(bool& hadDeferredTransactions);
</span><span class="cx">
</span><ins>+ bool prepareToFinishTransaction(UniqueIDBDatabaseTransaction&);
+
</ins><span class="cx"> IDBServer& m_server;
</span><span class="cx"> IDBDatabaseIdentifier m_identifier;
</span><span class="cx">
</span><span class="lines">@@ -211,6 +214,7 @@
</span><span class="cx">
</span><span class="cx"> Deque<RefPtr<UniqueIDBDatabaseTransaction>> m_pendingTransactions;
</span><span class="cx"> HashMap<IDBResourceIdentifier, RefPtr<UniqueIDBDatabaseTransaction>> m_inProgressTransactions;
</span><ins>+ HashMap<IDBResourceIdentifier, RefPtr<UniqueIDBDatabaseTransaction>> m_finishingTransactions;
</ins><span class="cx">
</span><span class="cx"> // The keys into these sets are the object store ID.
</span><span class="cx"> // These sets help to decide which transactions can be started and which must be deferred.
</span></span></pre>
</div>
</div>
</body>
</html>