Page MenuHomePhabricator
Files F13216179

D10409.diff
No OneTemporary
Actions

D10409.diff
View Options

diff --git a/src/applications/drydock/blueprint/DrydockBlueprintImplementation.php b/src/applications/drydock/blueprint/DrydockBlueprintImplementation.php
--- a/src/applications/drydock/blueprint/DrydockBlueprintImplementation.php
+++ b/src/applications/drydock/blueprint/DrydockBlueprintImplementation.php
@@ -171,7 +171,10 @@
}
if ($allocation_exception) {
+ $lease->setStatus(DrydockLeaseStatus::STATUS_BROKEN);
+ $lease->save();
$this->logException($allocation_exception);
+ $this->closeResourceIfDesired($resource);
}
return $allocated;
@@ -236,7 +239,10 @@
try {
$this->executeAcquireLease($resource, $ephemeral_lease);
} catch (Exception $ex) {
+ $lease->setStatus(DrydockLeaseStatus::STATUS_BROKEN);
+ $lease->save();
$this->logException($ex);
+ $this->closeResourceIfDesired($resource);
throw $ex;
}
@@ -319,25 +325,30 @@
}
if (!$caused_by_closing_resource) {
- // Check to see if the resource has no more leases, and if so, ask the
- // blueprint as to whether this resource should be closed.
- $context = new DrydockAllocationContext(
- $this->getInstance(),
- $resource,
- $lease);
-
- if ($context->getCurrentResourceLeaseCount() === 0) {
- if ($this->shouldCloseUnleasedResource($context, $resource)) {
- self::writeLog(
- $resource,
- null,
- pht('Closing resource because it has no more active leases'));
- $this->closeResource($resource);
- }
- }
+ $this->closeResourceIfDesired($resource);
}
}
+ private function closeResourceIfDesired(
+ DrydockResource $resource) {
+
+ // Check to see if the resource has no more leases, and if so, ask the
+ // blueprint as to whether this resource should be closed.
+ $context = new DrydockAllocationContext(
+ $this->getInstance(),
+ $resource,
+ null);
+
+ if ($context->getCurrentResourceLeaseCount() === 0) {
+ if ($this->shouldCloseUnleasedResource($context, $resource)) {
+ self::writeLog(
+ $resource,
+ null,
+ pht('Closing resource because it has no more active leases'));
+ $this->closeResource($resource);
+ }
+ }
+ }
/* -( Resource Allocation )------------------------------------------------ */

File Metadata

Mime Type
text/plain
Expires
Sat, May 18, 10:51 PM (2 w, 1 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6301333
Default Alt Text
D10409.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility