+16

resources/sql/autopatches/20151013.drydock.op.1.sql

reviewed

··· 1 1 + CREATE TABLE {$NAMESPACE}_drydock.drydock_repositoryoperation ( 2 2 + id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY, 3 3 + phid VARBINARY(64) NOT NULL, 4 4 + authorPHID VARBINARY(64) NOT NULL, 5 5 + objectPHID VARBINARY(64) NOT NULL, 6 6 + repositoryPHID VARBINARY(64) NOT NULL, 7 7 + repositoryTarget LONGBLOB NOT NULL, 8 8 + operationType VARCHAR(32) NOT NULL COLLATE {$COLLATE_TEXT}, 9 9 + operationState VARCHAR(32) NOT NULL COLLATE {$COLLATE_TEXT}, 10 10 + properties LONGTEXT NOT NULL COLLATE {$COLLATE_TEXT}, 11 11 + dateCreated INT UNSIGNED NOT NULL, 12 12 + dateModified INT UNSIGNED NOT NULL, 13 13 + UNIQUE KEY `key_phid` (phid), 14 14 + KEY `key_object` (objectPHID), 15 15 + KEY `key_repository` (repositoryPHID, operationState) 16 16 + ) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};

+19

src/__phutil_library_map__.php

reviewed

··· 467 467 'DifferentialRevisionListController' => 'applications/differential/controller/DifferentialRevisionListController.php', 468 468 'DifferentialRevisionListView' => 'applications/differential/view/DifferentialRevisionListView.php', 469 469 'DifferentialRevisionMailReceiver' => 'applications/differential/mail/DifferentialRevisionMailReceiver.php', 470 470 + 'DifferentialRevisionOperationController' => 'applications/differential/controller/DifferentialRevisionOperationController.php', 470 471 'DifferentialRevisionPHIDType' => 'applications/differential/phid/DifferentialRevisionPHIDType.php', 471 472 'DifferentialRevisionPackageHeraldField' => 'applications/differential/herald/DifferentialRevisionPackageHeraldField.php', 472 473 'DifferentialRevisionPackageOwnerHeraldField' => 'applications/differential/herald/DifferentialRevisionPackageOwnerHeraldField.php', ··· 839 840 'DrydockDefaultViewCapability' => 'applications/drydock/capability/DrydockDefaultViewCapability.php', 840 841 'DrydockFilesystemInterface' => 'applications/drydock/interface/filesystem/DrydockFilesystemInterface.php', 841 842 'DrydockInterface' => 'applications/drydock/interface/DrydockInterface.php', 843 843 + 'DrydockLandRepositoryOperation' => 'applications/drydock/operation/DrydockLandRepositoryOperation.php', 842 844 'DrydockLease' => 'applications/drydock/storage/DrydockLease.php', 843 845 'DrydockLeaseAcquiredLogType' => 'applications/drydock/logtype/DrydockLeaseAcquiredLogType.php', 844 846 'DrydockLeaseActivatedLogType' => 'applications/drydock/logtype/DrydockLeaseActivatedLogType.php', ··· 878 880 'DrydockManagementWorkflow' => 'applications/drydock/management/DrydockManagementWorkflow.php', 879 881 'DrydockObjectAuthorizationView' => 'applications/drydock/view/DrydockObjectAuthorizationView.php', 880 882 'DrydockQuery' => 'applications/drydock/query/DrydockQuery.php', 883 883 + 'DrydockRepositoryOperation' => 'applications/drydock/storage/DrydockRepositoryOperation.php', 884 884 + 'DrydockRepositoryOperationPHIDType' => 'applications/drydock/phid/DrydockRepositoryOperationPHIDType.php', 885 885 + 'DrydockRepositoryOperationQuery' => 'applications/drydock/query/DrydockRepositoryOperationQuery.php', 886 886 + 'DrydockRepositoryOperationType' => 'applications/drydock/operation/DrydockRepositoryOperationType.php', 887 887 + 'DrydockRepositoryOperationUpdateWorker' => 'applications/drydock/worker/DrydockRepositoryOperationUpdateWorker.php', 888 888 + 'DrydockRepositoryOperationViewController' => 'applications/drydock/controller/DrydockRepositoryOperationViewController.php', 881 889 'DrydockResource' => 'applications/drydock/storage/DrydockResource.php', 882 890 'DrydockResourceActivationFailureLogType' => 'applications/drydock/logtype/DrydockResourceActivationFailureLogType.php', 883 891 'DrydockResourceActivationYieldLogType' => 'applications/drydock/logtype/DrydockResourceActivationYieldLogType.php', ··· 4205 4213 'DifferentialRevisionListController' => 'DifferentialController', 4206 4214 'DifferentialRevisionListView' => 'AphrontView', 4207 4215 'DifferentialRevisionMailReceiver' => 'PhabricatorObjectMailReceiver', 4216 4216 + 'DifferentialRevisionOperationController' => 'DifferentialController', 4208 4217 'DifferentialRevisionPHIDType' => 'PhabricatorPHIDType', 4209 4218 'DifferentialRevisionPackageHeraldField' => 'DifferentialRevisionHeraldField', 4210 4219 'DifferentialRevisionPackageOwnerHeraldField' => 'DifferentialRevisionHeraldField', ··· 4605 4614 'DrydockDefaultViewCapability' => 'PhabricatorPolicyCapability', 4606 4615 'DrydockFilesystemInterface' => 'DrydockInterface', 4607 4616 'DrydockInterface' => 'Phobject', 4617 4617 + 'DrydockLandRepositoryOperation' => 'DrydockRepositoryOperationType', 4608 4618 'DrydockLease' => array( 4609 4619 'DrydockDAO', 4610 4620 'PhabricatorPolicyInterface', ··· 4650 4660 'DrydockManagementWorkflow' => 'PhabricatorManagementWorkflow', 4651 4661 'DrydockObjectAuthorizationView' => 'AphrontView', 4652 4662 'DrydockQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', 4663 4663 + 'DrydockRepositoryOperation' => array( 4664 4664 + 'DrydockDAO', 4665 4665 + 'PhabricatorPolicyInterface', 4666 4666 + ), 4667 4667 + 'DrydockRepositoryOperationPHIDType' => 'PhabricatorPHIDType', 4668 4668 + 'DrydockRepositoryOperationQuery' => 'DrydockQuery', 4669 4669 + 'DrydockRepositoryOperationType' => 'Phobject', 4670 4670 + 'DrydockRepositoryOperationUpdateWorker' => 'DrydockWorker', 4671 4671 + 'DrydockRepositoryOperationViewController' => 'DrydockController', 4653 4672 'DrydockResource' => array( 4654 4673 'DrydockDAO', 4655 4674 'PhabricatorPolicyInterface',

+2

src/applications/differential/application/PhabricatorDifferentialApplication.php

reviewed

··· 75 75 => 'DifferentialRevisionCloseDetailsController', 76 76 'update/(?P<revisionID>[1-9]\d*)/' 77 77 => 'DifferentialDiffCreateController', 78 78 + 'operation/(?P<id>[1-9]\d*)/' 79 79 + => 'DifferentialRevisionOperationController', 78 80 ), 79 81 'comment/' => array( 80 82 'preview/(?P<id>[1-9]\d*)/' => 'DifferentialCommentPreviewController',

+105

src/applications/differential/controller/DifferentialRevisionOperationController.php

reviewed

··· 1 1 + <?php 2 2 + 3 3 + final class DifferentialRevisionOperationController 4 4 + extends DifferentialController { 5 5 + 6 6 + public function handleRequest(AphrontRequest $request) { 7 7 + $viewer = $this->getViewer(); 8 8 + $id = $request->getURIData('id'); 9 9 + 10 10 + $revision = id(new DifferentialRevisionQuery()) 11 11 + ->withIDs(array($id)) 12 12 + ->setViewer($viewer) 13 13 + ->executeOne(); 14 14 + if (!$revision) { 15 15 + return new Aphront404Response(); 16 16 + } 17 17 + 18 18 + $detail_uri = "/D{$id}"; 19 19 + 20 20 + $repository = $revision->getRepository(); 21 21 + if (!$repository) { 22 22 + return $this->rejectOperation( 23 23 + $revision, 24 24 + pht('No Repository'), 25 25 + pht( 26 26 + 'This revision is not associated with a known repository. Only '. 27 27 + 'revisions associated with a tracked repository can be landed '. 28 28 + 'automatically.')); 29 29 + } 30 30 + 31 31 + if (!$repository->canPerformAutomation()) { 32 32 + return $this->rejectOperation( 33 33 + $revision, 34 34 + pht('No Repository Automation'), 35 35 + pht( 36 36 + 'The repository this revision is associated with ("%s") is not '. 37 37 + 'configured to support automation. Configure automation for the '. 38 38 + 'repository to enable revisions to be landed automatically.', 39 39 + $repository->getMonogram())); 40 40 + } 41 41 + 42 42 + // TODO: At some point we should allow installs to give "land reviewed 43 43 + // code" permission to more users than "push any commit", because it is 44 44 + // a much less powerful operation. For now, just require push so this 45 45 + // doesn't do anything users can't do on their own. 46 46 + $can_push = PhabricatorPolicyFilter::hasCapability( 47 47 + $viewer, 48 48 + $repository, 49 49 + DiffusionPushCapability::CAPABILITY); 50 50 + if (!$can_push) { 51 51 + return $this->rejectOperation( 52 52 + $revision, 53 53 + pht('Unable to Push'), 54 54 + pht( 55 55 + 'You do not have permission to push to the repository this '. 56 56 + 'revision is associated with ("%s"), so you can not land it.', 57 57 + $repository->getMonogram())); 58 58 + } 59 59 + 60 60 + if ($request->isFormPost()) { 61 61 + $op = new DrydockLandRepositoryOperation(); 62 62 + 63 63 + $operation = DrydockRepositoryOperation::initializeNewOperation($op) 64 64 + ->setAuthorPHID($viewer->getPHID()) 65 65 + ->setObjectPHID($revision->getPHID()) 66 66 + ->setRepositoryPHID($repository->getPHID()) 67 67 + ->setRepositoryTarget('branch:master'); 68 68 + 69 69 + $operation->save(); 70 70 + $operation->scheduleUpdate(); 71 71 + 72 72 + return id(new AphrontRedirectResponse()) 73 73 + ->setURI($detail_uri); 74 74 + } 75 75 + 76 76 + return $this->newDialog() 77 77 + ->setTitle(pht('Land Revision')) 78 78 + ->appendParagraph( 79 79 + pht( 80 80 + 'In theory, this will do approximately what `arc land` would do. '. 81 81 + 'In practice, that is almost certainly not what it will actually '. 82 82 + 'do.')) 83 83 + ->appendParagraph( 84 84 + pht( 85 85 + 'THIS FEATURE IS EXPERIMENTAL AND DANGEROUS! USE IT AT YOUR '. 86 86 + 'OWN RISK!')) 87 87 + ->addCancelButton($detail_uri) 88 88 + ->addSubmitButton(pht('Mutate Repository Unpredictably')); 89 89 + } 90 90 + 91 91 + private function rejectOperation( 92 92 + DifferentialRevision $revision, 93 93 + $title, 94 94 + $body) { 95 95 + 96 96 + $id = $revision->getID(); 97 97 + $detail_uri = "/D{$id}"; 98 98 + 99 99 + return $this->newDialog() 100 100 + ->setTitle($title) 101 101 + ->appendParagraph($body) 102 102 + ->addCancelButton($detail_uri); 103 103 + } 104 104 + 105 105 + }

+54

src/applications/differential/controller/DifferentialRevisionViewController.php

reviewed

··· 463 463 464 464 $object_id = 'D'.$revision->getID(); 465 465 466 466 + $operations_box = $this->buildOperationsBox($revision); 467 467 + 466 468 $content = array( 469 469 + $operations_box, 467 470 $revision_detail_box, 468 471 $diff_detail_box, 469 472 $page_pane, ··· 1030 1033 } 1031 1034 1032 1035 return $view; 1036 1036 + } 1037 1037 + 1038 1038 + private function buildOperationsBox(DifferentialRevision $revision) { 1039 1039 + $viewer = $this->getViewer(); 1040 1040 + 1041 1041 + // Save a query if we can't possibly have pending operations. 1042 1042 + $repository = $revision->getRepository(); 1043 1043 + if (!$repository || !$repository->canPerformAutomation()) { 1044 1044 + return null; 1045 1045 + } 1046 1046 + 1047 1047 + $operations = id(new DrydockRepositoryOperationQuery()) 1048 1048 + ->setViewer($viewer) 1049 1049 + ->withObjectPHIDs(array($revision->getPHID())) 1050 1050 + ->withOperationStates( 1051 1051 + array( 1052 1052 + DrydockRepositoryOperation::STATE_WAIT, 1053 1053 + DrydockRepositoryOperation::STATE_WORK, 1054 1054 + DrydockRepositoryOperation::STATE_FAIL, 1055 1055 + )) 1056 1056 + ->execute(); 1057 1057 + if (!$operations) { 1058 1058 + return null; 1059 1059 + } 1060 1060 + 1061 1061 + $operation = head(msort($operations, 'getID')); 1062 1062 + 1063 1063 + // TODO: This is completely made up for now, give it useful information and 1064 1064 + // a sweet progress bar. 1065 1065 + 1066 1066 + switch ($operation->getOperationState()) { 1067 1067 + case DrydockRepositoryOperation::STATE_WAIT: 1068 1068 + case DrydockRepositoryOperation::STATE_WORK: 1069 1069 + $severity = PHUIInfoView::SEVERITY_NOTICE; 1070 1070 + $text = pht( 1071 1071 + 'Some sort of repository operation is currently running.'); 1072 1072 + break; 1073 1073 + default: 1074 1074 + $severity = PHUIInfoView::SEVERITY_ERROR; 1075 1075 + $text = pht( 1076 1076 + 'Some sort of repository operation failed.'); 1077 1077 + break; 1078 1078 + } 1079 1079 + 1080 1080 + $info_view = id(new PHUIInfoView()) 1081 1081 + ->setSeverity($severity) 1082 1082 + ->appendChild($text); 1083 1083 + 1084 1084 + return id(new PHUIObjectBoxView()) 1085 1085 + ->setHeaderText(pht('Active Operations (EXPERIMENTAL!)')) 1086 1086 + ->setInfoView($info_view); 1033 1087 } 1034 1088 1035 1089 }

+12

src/applications/differential/landing/DifferentialLandingActionMenuEventListener.php

reviewed

··· 37 37 return null; 38 38 } 39 39 40 40 + if ($repository->canPerformAutomation()) { 41 41 + $revision_id = $revision->getID(); 42 42 + 43 43 + $action = id(new PhabricatorActionView()) 44 44 + ->setWorkflow(true) 45 45 + ->setName(pht('Land Revision')) 46 46 + ->setIcon('fa-fighter-jet') 47 47 + ->setHref("/differential/revision/operation/{$revision_id}/"); 48 48 + 49 49 + $this->addActionMenuItems($event, $action); 50 50 + } 51 51 + 40 52 $strategies = id(new PhutilClassMapQuery()) 41 53 ->setAncestorClass('DifferentialLandingStrategy') 42 54 ->execute();

+5

src/applications/drydock/application/PhabricatorDrydockApplication.php

reviewed

··· 90 90 'DrydockAuthorizationAuthorizeController', 91 91 ), 92 92 ), 93 93 + '(?P<type>operation)/' => array( 94 94 + '(?P<id>[1-9]\d*)/' => array( 95 95 + '' => 'DrydockRepositoryOperationViewController', 96 96 + ), 97 97 + ), 93 98 ), 94 99 ); 95 100 }

