Page MenuHomePhabricator
Files F15429070

D19070.id.diff
No OneTemporary
Actions

D19070.id.diff
View Options

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1055,6 +1055,7 @@
'DrydockLeaseActivatedLogType' => 'applications/drydock/logtype/DrydockLeaseActivatedLogType.php',
'DrydockLeaseActivationFailureLogType' => 'applications/drydock/logtype/DrydockLeaseActivationFailureLogType.php',
'DrydockLeaseActivationYieldLogType' => 'applications/drydock/logtype/DrydockLeaseActivationYieldLogType.php',
+ 'DrydockLeaseAllocationFailureLogType' => 'applications/drydock/logtype/DrydockLeaseAllocationFailureLogType.php',
'DrydockLeaseController' => 'applications/drydock/controller/DrydockLeaseController.php',
'DrydockLeaseDatasource' => 'applications/drydock/typeahead/DrydockLeaseDatasource.php',
'DrydockLeaseDestroyedLogType' => 'applications/drydock/logtype/DrydockLeaseDestroyedLogType.php',
@@ -1106,6 +1107,7 @@
'DrydockResource' => 'applications/drydock/storage/DrydockResource.php',
'DrydockResourceActivationFailureLogType' => 'applications/drydock/logtype/DrydockResourceActivationFailureLogType.php',
'DrydockResourceActivationYieldLogType' => 'applications/drydock/logtype/DrydockResourceActivationYieldLogType.php',
+ 'DrydockResourceAllocationFailureLogType' => 'applications/drydock/logtype/DrydockResourceAllocationFailureLogType.php',
'DrydockResourceController' => 'applications/drydock/controller/DrydockResourceController.php',
'DrydockResourceDatasource' => 'applications/drydock/typeahead/DrydockResourceDatasource.php',
'DrydockResourceListController' => 'applications/drydock/controller/DrydockResourceListController.php',
@@ -6273,6 +6275,7 @@
'DrydockLeaseActivatedLogType' => 'DrydockLogType',
'DrydockLeaseActivationFailureLogType' => 'DrydockLogType',
'DrydockLeaseActivationYieldLogType' => 'DrydockLogType',
+ 'DrydockLeaseAllocationFailureLogType' => 'DrydockLogType',
'DrydockLeaseController' => 'DrydockController',
'DrydockLeaseDatasource' => 'PhabricatorTypeaheadDatasource',
'DrydockLeaseDestroyedLogType' => 'DrydockLogType',
@@ -6333,6 +6336,7 @@
),
'DrydockResourceActivationFailureLogType' => 'DrydockLogType',
'DrydockResourceActivationYieldLogType' => 'DrydockLogType',
+ 'DrydockResourceAllocationFailureLogType' => 'DrydockLogType',
'DrydockResourceController' => 'DrydockController',
'DrydockResourceDatasource' => 'PhabricatorTypeaheadDatasource',
'DrydockResourceListController' => 'DrydockResourceController',
diff --git a/src/applications/drydock/logtype/DrydockLeaseAllocationFailureLogType.php b/src/applications/drydock/logtype/DrydockLeaseAllocationFailureLogType.php
new file mode 100644
--- /dev/null
+++ b/src/applications/drydock/logtype/DrydockLeaseAllocationFailureLogType.php
@@ -0,0 +1,26 @@
+<?php
+
+final class DrydockLeaseAllocationFailureLogType extends DrydockLogType {
+
+ const LOGCONST = 'core.lease.allocation-failure';
+
+ public function getLogTypeName() {
+ return pht('Allocation Failed');
+ }
+
+ public function getLogTypeIcon(array $data) {
+ return 'fa-times red';
+ }
+
+ public function renderLog(array $data) {
+ $class = idx($data, 'class');
+ $message = idx($data, 'message');
+
+ return pht(
+ 'One or more blueprints promised a new resource, but failed when '.
+ 'allocating: [%s] %s',
+ $class,
+ $message);
+ }
+
+}
diff --git a/src/applications/drydock/logtype/DrydockResourceAllocationFailureLogType.php b/src/applications/drydock/logtype/DrydockResourceAllocationFailureLogType.php
new file mode 100644
--- /dev/null
+++ b/src/applications/drydock/logtype/DrydockResourceAllocationFailureLogType.php
@@ -0,0 +1,26 @@
+<?php
+
+final class DrydockResourceAllocationFailureLogType extends DrydockLogType {
+
+ const LOGCONST = 'core.resource.allocation-failure';
+
+ public function getLogTypeName() {
+ return pht('Allocation Failed');
+ }
+
+ public function getLogTypeIcon(array $data) {
+ return 'fa-times red';
+ }
+
+ public function renderLog(array $data) {
+ $class = idx($data, 'class');
+ $message = idx($data, 'message');
+
+ return pht(
+ 'Blueprint failed to allocate a resource after claiming it would '.
+ 'be able to: [%s] %s',
+ $class,
+ $message);
+ }
+
+}
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
@@ -216,17 +216,51 @@
// this.
break;
} catch (Exception $ex) {
+ // This failure is not normally expected, so log it. It can be
+ // caused by something mundane and recoverable, however (see below
+ // for discussion).
+
+ // We log to the blueprint separately from the log to the lease:
+ // the lease is not attached to a blueprint yet so the lease log
+ // will not show up on the blueprint; more than one blueprint may
+ // fail; and the lease is not really impacted (and won't log) if at
+ // least one blueprint actually works.
+
+ $blueprint->logEvent(
+ DrydockResourceAllocationFailureLogType::LOGCONST,
+ array(
+ 'class' => get_class($ex),
+ 'message' => $ex->getMessage(),
+ ));
+
$exceptions[] = $ex;
}
}
if (!$resources) {
- throw new PhutilAggregateException(
+ // If one or more blueprints claimed that they would be able to
+ // allocate resources but none are actually able to allocate resources,
+ // log the failure and yield so we try again soon.
+
+ // This can happen if some unexpected issue occurs during allocation
+ // (for example, a call to build a VM fails for some reason) or if we
+ // raced another allocator and the blueprint is now full.
+
+ $ex = new PhutilAggregateException(
pht(
'All blueprints failed to allocate a suitable new resource when '.
- 'trying to allocate lease "%s".',
+ 'trying to allocate lease ("%s").',
$lease->getPHID()),
$exceptions);
+
+ $lease->logEvent(
+ DrydockLeaseAllocationFailureLogType::LOGCONST,
+ array(
+ 'class' => get_class($ex),
+ 'message' => $ex->getMessage(),
+ ));
+
+ throw new PhabricatorWorkerYieldException(15);
}
$resources = $this->removeUnacquirableResources($resources, $lease);

File Metadata

Mime Type
text/plain
Expires
Tue, Mar 25, 12:19 AM (1 w, 5 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7711615
Default Alt Text
D19070.id.diff (6 KB)

Event Timeline

Phabricator · Built by Phacility