Page MenuHomePhabricator
Files F13199049

D21801.diff
No OneTemporary
Actions

D21801.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
@@ -329,6 +329,47 @@
->execute();
}
+
+ /**
+ * Get all the @{class:DrydockBlueprintImplementation}s which can possibly
+ * build a resource to satisfy a lease.
+ *
+ * This method returns blueprints which might, at some time, be able to
+ * build a resource which can satisfy the lease. They may not be able to
+ * build that resource right now.
+ *
+ * @param DrydockLease Requested lease.
+ * @return list<DrydockBlueprintImplementation> List of qualifying blueprint
+ * implementations.
+ */
+ public static function getAllForAllocatingLease(
+ DrydockLease $lease) {
+
+ $impls = self::getAllBlueprintImplementations();
+
+ $keep = array();
+ foreach ($impls as $key => $impl) {
+ // Don't use disabled blueprint types.
+ if (!$impl->isEnabled()) {
+ continue;
+ }
+
+ // Don't use blueprint types which can't allocate the correct kind of
+ // resource.
+ if ($impl->getType() != $lease->getResourceType()) {
+ continue;
+ }
+
+ if (!$impl->canAnyBlueprintEverAllocateResourceForLease($lease)) {
+ continue;
+ }
+
+ $keep[$key] = $impl;
+ }
+
+ return $keep;
+ }
+
public static function getNamedImplementation($class) {
return idx(self::getAllBlueprintImplementations(), $class);
}
diff --git a/src/applications/drydock/management/DrydockManagementLeaseWorkflow.php b/src/applications/drydock/management/DrydockManagementLeaseWorkflow.php
--- a/src/applications/drydock/management/DrydockManagementLeaseWorkflow.php
+++ b/src/applications/drydock/management/DrydockManagementLeaseWorkflow.php
@@ -79,6 +79,8 @@
$attributes = array();
}
+ $blueprint_phids = null;
+
$leases = array();
for ($idx = 0; $idx < $count; $idx++) {
$lease = id(new DrydockLease())
@@ -91,20 +93,11 @@
$lease->setAttributes($attributes);
}
- // TODO: This is not hugely scalable, although this is a debugging
- // workflow so maybe it's fine. Do we even need `bin/drydock lease` in
- // the long run?
- $all_blueprints = id(new DrydockBlueprintQuery())
- ->setViewer($viewer)
- ->execute();
- $allowed_phids = mpull($all_blueprints, 'getPHID');
- if (!$allowed_phids) {
- throw new Exception(
- pht(
- 'No blueprints exist which can plausibly allocate resources to '.
- 'satisfy the requested lease.'));
+ if ($blueprint_phids === null) {
+ $blueprint_phids = $this->newAllowedBlueprintPHIDs($lease);
}
- $lease->setAllowedBlueprintPHIDs($allowed_phids);
+
+ $lease->setAllowedBlueprintPHIDs($blueprint_phids);
if ($until) {
$lease->setUntil($until);
@@ -260,4 +253,36 @@
}
}
+ private function newAllowedBlueprintPHIDs(DrydockLease $lease) {
+ $viewer = $this->getViewer();
+
+ $impls = DrydockBlueprintImplementation::getAllForAllocatingLease($lease);
+
+ if (!$impls) {
+ throw new PhutilArgumentUsageException(
+ pht(
+ 'No known blueprint class can ever allocate the specified '.
+ 'lease. Check that the resource type is spelled correctly.'));
+ }
+
+ $classes = array_keys($impls);
+
+ $blueprints = id(new DrydockBlueprintQuery())
+ ->setViewer($viewer)
+ ->withBlueprintClasses($classes)
+ ->withDisabled(false)
+ ->execute();
+
+ if (!$blueprints) {
+ throw new PhutilArgumentUsageException(
+ pht(
+ 'No enabled blueprints exist with a blueprint class that can '.
+ 'plausibly allocate resources to satisfy the requested lease.'));
+ }
+
+ $phids = mpull($blueprints, 'getPHID');
+
+ return $phids;
+ }
+
}
diff --git a/src/applications/drydock/worker/DrydockLeaseUpdateWorker.php b/src/applications/drydock/worker/DrydockLeaseUpdateWorker.php
--- a/src/applications/drydock/worker/DrydockLeaseUpdateWorker.php
+++ b/src/applications/drydock/worker/DrydockLeaseUpdateWorker.php
@@ -343,48 +343,6 @@
}
- /**
- * Get all the @{class:DrydockBlueprintImplementation}s which can possibly
- * build a resource to satisfy a lease.
- *
- * This method returns blueprints which might, at some time, be able to
- * build a resource which can satisfy the lease. They may not be able to
- * build that resource right now.
- *
- * @param DrydockLease Requested lease.
- * @return list<DrydockBlueprintImplementation> List of qualifying blueprint
- * implementations.
- * @task allocator
- */
- private function loadBlueprintImplementationsForAllocatingLease(
- DrydockLease $lease) {
-
- $impls = DrydockBlueprintImplementation::getAllBlueprintImplementations();
-
- $keep = array();
- foreach ($impls as $key => $impl) {
- // Don't use disabled blueprint types.
- if (!$impl->isEnabled()) {
- continue;
- }
-
- // Don't use blueprint types which can't allocate the correct kind of
- // resource.
- if ($impl->getType() != $lease->getResourceType()) {
- continue;
- }
-
- if (!$impl->canAnyBlueprintEverAllocateResourceForLease($lease)) {
- continue;
- }
-
- $keep[$key] = $impl;
- }
-
- return $keep;
- }
-
-
/**
* Get all the concrete @{class:DrydockBlueprint}s which can possibly
* build a resource to satisfy a lease.
@@ -397,7 +355,7 @@
DrydockLease $lease) {
$viewer = $this->getViewer();
- $impls = $this->loadBlueprintImplementationsForAllocatingLease($lease);
+ $impls = DrydockBlueprintImplementation::getAllForAllocatingLease($lease);
if (!$impls) {
return array();
}

File Metadata

Mime Type
text/plain
Expires
Tue, May 14, 11:21 AM (2 w, 21 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6285162
Default Alt Text
D21801.diff (5 KB)

Event Timeline

Phabricator · Built by Phacility