Page MenuHomePhabricator
Files F15439752

D19072.id.diff
No OneTemporary
Actions

D19072.id.diff
View Options

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
@@ -90,7 +90,7 @@
"%s\n",
pht('Waiting for daemons to activate lease...'));
- $lease->waitUntilActive();
+ $this->waitUntilActive($lease);
echo tsprintf(
"%s\n",
@@ -99,4 +99,80 @@
return 0;
}
+
+ private function waitUntilActive(DrydockLease $lease) {
+ $viewer = $this->getViewer();
+
+ $log_cursor = 0;
+ $log_types = DrydockLogType::getAllLogTypes();
+
+ $is_active = false;
+ while (!$is_active) {
+ $lease->reload();
+
+ // While we're waiting, show the user any logs which the daemons have
+ // generated to give them some clue about what's going on.
+ $logs = id(new DrydockLogQuery())
+ ->setViewer($viewer)
+ ->withLeasePHIDs(array($lease->getPHID()))
+ ->setBeforeID($log_cursor)
+ ->execute();
+ if ($logs) {
+ $logs = mpull($logs, null, 'getID');
+ ksort($logs);
+ $log_cursor = last_key($logs);
+ }
+
+ foreach ($logs as $log) {
+ $type_key = $log->getType();
+ if (isset($log_types[$type_key])) {
+ $type_object = id(clone $log_types[$type_key])
+ ->setLog($log)
+ ->setViewer($viewer);
+
+ $log_data = $log->getData();
+
+ $type = $type_object->getLogTypeName();
+ $data = $type_object->renderLog($log_data);
+ } else {
+ $type = pht('Unknown ("%s")', $type_key);
+ $data = null;
+ }
+
+ echo tsprintf(
+ "<%s> %B\n",
+ $type,
+ $data);
+ }
+
+ $status = $lease->getStatus();
+
+ switch ($status) {
+ case DrydockLeaseStatus::STATUS_ACTIVE:
+ $is_active = true;
+ break;
+ case DrydockLeaseStatus::STATUS_RELEASED:
+ throw new Exception(pht('Lease has already been released!'));
+ case DrydockLeaseStatus::STATUS_DESTROYED:
+ throw new Exception(pht('Lease has already been destroyed!'));
+ case DrydockLeaseStatus::STATUS_BROKEN:
+ throw new Exception(pht('Lease has been broken!'));
+ case DrydockLeaseStatus::STATUS_PENDING:
+ case DrydockLeaseStatus::STATUS_ACQUIRED:
+ break;
+ default:
+ throw new Exception(
+ pht(
+ 'Lease has unknown status "%s".',
+ $status));
+ }
+
+ if ($is_active) {
+ break;
+ } else {
+ sleep(1);
+ }
+ }
+ }
+
}
diff --git a/src/applications/drydock/storage/DrydockLease.php b/src/applications/drydock/storage/DrydockLease.php
--- a/src/applications/drydock/storage/DrydockLease.php
+++ b/src/applications/drydock/storage/DrydockLease.php
@@ -194,38 +194,6 @@
return false;
}
- public function waitUntilActive() {
- while (true) {
- $lease = $this->reload();
- if (!$lease) {
- throw new Exception(pht('Failed to reload lease.'));
- }
-
- $status = $lease->getStatus();
-
- switch ($status) {
- case DrydockLeaseStatus::STATUS_ACTIVE:
- return;
- case DrydockLeaseStatus::STATUS_RELEASED:
- throw new Exception(pht('Lease has already been released!'));
- case DrydockLeaseStatus::STATUS_DESTROYED:
- throw new Exception(pht('Lease has already been destroyed!'));
- case DrydockLeaseStatus::STATUS_BROKEN:
- throw new Exception(pht('Lease has been broken!'));
- case DrydockLeaseStatus::STATUS_PENDING:
- case DrydockLeaseStatus::STATUS_ACQUIRED:
- break;
- default:
- throw new Exception(
- pht(
- 'Lease has unknown status "%s".',
- $status));
- }
-
- sleep(1);
- }
- }
-
public function setActivateWhenAcquired($activate) {
$this->activateWhenAcquired = true;
return $this;

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 27, 9:13 AM (1 w, 2 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7637720
Default Alt Text
D19072.id.diff (4 KB)

Event Timeline

Phabricator · Built by Phacility