Page MenuHomePhabricator
Files F15460446

D10208.id24566.diff
No OneTemporary
Actions

D10208.id24566.diff
View Options

diff --git a/src/applications/harbormaster/engine/HarbormasterBuildEngine.php b/src/applications/harbormaster/engine/HarbormasterBuildEngine.php
--- a/src/applications/harbormaster/engine/HarbormasterBuildEngine.php
+++ b/src/applications/harbormaster/engine/HarbormasterBuildEngine.php
@@ -62,6 +62,7 @@
// If any exception is raised, the build is marked as a failure and the
// exception is re-thrown (this ensures we don't leave builds in an
// inconsistent state).
+ $this->releaseAllArtifacts($build);
$build->setBuildStatus(HarbormasterBuild::STATUS_ERROR);
$build->save();
@@ -115,6 +116,8 @@
}
private function destroyBuildTargets(HarbormasterBuild $build) {
+ $this->releaseAllArtifacts($build);
+
$targets = id(new HarbormasterBuildTargetQuery())
->setViewer($this->getViewer())
->withBuildPHIDs(array($build->getPHID()))
@@ -230,6 +233,7 @@
// If any step failed, fail the whole build, then bail.
if (count($failed)) {
+ $this->releaseAllArtifacts($build);
$build->setBuildStatus(HarbormasterBuild::STATUS_FAILED);
$build->save();
return;
@@ -238,6 +242,7 @@
// If every step is complete, we're done with this build. Mark it passed
// and bail.
if (count($complete) == count($steps)) {
+ $this->releaseAllArtifacts($build);
$build->setBuildStatus(HarbormasterBuild::STATUS_PASSED);
$build->save();
return;
@@ -268,6 +273,7 @@
if (!$runnable && !$waiting && !$underway) {
// This means the build is deadlocked, and the user has configured
// circular dependencies.
+ $this->releaseAllArtifacts($build);
$build->setBuildStatus(HarbormasterBuild::STATUS_DEADLOCKED);
$build->save();
return;
@@ -440,4 +446,27 @@
}
}
+ private function releaseAllArtifacts(HarbormasterBuild $build) {
+ $targets = id(new HarbormasterBuildTargetQuery())
+ ->setViewer(PhabricatorUser::getOmnipotentUser())
+ ->withBuildPHIDs(array($build->getPHID()))
+ ->execute();
+
+ if (count($targets) === 0) {
+ return;
+ }
+
+ $target_phids = mpull($targets, 'getPHID');
+
+ $artifacts = id(new HarbormasterBuildArtifactQuery())
+ ->setViewer(PhabricatorUser::getOmnipotentUser())
+ ->withBuildTargetPHIDs($target_phids)
+ ->execute();
+
+ foreach ($artifacts as $artifact) {
+ $artifact->release();
+ }
+
+ }
+
}
diff --git a/src/applications/harbormaster/storage/build/HarbormasterBuildArtifact.php b/src/applications/harbormaster/storage/build/HarbormasterBuildArtifact.php
--- a/src/applications/harbormaster/storage/build/HarbormasterBuildArtifact.php
+++ b/src/applications/harbormaster/storage/build/HarbormasterBuildArtifact.php
@@ -125,6 +125,24 @@
return $file;
}
+ public function release() {
+ switch ($this->getArtifactType()) {
+ case self::TYPE_HOST:
+ $this->releaseDrydockLease();
+ break;
+ }
+ }
+
+ public function releaseDrydockLease() {
+ $lease = $this->loadDrydockLease();
+ $resource = $lease->getResource();
+ $blueprint = $resource->getBlueprint();
+
+ if ($lease->isActive()) {
+ $blueprint->releaseLease($resource, $lease);
+ }
+ }
+
/* -( PhabricatorPolicyInterface )----------------------------------------- */

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 1, 11:06 PM (3 d, 17 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7729160
Default Alt Text
D10208.id24566.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility