Page MenuHomePhabricator
Files F15394767

D13752.diff
No OneTemporary
Actions

D13752.diff
View Options

diff --git a/src/applications/drydock/blueprint/DrydockWorkingCopyBlueprintImplementation.php b/src/applications/drydock/blueprint/DrydockWorkingCopyBlueprintImplementation.php
--- a/src/applications/drydock/blueprint/DrydockWorkingCopyBlueprintImplementation.php
+++ b/src/applications/drydock/blueprint/DrydockWorkingCopyBlueprintImplementation.php
@@ -242,79 +242,97 @@
) + $host_attributes)
->queueForActivation();
- $this->log(pht(
- 'Acquiring new host lease %d for working copy...',
- $host_lease->getID()));
- $lease->setAttribute('host.lease', $host_lease->getID());
- $lease->setAttribute('host.lease.phid', $host_lease->getPHID());
+ try {
+ $this->log(pht(
+ 'Acquiring new host lease %d for working copy...',
+ $host_lease->getID()));
+ $lease->setAttribute('host.lease', $host_lease->getID());
+ $lease->setAttribute('host.lease.phid', $host_lease->getPHID());
+ } catch (Exception $ex) {
+ $lease->reload();
+ $lease->setStatus(DrydockLeaseStatus::STATUS_BROKEN);
+ $lease->setBrokenReason(pht(
+ 'Forcibly broken by working copy blueprint.'));
+ $lease->save();
+ }
$host_lease->waitUntilActive();
- list($cache_lease, $source_url) = $this->tryAcquireWorkingCopyCache(
- $host_lease->getResource(),
- $lease,
- $lease->getAttribute('resolved.repositoryURL'));
+ try {
+ list($cache_lease, $source_url) = $this->tryAcquireWorkingCopyCache(
+ $host_lease->getResource(),
+ $lease,
+ $lease->getAttribute('resolved.repositoryURL'));
- $cmd = $this->getCommandInterfaceForLease($lease);
- $cmd->setExecTimeout(3600);
+ try {
+ $cmd = $this->getCommandInterfaceForLease($lease);
+ $cmd->setExecTimeout(3600);
- $this->log(pht(
- 'Cloning from "%s" to lease path "%s"',
- $source_url,
- $host_lease->getAttribute('path')));
- $cmd->execx(
- 'git clone %s .',
- $source_url);
- $this->log(pht('Cloned from %s', $source_url));
+ $this->log(pht(
+ 'Cloning from "%s" to lease path "%s"',
+ $source_url,
+ $host_lease->getAttribute('path')));
+ $cmd->execx(
+ 'git clone %s .',
+ $source_url);
+ $this->log(pht('Cloned from %s', $source_url));
+ } catch (Exception $ex) {
+ $this->tryReleaseWorkingCopyCache($cache_lease);
+ throw $ex;
+ }
- $this->tryReleaseWorkingCopyCache($cache_lease);
+ $this->tryReleaseWorkingCopyCache($cache_lease);
- if ($lease->getAttribute('resolved.target') === 'commit') {
- $this->log(pht(
- 'Checking out target commit "%s"',
- $lease->getAttribute('resolved.commitIdentifier')));
- $cmd->execx(
- 'git checkout -f %s',
- $lease->getAttribute('resolved.commitIdentifier'));
- $this->log(pht('Checked out commit'));
- } else if ($lease->getAttribute('resolved.target') === 'diff') {
- $this->log(pht(
- 'Fetching diff tag from origin'));
- $cmd->exec(
- 'git fetch origin +refs/tags/phabricator/diff/%d:'.
- 'refs/tags/phabricator/diff/%d',
- $lease->getAttribute('resolved.diffID'),
- $lease->getAttribute('resolved.diffID'));
- $this->log(pht(
- 'Checking out target diff at tag "phabricator/diff/%d"',
- $lease->getAttribute('resolved.diffID')));
- $cmd->execx(
- 'git checkout -f phabricator/diff/%d',
- $lease->getAttribute('resolved.diffID'));
- $this->log(pht('Checked out diff'));
- } else if ($lease->getAttribute('resolved.target') === 'url') {
- if ($lease->getAttribute('resolved.repositoryReference') !== null) {
+ if ($lease->getAttribute('resolved.target') === 'commit') {
$this->log(pht(
- 'Checking out target reference "%s"',
- $lease->getAttribute('resolved.repositoryReference')));
+ 'Checking out target commit "%s"',
+ $lease->getAttribute('resolved.commitIdentifier')));
$cmd->execx(
'git checkout -f %s',
- $lease->getAttribute('resolved.repositoryReference'));
- $this->log(pht('Checked out reference'));
- } else {
+ $lease->getAttribute('resolved.commitIdentifier'));
+ $this->log(pht('Checked out commit'));
+ } else if ($lease->getAttribute('resolved.target') === 'diff') {
+ $this->log(pht(
+ 'Fetching diff tag from origin'));
+ $cmd->exec(
+ 'git fetch origin +refs/tags/phabricator/diff/%d:'.
+ 'refs/tags/phabricator/diff/%d',
+ $lease->getAttribute('resolved.diffID'),
+ $lease->getAttribute('resolved.diffID'));
$this->log(pht(
- 'No target reference provided, leaving working directory as-is'));
+ 'Checking out target diff at tag "phabricator/diff/%d"',
+ $lease->getAttribute('resolved.diffID')));
+ $cmd->execx(
+ 'git checkout -f phabricator/diff/%d',
+ $lease->getAttribute('resolved.diffID'));
+ $this->log(pht('Checked out diff'));
+ } else if ($lease->getAttribute('resolved.target') === 'url') {
+ if ($lease->getAttribute('resolved.repositoryReference') !== null) {
+ $this->log(pht(
+ 'Checking out target reference "%s"',
+ $lease->getAttribute('resolved.repositoryReference')));
+ $cmd->execx(
+ 'git checkout -f %s',
+ $lease->getAttribute('resolved.repositoryReference'));
+ $this->log(pht('Checked out reference'));
+ } else {
+ $this->log(pht(
+ 'No target reference provided, leaving working directory as-is'));
+ }
+ } else {
+ throw new Exception(pht(
+ 'Target type %s not yet supported.',
+ $lease->getAttribute('resolved.target')));
}
- } else {
- throw new Exception(pht(
- 'Target type %s not yet supported.',
- $lease->getAttribute('resolved.target')));
- }
- $this->initializeGitSubmodules(
- $host_lease,
- $lease,
- $host_lease->getAttribute('path'));
+ $this->initializeGitSubmodules(
+ $host_lease,
+ $lease,
+ $host_lease->getAttribute('path'));
+ } catch (Exception $ex) {
+ $host_lease->release();
+ throw $ex;
+ }
}
private function getCommandInterfaceForLease(DrydockLease $lease) {
@@ -446,30 +464,38 @@
$owner_lease,
$url);
- $this->log(pht(
- 'Updating local submodule URL to point to %s',
- $source_url));
+ try {
+ $this->log(pht(
+ 'Updating local submodule URL to point to %s',
+ $source_url));
- $cmd->execx('git config --local submodule.%s.url %s', $name, $source_url);
+ $cmd->execx(
+ 'git config --local submodule.%s.url %s',
+ $name,
+ $source_url);
- $this->log(pht(
- 'Updating submodule %s',
- $name));
+ $this->log(pht(
+ 'Updating submodule %s',
+ $name));
- $cmd->execx('git submodule update %s', $name);
+ $cmd->execx('git submodule update %s', $name);
- $this->log(pht(
- 'Recursively initializing submodules for %s',
- $name));
+ $this->log(pht(
+ 'Recursively initializing submodules for %s',
+ $name));
- $this->initializeGitSubmodules(
- $target_lease,
- $owner_lease,
- $target_path.'/'.$name);
+ $this->initializeGitSubmodules(
+ $target_lease,
+ $owner_lease,
+ $target_path.'/'.$name);
- $this->log(pht(
- 'Recursive submodule initialization complete for %s',
- $name));
+ $this->log(pht(
+ 'Recursive submodule initialization complete for %s',
+ $name));
+ } catch (Exception $ex) {
+ $this->tryReleaseWorkingCopyCache($cache_lease);
+ throw $ex;
+ }
$this->tryReleaseWorkingCopyCache($cache_lease);
diff --git a/src/applications/drydock/blueprint/DrydockWorkingCopyCacheBlueprintImplementation.php b/src/applications/drydock/blueprint/DrydockWorkingCopyCacheBlueprintImplementation.php
--- a/src/applications/drydock/blueprint/DrydockWorkingCopyCacheBlueprintImplementation.php
+++ b/src/applications/drydock/blueprint/DrydockWorkingCopyCacheBlueprintImplementation.php
@@ -80,6 +80,7 @@
$host_lease = id(new DrydockLease())
->setResourceType('host')
->setIsTransientLease(1) // The cache should not hold the host open.
+ ->setOwnerPHID($lease->getPHID())
->setAttributes(
array(
'resourceID' => $host_resource_id,
@@ -90,32 +91,39 @@
$host_lease->getID(),
$host_resource_id));
$host_lease->waitUntilActive();
- $this->log(pht(
- 'Lease %d acquired for working copy resource.',
- $host_lease->getID()));
- $resource
- ->setAttribute('host.resource.phid', $host_lease->getResourcePHID())
- ->setAttribute('host.lease', $host_lease->getID())
- ->setAttribute('host.lease.phid', $host_lease->getPHID())
- ->save();
+ try {
+ $this->log(pht(
+ 'Lease %d acquired for working copy resource.',
+ $host_lease->getID()));
- $this->log(pht(
- 'Cloning repository at "%s" to "%s"...',
- $url,
- $host_lease->getAttribute('path')));
+ $resource
+ ->setAttribute('host.resource.phid', $host_lease->getResourcePHID())
+ ->setAttribute('host.lease', $host_lease->getID())
+ ->setAttribute('host.lease.phid', $host_lease->getPHID())
+ ->save();
+
+ $this->log(pht(
+ 'Cloning repository at "%s" to "%s"...',
+ $url,
+ $host_lease->getAttribute('path')));
- $cmd = $this->getCommandInterfaceForLease($host_lease);
- $cmd->setExecTimeout(3600);
- $cmd->execx(
- 'git clone --bare %s .',
- $url);
+ $cmd = $this->getCommandInterfaceForLease($host_lease);
+ $cmd->setExecTimeout(3600);
+ $cmd->execx(
+ 'git clone --bare %s .',
+ $url);
- $this->log('Cloned repository cache.');
+ $this->log('Cloned repository cache.');
+
+ $resource
+ ->setStatus(DrydockResourceStatus::STATUS_OPEN)
+ ->save();
+ } catch (Exception $ex) {
+ $host_lease->release();
+ throw $ex;
+ }
- $resource
- ->setStatus(DrydockResourceStatus::STATUS_OPEN)
- ->save();
return $resource;
}

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 17, 1:02 AM (5 d, 21 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7387269
Default Alt Text
D13752.diff (10 KB)

Event Timeline

Phabricator · Built by Phacility