Skip to content

sparse zoneBannedUntil in instance creation #9120

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
isoos wants to merge 1 commit into
base: master
Choose a base branch
from
Open

sparse zoneBannedUntil in instance creation #9120

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
16 changes: 5 additions & 11 deletions app/lib/task/scheduler.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import 'dart:convert';
import 'dart:math';

import 'package:_pub_shared/data/task_payload.dart';
import 'package:basics/basics.dart';
import 'package:clock/clock.dart';
import 'package:logging/logging.dart' show Logger;
import 'package:meta/meta.dart';
Expand Down Expand Up @@ -36,18 +37,14 @@ Future<(CreateInstancesState, Duration)> runOneCreateInstancesCycle(
}) async {
// Map from zone to DateTime when zone is allowed again
final zoneBannedUntil = <String, DateTime>{
for (final zone in compute.zones) zone: DateTime(0),
...state.zoneBannedUntil,
...state.zoneBannedUntil.whereValue((v) => v.isAfter(clock.now())),
};
void banZone(String zone, {int minutes = 0, int hours = 0, int days = 0}) {
if (!zoneBannedUntil.containsKey(zone)) {
throw ArgumentError.value(zone, 'zone');
}

final until = clock.now().add(
Duration(minutes: minutes, hours: hours, days: days),
);
if (zoneBannedUntil[zone]!.isBefore(until)) {
if (!zoneBannedUntil.containsKey(zone) ||
zoneBannedUntil[zone]!.isBefore(until)) {
zoneBannedUntil[zone] = until;
}
}
Expand All @@ -72,10 +69,7 @@ Future<(CreateInstancesState, Duration)> runOneCreateInstancesCycle(

// Determine which zones are not banned
final allowedZones =
zoneBannedUntil.entries
.where((e) => e.value.isBefore(clock.now()))
.map((e) => e.key)
.toList()
compute.zones.where((zone) => !zoneBannedUntil.containsKey(zone)).toList()
..shuffle(rng);
var nextZoneIndex = 0;
String pickZone() => allowedZones[nextZoneIndex++ % allowedZones.length];
Expand Down