JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

satellite/satellitedb: remove subquery AOST in console db cleanup funcs

Browse Source 
This change fixes an issue where the console DB cleanup chore was never
able to run when using a Cockroach database implementation because of
an inappropriate AS OF SYSTEM TIME clause in the relevant methods.

Resolves #6197

Change-Id: I8456b6df2128678e0eebeb416eb1a955cc9bd706
This commit is contained in:
Jeremy Wharton 2023-08-19 00:52:13 -05:00 committed by Storj Robot
parent fe9f69a757
commit 84e75d5994
2 changed files with 57 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
satellite/satellitedb/users.go
View File

@ -16,6 +16,7 @@ import (
"storj.io/common/memory"
"storj.io/common/storj"
"storj.io/common/uuid"
"storj.io/private/dbutil/pgutil"
"storj.io/storj/satellite/console"
"storj.io/storj/satellite/satellitedb/dbx"
)
@ -212,7 +213,8 @@ func (users *users) DeleteUnverifiedBefore(
return Error.New("expected page size to be positive; got %d", pageSize)
}
var pageCursor, pageEnd uuid.UUID
var pageCursor uuid.UUID
selected := make([]uuid.UUID, pageSize)
aost := users.db.impl.AsOfSystemInterval(asOfSystemTimeInterval)
for {
// Select the ID beginning this page of records
@ -229,42 +231,42 @@ func (users *users) DeleteUnverifiedBefore(
return Error.Wrap(err)
}
// Select the ID ending this page of records
err = users.db.QueryRowContext(ctx, `
// Select page of records
rows, err := users.db.QueryContext(ctx, `
SELECT id FROM users
`+aost+`
WHERE id >= $1
ORDER BY id LIMIT 1 OFFSET $2
`, pageCursor, pageSize).Scan(&pageEnd)
if err != nil {
if !errors.Is(err, sql.ErrNoRows) {
return Error.Wrap(err)
}
// Since this is the last page, we want to return all remaining IDs
pageEnd = uuid.Max()
}
// Delete all old, unverified users in the range between the beginning and ending IDs
_, err = users.db.ExecContext(ctx, `
DELETE FROM users
WHERE id IN (
SELECT id FROM users
`+aost+`
WHERE id >= $1 AND id <= $2
AND users.status = $3 AND users.created_at < $4
ORDER BY id
)
`, pageCursor, pageEnd, console.Inactive, before)
WHERE id >= $1 ORDER BY id LIMIT $2
`, pageCursor, pageSize)
if err != nil {
return Error.Wrap(err)
}
if pageEnd == uuid.Max() {
var i int
for i = 0; rows.Next(); i++ {
if err = rows.Scan(&selected[i]); err != nil {
return Error.Wrap(err)
}
}
if err = errs.Combine(rows.Err(), rows.Close()); err != nil {
return Error.Wrap(err)
}
// Delete all old, unverified users in the page
_, err = users.db.ExecContext(ctx, `
DELETE FROM users
WHERE id = ANY($1)
AND status = $2 AND created_at < $3
`, pgutil.UUIDArray(selected[:i]), console.Inactive, before)
if err != nil {
return Error.Wrap(err)
}
if i < pageSize {
return nil
}
// Advance the cursor to the next page
pageCursor = pageEnd
pageCursor = selected[i-1]
}
}

57
satellite/satellitedb/webappsessions.go
View File

@ -9,7 +9,10 @@ import (
"errors"
"time"
"github.com/zeebo/errs"
"storj.io/common/uuid"
"storj.io/private/dbutil/pgutil"
"storj.io/storj/satellite/console/consoleauth"
"storj.io/storj/satellite/satellitedb/dbx"
)
@ -101,7 +104,8 @@ func (db *webappSessions) DeleteExpired(ctx context.Context, now time.Time, asOf
return Error.New("expected page size to be positive; got %d", pageSize)
}
var pageCursor, pageEnd uuid.UUID
var pageCursor uuid.UUID
selected := make([]uuid.UUID, pageSize)
aost := db.db.impl.AsOfSystemInterval(asOfSystemTimeInterval)
for {
// Select the ID beginning this page of records
@ -118,47 +122,42 @@ func (db *webappSessions) DeleteExpired(ctx context.Context, now time.Time, asOf
return Error.Wrap(err)
}
// Select the ID ending this page of records
err = db.db.QueryRowContext(ctx, `
// Select page of records
rows, err := db.db.QueryContext(ctx, `
SELECT id FROM webapp_sessions
`+aost+`
WHERE id > $1
ORDER BY id LIMIT 1 OFFSET $2
`, pageCursor, pageSize).Scan(&pageEnd)
WHERE id >= $1 ORDER BY id LIMIT $2
`, pageCursor, pageSize)
if err != nil {
if !errors.Is(err, sql.ErrNoRows) {
return Error.Wrap(err)
}
// Since this is the last page, we want to return all remaining records
_, err = db.db.ExecContext(ctx, `
DELETE FROM webapp_sessions
WHERE id IN (
SELECT id FROM webapp_sessions
`+aost+`
WHERE id >= $1 AND expires_at < $2
ORDER BY id
)
`, pageCursor, now)
return Error.Wrap(err)
}
// Delete all expired records in the range between the beginning and ending IDs
var i int
for i = 0; rows.Next(); i++ {
if err = rows.Scan(&selected[i]); err != nil {
return Error.Wrap(err)
}
}
if err = errs.Combine(rows.Err(), rows.Close()); err != nil {
return Error.Wrap(err)
}
// Delete all expired records in the page
_, err = db.db.ExecContext(ctx, `
DELETE FROM webapp_sessions
WHERE id IN (
SELECT id FROM webapp_sessions
`+aost+`
WHERE id BETWEEN $1 AND $2
AND expires_at < $3
ORDER BY id
)
`, pageCursor, pageEnd, now)
WHERE id = ANY($1)
AND expires_at < $2
`, pgutil.UUIDArray(selected[:i]), now)
if err != nil {
return Error.Wrap(err)
}
if i < pageSize {
return nil
}
// Advance the cursor to the next page
pageCursor = pageEnd
pageCursor = selected[i-1]
}
}