Skip to content

Hack to prevent busy wait for 404 errors #1146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
swaldmann wants to merge 5 commits into from
Closed

Hack to prevent busy wait for 404 errors #1146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8eaefb8
Hack to prevent busy wait for 404/429 error
swaldmann Apr 17, 2025
976335e
Simpler
swaldmann Apr 17, 2025
9772d63
Simpler
swaldmann Apr 17, 2025
fbdc93d
Fix
swaldmann Apr 17, 2025
4700bc8
Merge branch 'main' into tenant-404
swaldmann Apr 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions db-service/lib/common/DatabaseService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,11 @@ class DatabaseService extends cds.Service {

// Setting this.pool as used in this.acquire() and this.release()
this.pool = this.pools[tenant] ??= new ConnectionPool(this.pools._factory, tenant)
.on('factoryCreateError', e => {
if (isMultitenant && e.status === 404) {
this.pool._waitingClientsQueue?.dequeue?.()?.reject(e)
}
})

// Acquire a pooled connection
this.dbc = await this.acquire()
Expand Down
9 changes: 1 addition & 8 deletions hana/lib/HANAService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,7 @@ class HANAService extends SQLService {
HANAVERSION = dbc.server.major
return dbc
} catch (err) {
if (isMultitenant) {
// REVISIT: throw the error and break retry loop
// Stop trying when the tenant does not exist or is rate limited
if (err.status == 404 || err.status == 429)
return new Promise(function (_, reject) {
setTimeout(() => reject(err), acquireTimeoutMillis)
})
} else if (err.code !== 10) throw err
if (!isMultitenant && err.code !== 10) throw err
await require('@sap/cds-mtxs/lib').xt.serviceManager.get(tenant, { disableCache: true })
return this.create(tenant)
}
Expand Down
Loading