Commit52f5c4c

authored

Merge pull request#261 from rhashimoto/attempted-ci-fix

Fix IDBBatchAtomicVFS race condition.

2 parents7a14d78 +8377bfb commit52f5c4cCopy full SHA for 52f5c4c

File tree

+16

-8

lines changed

+16

-8

lines changed

Lines changed: 13 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,11 @@ import { FacadeVFS } from '../FacadeVFS.js';`
`3`	`3`	`import*asVFSfrom'../VFS.js';`
`4`	`4`	`import{WebLocksMixin}from'../WebLocksMixin.js';`
`5`	`5`
	`6`	`+constRETRYABLE_ERRORS=newSet([`
	`7`	`+'TransactionInactiveError',`
	`8`	`+'InvalidStateError'`
	`9`	`+]);`
	`10`	`+`
`6`	`11`	`/**`
`7`	`12`	`*@typedef Metadata`
`8`	`13`	`*@property {string} name`
`@@ -717,21 +722,21 @@ export class IDBContext {`
`717`	`722`	`});`
`718`	`723`	`}`
`719`	`724`
`720`		`-//@ts-ignore`
`721`		`-// Create object store proxies.`
`722`		`-constobjectStores=[...tx.objectStoreNames].map(name=>{`
`723`		`-return[name,this.proxyStoreOrIndex(tx.objectStore(name))];`
`724`		`-});`
`725`		`-`
`726`	`725`	`try{`
	`726`	`+//@ts-ignore`
	`727`	`+// Create object store proxies.`
	`728`	`+constobjectStores=[...tx.objectStoreNames].map(name=>{`
	`729`	`+return[name,this.proxyStoreOrIndex(tx.objectStore(name))];`
	`730`	`+});`
	`731`	`+`
`727`	`732`	`// Execute the function.`
`728`	`733`	`returnawaitf(Object.fromEntries(objectStores));`
`729`	`734`	`}catch(e){`
`730`	`735`	`// Use a new transaction if this one was inactive. This will`
`731`	`736`	`// happen if the last request in the transaction completed`
`732`	`737`	`// in a previous task but the transaction has not yet committed.`
`733`		`-if(!i&&e.name==='TransactionInactiveError'){`
`734`		`-this.log?.('TransactionInactiveError, retrying');`
	`738`	`+if(!i&&RETRYABLE_ERRORS.has(e.name)){`
	`739`	+this.log?.(`${e.name}, retrying`);
`735`	`740`	`tx=null;`
`736`	`741`	`continue;`
`737`	`742`	`}`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,12 @@ export default /** @type {import("@web/test-runner").TestRunnerConfig} */ ({`
`8`	`8`	`defaultTimeoutInterval:5601000`
`9`	`9`	`},`
`10`	`10`	`},`
	`11`	`+browserLogs:true,`
	`12`	`+browserStartTimeout:60_000,`
`11`	`13`	`nodeResolve:true,`
`12`	`14`	`files:['./test/*.test.js'],`
`13`	`15`	`concurrency:1,`
	`16`	`+concurrentBrowsers:1,`
`14`	`17`	`browsers:[`
`15`	`18`	`chromeLauncher({`
`16`	`19`	`launchOptions:{`

Comments

(0)