+92

src/applications/drydock/controller/DrydockRepositoryOperationViewController.php

reviewed

··· 1 1 + <?php 2 2 + 3 3 + final class DrydockRepositoryOperationViewController 4 4 + extends DrydockController { 5 5 + 6 6 + public function handleRequest(AphrontRequest $request) { 7 7 + $viewer = $request->getViewer(); 8 8 + $id = $request->getURIData('id'); 9 9 + 10 10 + $operation = id(new DrydockRepositoryOperationQuery()) 11 11 + ->setViewer($viewer) 12 12 + ->withIDs(array($id)) 13 13 + ->executeOne(); 14 14 + if (!$operation) { 15 15 + return new Aphront404Response(); 16 16 + } 17 17 + 18 18 + $id = $operation->getID(); 19 19 + $title = pht('Repository Operation %d', $id); 20 20 + 21 21 + $header = id(new PHUIHeaderView()) 22 22 + ->setHeader($title) 23 23 + ->setUser($viewer) 24 24 + ->setPolicyObject($operation); 25 25 + 26 26 + $state = $operation->getOperationState(); 27 27 + $icon = DrydockRepositoryOperation::getOperationStateIcon($state); 28 28 + $name = DrydockRepositoryOperation::getOperationStateName($state); 29 29 + $header->setStatus($icon, null, $name); 30 30 + 31 31 + $actions = $this->buildActionListView($operation); 32 32 + $properties = $this->buildPropertyListView($operation); 33 33 + $properties->setActionList($actions); 34 34 + 35 35 + $crumbs = $this->buildApplicationCrumbs(); 36 36 + $crumbs->addTextCrumb($title); 37 37 + 38 38 + $object_box = id(new PHUIObjectBoxView()) 39 39 + ->setHeader($header) 40 40 + ->addPropertyList($properties); 41 41 + 42 42 + return $this->buildApplicationPage( 43 43 + array( 44 44 + $crumbs, 45 45 + $object_box, 46 46 + ), 47 47 + array( 48 48 + 'title' => $title, 49 49 + )); 50 50 + 51 51 + } 52 52 + 53 53 + private function buildActionListView(DrydockRepositoryOperation $operation) { 54 54 + $viewer = $this->getViewer(); 55 55 + $id = $operation->getID(); 56 56 + 57 57 + $view = id(new PhabricatorActionListView()) 58 58 + ->setUser($viewer) 59 59 + ->setObjectURI($this->getRequest()->getRequestURI()) 60 60 + ->setObject($operation); 61 61 + 62 62 + return $view; 63 63 + } 64 64 + 65 65 + private function buildPropertyListView( 66 66 + DrydockRepositoryOperation $operation) { 67 67 + 68 68 + $viewer = $this->getViewer(); 69 69 + 70 70 + $view = new PHUIPropertyListView(); 71 71 + $view->addProperty( 72 72 + pht('Repository'), 73 73 + $viewer->renderHandle($operation->getRepositoryPHID())); 74 74 + 75 75 + $view->addProperty( 76 76 + pht('Object'), 77 77 + $viewer->renderHandle($operation->getObjectPHID())); 78 78 + 79 79 + return $view; 80 80 + } 81 81 + 82 82 + public function buildSideNavView() { 83 83 + // TODO: Get rid of this, but it's currently required by DrydockController. 84 84 + return null; 85 85 + } 86 86 + 87 87 + public function buildApplicationMenu() { 88 88 + // TODO: As above. 89 89 + return null; 90 90 + } 91 91 + 92 92 + }

+8

src/applications/drydock/operation/DrydockLandRepositoryOperation.php

reviewed

··· 1 1 + <?php 2 2 + 3 3 + final class DrydockLandRepositoryOperation 4 4 + extends DrydockRepositoryOperationType { 5 5 + 6 6 + const OPCONST = 'land'; 7 7 + 8 8 + }

+16

src/applications/drydock/operation/DrydockRepositoryOperationType.php

reviewed

··· 1 1 + <?php 2 2 + 3 3 + abstract class DrydockRepositoryOperationType extends Phobject { 4 4 + 5 5 + final public function getOperationConstant() { 6 6 + return $this->getPhobjectClassConstant('OPCONST', 32); 7 7 + } 8 8 + 9 9 + final public static function getAllOperationTypes() { 10 10 + return id(new PhutilClassMapQuery()) 11 11 + ->setAncestorClass(__CLASS__) 12 12 + ->setUniqueMethod('getOperationConstant') 13 13 + ->execute(); 14 14 + } 15 15 + 16 16 + }

+37

src/applications/drydock/phid/DrydockRepositoryOperationPHIDType.php

reviewed

··· 1 1 + <?php 2 2 + 3 3 + final class DrydockRepositoryOperationPHIDType extends PhabricatorPHIDType { 4 4 + 5 5 + const TYPECONST = 'DRYO'; 6 6 + 7 7 + public function getTypeName() { 8 8 + return pht('Drydock Repository Operation'); 9 9 + } 10 10 + 11 11 + public function newObject() { 12 12 + return new DrydockRepositoryOperation(); 13 13 + } 14 14 + 15 15 + protected function buildQueryForObjects( 16 16 + PhabricatorObjectQuery $query, 17 17 + array $phids) { 18 18 + 19 19 + return id(new DrydockRepositoryOperationQuery()) 20 20 + ->withPHIDs($phids); 21 21 + } 22 22 + 23 23 + public function loadHandles( 24 24 + PhabricatorHandleQuery $query, 25 25 + array $handles, 26 26 + array $objects) { 27 27 + 28 28 + foreach ($handles as $phid => $handle) { 29 29 + $operation = $objects[$phid]; 30 30 + $id = $operation->getID(); 31 31 + 32 32 + $handle->setName(pht('Drydock Repository Operation %d', $id)); 33 33 + $handle->setURI("/drydock/operation/{$id}/"); 34 34 + } 35 35 + } 36 36 + 37 37 + }

+132

src/applications/drydock/query/DrydockRepositoryOperationQuery.php

reviewed

··· 1 1 + <?php 2 2 + 3 3 + final class DrydockRepositoryOperationQuery extends DrydockQuery { 4 4 + 5 5 + private $ids; 6 6 + private $phids; 7 7 + private $objectPHIDs; 8 8 + private $repositoryPHIDs; 9 9 + private $operationStates; 10 10 + 11 11 + public function withIDs(array $ids) { 12 12 + $this->ids = $ids; 13 13 + return $this; 14 14 + } 15 15 + 16 16 + public function withPHIDs(array $phids) { 17 17 + $this->phids = $phids; 18 18 + return $this; 19 19 + } 20 20 + 21 21 + public function withObjectPHIDs(array $object_phids) { 22 22 + $this->objectPHIDs = $object_phids; 23 23 + return $this; 24 24 + } 25 25 + 26 26 + public function withRepositoryPHIDs(array $repository_phids) { 27 27 + $this->repositoryPHIDs = $repository_phids; 28 28 + return $this; 29 29 + } 30 30 + 31 31 + public function withOperationStates(array $states) { 32 32 + $this->operationStates = $states; 33 33 + return $this; 34 34 + } 35 35 + 36 36 + public function newResultObject() { 37 37 + return new DrydockRepositoryOperation(); 38 38 + } 39 39 + 40 40 + protected function loadPage() { 41 41 + return $this->loadStandardPage($this->newResultObject()); 42 42 + } 43 43 + 44 44 + protected function willFilterPage(array $operations) { 45 45 + $repository_phids = mpull($operations, 'getRepositoryPHID'); 46 46 + if ($repository_phids) { 47 47 + $repositories = id(new PhabricatorRepositoryQuery()) 48 48 + ->setViewer($this->getViewer()) 49 49 + ->setParentQuery($this) 50 50 + ->withPHIDs($repository_phids) 51 51 + ->execute(); 52 52 + $repositories = mpull($repositories, null, 'getPHID'); 53 53 + } else { 54 54 + $repositories = array(); 55 55 + } 56 56 + 57 57 + foreach ($operations as $key => $operation) { 58 58 + $repository = idx($repositories, $operation->getRepositoryPHID()); 59 59 + if (!$repository) { 60 60 + $this->didRejectResult($operation); 61 61 + unset($operations[$key]); 62 62 + continue; 63 63 + } 64 64 + $operation->attachRepository($repository); 65 65 + } 66 66 + 67 67 + return $operations; 68 68 + } 69 69 + 70 70 + protected function didFilterPage(array $operations) { 71 71 + $object_phids = mpull($operations, 'getObjectPHID'); 72 72 + if ($object_phids) { 73 73 + $objects = id(new PhabricatorObjectQuery()) 74 74 + ->setViewer($this->getViewer()) 75 75 + ->setParentQuery($this) 76 76 + ->withPHIDs($object_phids) 77 77 + ->execute(); 78 78 + $objects = mpull($objects, 'getPHID'); 79 79 + } else { 80 80 + $objects = array(); 81 81 + } 82 82 + 83 83 + foreach ($operations as $key => $operation) { 84 84 + $object = idx($objects, $operation->getObjectPHID()); 85 85 + $operation->attachObject($object); 86 86 + } 87 87 + 88 88 + return $operations; 89 89 + } 90 90 + 91 91 + protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { 92 92 + $where = parent::buildWhereClauseParts($conn); 93 93 + 94 94 + if ($this->ids !== null) { 95 95 + $where[] = qsprintf( 96 96 + $conn, 97 97 + 'id IN (%Ld)', 98 98 + $this->ids); 99 99 + } 100 100 + 101 101 + if ($this->phids !== null) { 102 102 + $where[] = qsprintf( 103 103 + $conn, 104 104 + 'phid IN (%Ls)', 105 105 + $this->phids); 106 106 + } 107 107 + 108 108 + if ($this->objectPHIDs !== null) { 109 109 + $where[] = qsprintf( 110 110 + $conn, 111 111 + 'objectPHID IN (%Ls)', 112 112 + $this->objectPHIDs); 113 113 + } 114 114 + 115 115 + if ($this->repositoryPHIDs !== null) { 116 116 + $where[] = qsprintf( 117 117 + $conn, 118 118 + 'repositoryPHID IN (%Ls)', 119 119 + $this->repositoryPHIDs); 120 120 + } 121 121 + 122 122 + if ($this->operationStates !== null) { 123 123 + $where[] = qsprintf( 124 124 + $conn, 125 125 + 'operationState IN (%Ls)', 126 126 + $this->operationStates); 127 127 + } 128 128 + 129 129 + return $where; 130 130 + } 131 131 + 132 132 + }

+148

src/applications/drydock/storage/DrydockRepositoryOperation.php

reviewed

··· 1 1 + <?php 2 2 + 3 3 + /** 4 4 + * Represents a request to perform a repository operation like a merge or 5 5 + * cherry-pick. 6 6 + */ 7 7 + final class DrydockRepositoryOperation extends DrydockDAO 8 8 + implements 9 9 + PhabricatorPolicyInterface { 10 10 + 11 11 + const STATE_WAIT = 'wait'; 12 12 + const STATE_WORK = 'work'; 13 13 + const STATE_DONE = 'done'; 14 14 + const STATE_FAIL = 'fail'; 15 15 + 16 16 + protected $authorPHID; 17 17 + protected $objectPHID; 18 18 + protected $repositoryPHID; 19 19 + protected $repositoryTarget; 20 20 + protected $operationType; 21 21 + protected $operationState; 22 22 + protected $properties = array(); 23 23 + 24 24 + private $repository = self::ATTACHABLE; 25 25 + private $object = self::ATTACHABLE; 26 26 + 27 27 + public static function initializeNewOperation( 28 28 + DrydockRepositoryOperationType $op) { 29 29 + 30 30 + return id(new DrydockRepositoryOperation()) 31 31 + ->setOperationState(self::STATE_WAIT) 32 32 + ->setOperationType($op->getOperationConstant()); 33 33 + } 34 34 + 35 35 + protected function getConfiguration() { 36 36 + return array( 37 37 + self::CONFIG_AUX_PHID => true, 38 38 + self::CONFIG_SERIALIZATION => array( 39 39 + 'properties' => self::SERIALIZATION_JSON, 40 40 + ), 41 41 + self::CONFIG_COLUMN_SCHEMA => array( 42 42 + 'repositoryTarget' => 'bytes', 43 43 + 'operationType' => 'text32', 44 44 + 'operationState' => 'text32', 45 45 + ), 46 46 + self::CONFIG_KEY_SCHEMA => array( 47 47 + 'key_object' => array( 48 48 + 'columns' => array('objectPHID'), 49 49 + ), 50 50 + 'key_repository' => array( 51 51 + 'columns' => array('repositoryPHID', 'operationState'), 52 52 + ), 53 53 + ), 54 54 + ) + parent::getConfiguration(); 55 55 + } 56 56 + 57 57 + public function generatePHID() { 58 58 + return PhabricatorPHID::generateNewPHID( 59 59 + DrydockRepositoryOperationPHIDType::TYPECONST); 60 60 + } 61 61 + 62 62 + public function attachRepository(PhabricatorRepository $repository) { 63 63 + $this->repository = $repository; 64 64 + return $this; 65 65 + } 66 66 + 67 67 + public function getRepository() { 68 68 + return $this->assertAttached($this->repository); 69 69 + } 70 70 + 71 71 + public function attachObject($object) { 72 72 + $this->object = $object; 73 73 + return $this; 74 74 + } 75 75 + 76 76 + public function getObject() { 77 77 + return $this->assertAttached($this->object); 78 78 + } 79 79 + 80 80 + public function getProperty($key, $default = null) { 81 81 + return idx($this->properties, $key, $default); 82 82 + } 83 83 + 84 84 + public function setProperty($key, $value) { 85 85 + $this->properties[$key] = $value; 86 86 + return $this; 87 87 + } 88 88 + 89 89 + public static function getOperationStateIcon($state) { 90 90 + $map = array( 91 91 + self::STATE_WAIT => 'fa-clock-o', 92 92 + self::STATE_WORK => 'fa-refresh blue', 93 93 + self::STATE_DONE => 'fa-check green', 94 94 + self::STATE_FAIL => 'fa-times red', 95 95 + ); 96 96 + 97 97 + return idx($map, $state, null); 98 98 + } 99 99 + 100 100 + public static function getOperationStateName($state) { 101 101 + $map = array( 102 102 + self::STATE_WAIT => pht('Waiting'), 103 103 + self::STATE_WORK => pht('Working'), 104 104 + self::STATE_DONE => pht('Done'), 105 105 + self::STATE_FAIL => pht('Failed'), 106 106 + ); 107 107 + 108 108 + return idx($map, $state, pht('<Unknown: %s>', $state)); 109 109 + } 110 110 + 111 111 + public function scheduleUpdate() { 112 112 + PhabricatorWorker::scheduleTask( 113 113 + 'DrydockRepositoryOperationUpdateWorker', 114 114 + array( 115 115 + 'operationPHID' => $this->getPHID(), 116 116 + ), 117 117 + array( 118 118 + 'objectPHID' => $this->getPHID(), 119 119 + 'priority' => PhabricatorWorker::PRIORITY_ALERTS, 120 120 + )); 121 121 + } 122 122 + 123 123 + 124 124 + /* -( PhabricatorPolicyInterface )----------------------------------------- */ 125 125 + 126 126 + 127 127 + public function getCapabilities() { 128 128 + return array( 129 129 + PhabricatorPolicyCapability::CAN_VIEW, 130 130 + PhabricatorPolicyCapability::CAN_EDIT, 131 131 + ); 132 132 + } 133 133 + 134 134 + public function getPolicy($capability) { 135 135 + return $this->getRepository()->getPolicy($capability); 136 136 + } 137 137 + 138 138 + public function hasAutomaticCapability($capability, PhabricatorUser $viewer) { 139 139 + return $this->getRepository()->hasAutomaticCapability($capability, $viewer); 140 140 + } 141 141 + 142 142 + public function describeAutomaticCapability($capability) { 143 143 + return pht( 144 144 + 'A repository operation inherits the policies of the repository it '. 145 145 + 'affects.'); 146 146 + } 147 147 + 148 148 + }

+173

src/applications/drydock/worker/DrydockRepositoryOperationUpdateWorker.php

reviewed

··· 1 1 + <?php 2 2 + 3 3 + final class DrydockRepositoryOperationUpdateWorker 4 4 + extends DrydockWorker { 5 5 + 6 6 + protected function doWork() { 7 7 + $operation_phid = $this->getTaskDataValue('operationPHID'); 8 8 + 9 9 + $hash = PhabricatorHash::digestForIndex($operation_phid); 10 10 + $lock_key = 'drydock.operation:'.$hash; 11 11 + 12 12 + $lock = PhabricatorGlobalLock::newLock($lock_key) 13 13 + ->lock(1); 14 14 + 15 15 + try { 16 16 + $operation = $this->loadOperation($operation_phid); 17 17 + $this->handleUpdate($operation); 18 18 + } catch (Exception $ex) { 19 19 + $lock->unlock(); 20 20 + throw $ex; 21 21 + } 22 22 + 23 23 + $lock->unlock(); 24 24 + } 25 25 + 26 26 + 27 27 + private function handleUpdate(DrydockRepositoryOperation $operation) { 28 28 + $operation_state = $operation->getOperationState(); 29 29 + 30 30 + switch ($operation_state) { 31 31 + case DrydockRepositoryOperation::STATE_WAIT: 32 32 + $operation 33 33 + ->setOperationState(DrydockRepositoryOperation::STATE_WORK) 34 34 + ->save(); 35 35 + break; 36 36 + case DrydockRepositoryOperation::STATE_WORK: 37 37 + break; 38 38 + case DrydockRepositoryOperation::STATE_DONE: 39 39 + case DrydockRepositoryOperation::STATE_FAIL: 40 40 + // No more processing for these requests. 41 41 + return; 42 42 + } 43 43 + 44 44 + // TODO: We should probably check for other running operations with lower 45 45 + // IDs and the same repository target and yield to them here? That is, 46 46 + // enforce sequential evaluation of operations against the same target so 47 47 + // that if you land "A" and then land "B", we always finish "A" first. 48 48 + // For now, just let stuff happen in any order. We can't lease until 49 49 + // we know we're good to move forward because we might deadlock if we do: 50 50 + // we're waiting for another operation to complete, and that operation is 51 51 + // waiting for a lease we're holding. 52 52 + 53 53 + try { 54 54 + $lease = $this->loadWorkingCopyLease($operation); 55 55 + 56 56 + $interface = $lease->getInterface( 57 57 + DrydockCommandInterface::INTERFACE_TYPE); 58 58 + 59 59 + // No matter what happens here, destroy the lease away once we're done. 60 60 + $lease->releaseOnDestruction(true); 61 61 + 62 62 + // TODO: Some day, do useful things instead of running `git show`. 63 63 + list($stdout) = $interface->execx('git show'); 64 64 + phlog($stdout); 65 65 + } catch (PhabricatorWorkerYieldException $ex) { 66 66 + throw $ex; 67 67 + } catch (Exception $ex) { 68 68 + $operation 69 69 + ->setOperationState(DrydockRepositoryOperation::STATE_FAIL) 70 70 + ->save(); 71 71 + throw $ex; 72 72 + } 73 73 + 74 74 + $operation 75 75 + ->setOperationState(DrydockRepositoryOperation::STATE_DONE) 76 76 + ->save(); 77 77 + 78 78 + // TODO: Once we have sequencing, we could awaken the next operation 79 79 + // against this target after finishing or failing. 80 80 + } 81 81 + 82 82 + private function loadWorkingCopyLease( 83 83 + DrydockRepositoryOperation $operation) { 84 84 + $viewer = $this->getViewer(); 85 85 + 86 86 + // TODO: This is very similar to leasing in Harbormaster, maybe we can 87 87 + // share some of the logic? 88 88 + 89 89 + $lease_phid = $operation->getProperty('exec.leasePHID'); 90 90 + if ($lease_phid) { 91 91 + $lease = id(new DrydockLeaseQuery()) 92 92 + ->setViewer($viewer) 93 93 + ->withPHIDs(array($lease_phid)) 94 94 + ->executeOne(); 95 95 + if (!$lease) { 96 96 + throw new PhabricatorWorkerPermanentFailureException( 97 97 + pht( 98 98 + 'Lease "%s" could not be loaded.', 99 99 + $lease_phid)); 100 100 + } 101 101 + } else { 102 102 + $working_copy_type = id(new DrydockWorkingCopyBlueprintImplementation()) 103 103 + ->getType(); 104 104 + 105 105 + $repository = $operation->getRepository(); 106 106 + 107 107 + $allowed_phids = $repository->getAutomationBlueprintPHIDs(); 108 108 + $authorizing_phid = $repository->getPHID(); 109 109 + 110 110 + $lease = DrydockLease::initializeNewLease() 111 111 + ->setResourceType($working_copy_type) 112 112 + ->setOwnerPHID($operation->getPHID()) 113 113 + ->setAuthorizingPHID($authorizing_phid) 114 114 + ->setAllowedBlueprintPHIDs($allowed_phids); 115 115 + 116 116 + $map = $this->buildRepositoryMap($operation); 117 117 + 118 118 + $lease->setAttribute('repositories.map', $map); 119 119 + 120 120 + $task_id = $this->getCurrentWorkerTaskID(); 121 121 + if ($task_id) { 122 122 + $lease->setAwakenTaskIDs(array($task_id)); 123 123 + } 124 124 + 125 125 + $operation 126 126 + ->setProperty('exec.leasePHID', $lease->getPHID()) 127 127 + ->save(); 128 128 + 129 129 + $lease->queueForActivation(); 130 130 + } 131 131 + 132 132 + if ($lease->isActivating()) { 133 133 + throw new PhabricatorWorkerYieldException(15); 134 134 + } 135 135 + 136 136 + if (!$lease->isActive()) { 137 137 + throw new PhabricatorWorkerPermanentFailureException( 138 138 + pht( 139 139 + 'Lease "%s" never activated.', 140 140 + $lease->getPHID())); 141 141 + } 142 142 + 143 143 + return $lease; 144 144 + } 145 145 + 146 146 + private function buildRepositoryMap(DrydockRepositoryOperation $operation) { 147 147 + $repository = $operation->getRepository(); 148 148 + 149 149 + $target = $operation->getRepositoryTarget(); 150 150 + list($type, $name) = explode(':', $target, 2); 151 151 + switch ($type) { 152 152 + case 'branch': 153 153 + $spec = array( 154 154 + 'branch' => $name, 155 155 + ); 156 156 + break; 157 157 + default: 158 158 + throw new Exception( 159 159 + pht( 160 160 + 'Unknown repository operation target type "%s" (in target "%s").', 161 161 + $type, 162 162 + $target)); 163 163 + } 164 164 + 165 165 + $map = array(); 166 166 + $map[$repository->getCloneName()] = array( 167 167 + 'phid' => $repository->getPHID(), 168 168 + 'default' => true, 169 169 + ) + $spec; 170 170 + 171 171 + return $map; 172 172 + } 173 173 + }

+15

src/applications/drydock/worker/DrydockWorker.php

reviewed

··· 36 36 return $resource; 37 37 } 38 38 39 39 + protected function loadOperation($operation_phid) { 40 40 + $viewer = $this->getViewer(); 41 41 + 42 42 + $operation = id(new DrydockRepositoryOperationQuery()) 43 43 + ->setViewer($viewer) 44 44 + ->withPHIDs(array($operation_phid)) 45 45 + ->executeOne(); 46 46 + if (!$operation) { 47 47 + throw new PhabricatorWorkerPermanentFailureException( 48 48 + pht('No such operation "%s"!', $operation_phid)); 49 49 + } 50 50 + 51 51 + return $operation; 52 52 + } 53 53 + 39 54 protected function loadCommands($target_phid) { 40 55 $viewer = $this->getViewer(); 41 56

+11

src/applications/repository/storage/PhabricatorRepository.php

reviewed

··· 1822 1822 return $this->isGit(); 1823 1823 } 1824 1824 1825 1825 + public function canPerformAutomation() { 1826 1826 + if (!$this->supportsAutomation()) { 1827 1827 + return false; 1828 1828 + } 1829 1829 + 1830 1830 + if (!$this->getAutomationBlueprintPHIDs()) { 1831 1831 + return false; 1832 1832 + } 1833 1833 + 1834 1834 + return true; 1835 1835 + } 1825 1836 1826 1837 public function getAutomationBlueprintPHIDs() { 1827 1838 if (!$this->supportsAutomation()) {