Page MenuHomePhabricator
Files F14092740

D10511.id25254.diff
No OneTemporary
Actions

D10511.id25254.diff
View Options

diff --git a/src/applications/drydock/blueprint/DrydockAmazonEC2HostBlueprintImplementation.php b/src/applications/drydock/blueprint/DrydockAmazonEC2HostBlueprintImplementation.php
--- a/src/applications/drydock/blueprint/DrydockAmazonEC2HostBlueprintImplementation.php
+++ b/src/applications/drydock/blueprint/DrydockAmazonEC2HostBlueprintImplementation.php
@@ -75,11 +75,6 @@
DrydockResource $resource,
DrydockLease $lease) {
- // Allow other workers to start leasing against this.
- $resource
- ->setStatus(DrydockResourceStatus::STATUS_PENDING)
- ->save();
-
// We need to retrieve this as we need to use it for both importing the
// key and looking up the ID for the resource attributes.
$credential = id(new PassphraseCredentialQuery())
diff --git a/src/applications/drydock/worker/DrydockAllocatorWorker.php b/src/applications/drydock/worker/DrydockAllocatorWorker.php
--- a/src/applications/drydock/worker/DrydockAllocatorWorker.php
+++ b/src/applications/drydock/worker/DrydockAllocatorWorker.php
@@ -306,6 +306,27 @@
'Blueprint allocated a resource, but can\'t lease against it.');
}
+ $this->logToDrydock(
+ pht('Pre-emptively allocated the lease against the new resource.'));
+
+ // We now have to set the resource into Pending status, now that the
+ // initial lease has been grabbed on the resource. This ensures that
+ // as soon as we leave the lock, other allocators can start taking
+ // leases on it. If we didn't do this, we can run into a scenario
+ // where all resources are in "ALLOCATING" status when an allocator
+ // runs, and instead of overleasing, the request would fail.
+ //
+ // TODO: I think this means we can remove the "ALLOCATING" status now,
+ // but I'm not entirely sure. It's only ever used inside the lock, so
+ // I don't think any other allocators can race when attempting to
+ // use a still-allocating resource.
+ $resource
+ ->setStatus(DrydockResourceStatus::STATUS_PENDING)
+ ->save();
+
+ $this->logToDrydock(
+ pht('Moved the resource to the pending status.'));
+
$lock->unlock();
} catch (Exception $ex) {
$lock->unlock();

File Metadata

Mime Type
text/plain
Expires
Tue, Nov 26, 7:54 AM (20 h, 56 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6788590
Default Alt Text
D10511.id25254.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility