Skip to content

Move a transaction block into the task db extension methods. #9055

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Move a transaction block into the task db extension methods. #9055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 24 additions & 9 deletions app/lib/task/backend.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1397,9 +1397,7 @@ final class _TaskDataAccess {
return await withRetryTransaction(_db, (tx) async {
// Reload [state] within a transaction to avoid overwriting changes
// made by others trying to update state for another package.
final s = await tx.lookupOrNull<PackageState>(
PackageState.createKey(_db.emptyKey, runtimeVersion, package),
);
final s = await tx.tasks.lookupOrNull(package);
Copy link
Contributor

@sigurdm sigurdm Nov 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How come the runtimeVersion is no longer part of the key?

Copy link
Collaborator Author

@isoos isoos Nov 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tx.tasks.lookupOrNull is a wrapper method that has it: https://github.com/dart-lang/pub-dev/blob/master/app/lib/task/backend.dart#L1313-L1323

if (s == null) {
// No entry has been created yet, probably because of a new deployment rolling out.
// We can ignore it for now.
Expand All @@ -1419,18 +1417,35 @@ final class _TaskDataAccess {

Future<void> bumpPriority(String packageName) async {
await withRetryTransaction(_db, (tx) async {
final stateKey = PackageState.createKey(
_db.emptyKey,
runtimeVersion,
packageName,
);
final state = await tx.lookupOrNull<PackageState>(stateKey);
final state = await tx.tasks.lookupOrNull(packageName);
if (state != null) {
state.pendingAt = initialTimestamp;
tx.insert(state);
}
});
}

/// Restores the previous versions map state when starting the tasks on [instanceName] failed.
Future<void> restorePreviousVersionsState(
String packageName,
String instanceName,
Map<String, PackageVersionStateInfo> previousVersionsMap,
) async {
await withRetryTransaction(_db, (tx) async {
final s = await tx.tasks.lookupOrNull(packageName);
if (s == null) {
return; // Presumably, the package was deleted.
}

s.versions!.addEntries(
s.versions!.entries
.where((e) => e.value.instance == instanceName)
.map((e) => MapEntry(e.key, previousVersionsMap[e.key]!)),
);
s.derivePendingAt();
await tx.tasks.update(s);
});
}
}

class _TaskTransactionDataAcccess {
Expand Down
32 changes: 7 additions & 25 deletions app/lib/task/scheduler.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import 'package:pub_dev/package/backend.dart';
import 'package:pub_dev/shared/configuration.dart';
import 'package:pub_dev/shared/datastore.dart';
import 'package:pub_dev/shared/utils.dart';
import 'package:pub_dev/shared/versions.dart' show runtimeVersion;
import 'package:pub_dev/task/backend.dart';
import 'package:pub_dev/task/clock_control.dart';
import 'package:pub_dev/task/cloudcompute/cloudcompute.dart';
Expand Down Expand Up @@ -237,26 +236,11 @@ Future<void> schedule(
// suppose to run on the instance we just failed to create.
// If this doesn't work, we'll eventually retry. Hence, correctness
// does not hinge on this transaction being successful.
await withRetryTransaction(db, (tx) async {
final s = await tx.lookupOrNull<PackageState>(
PackageState.createKey(
db.emptyKey,
runtimeVersion,
selected.package,
),
);
if (s == null) {
return; // Presumably, the package was deleted.
}

s.versions!.addEntries(
s.versions!.entries
.where((e) => e.value.instance == instanceName)
.map((e) => MapEntry(e.key, oldVersionsMap[e.key]!)),
);
s.derivePendingAt();
tx.insert(s);
});
await db.tasks.restorePreviousVersionsState(
selected.package,
instanceName,
oldVersionsMap,
);
}
}
});
Expand Down Expand Up @@ -295,9 +279,7 @@ updatePackageStateWithPendingVersions(
String instanceName,
) async {
return await withRetryTransaction(db, (tx) async {
final s = await tx.lookupOrNull<PackageState>(
PackageState.createKey(db.emptyKey, runtimeVersion, package),
);
final s = await tx.tasks.lookupOrNull(package);
if (s == null) {
// presumably the package was deleted.
return null;
Expand Down Expand Up @@ -360,7 +342,7 @@ updatePackageStateWithPendingVersions(
),
});
s.derivePendingAt();
tx.insert(s);
await tx.tasks.update(s);

// Create payload
final payload = Payload(
Expand Down