+1

conf/default.conf.php

reviewed

··· 1126 1126 'gcdaemon.ttl.daemon-logs' => 7 * (24 * 60 * 60), 1127 1127 'gcdaemon.ttl.differential-parse-cache' => 14 * (24 * 60 * 60), 1128 1128 'gcdaemon.ttl.markup-cache' => 30 * (24 * 60 * 60), 1129 1129 + 'gcdaemon.ttl.task-archive' => 14 * (24 * 60 * 60), 1129 1130 1130 1131 1131 1132 // -- Feed ------------------------------------------------------------------ //

+13

resources/sql/patches/daemontaskarchive.sql

reviewed

··· 1 1 + CREATE TABLE {$NAMESPACE}_worker.worker_archivetask ( 2 2 + id INT UNSIGNED PRIMARY KEY, 3 3 + taskClass VARCHAR(255) NOT NULL COLLATE utf8_bin, 4 4 + leaseOwner VARCHAR(255) COLLATE utf8_bin, 5 5 + leaseExpires INT UNSIGNED, 6 6 + failureCount INT UNSIGNED NOT NULL, 7 7 + dataID INT UNSIGNED NOT NULL, 8 8 + result INT UNSIGNED NOT NULL, 9 9 + duration BIGINT UNSIGNED NOT NULL, 10 10 + dateCreated INT UNSIGNED NOT NULL, 11 11 + dateModified INT UNSIGNED NOT NULL, 12 12 + key(dateCreated) 13 13 + ) ENGINE=InnoDB, COLLATE utf8_general_ci;

+3 -4

scripts/mail/create_worker_tasks.php

reviewed

··· 33 33 34 34 foreach ($messages as $message) { 35 35 if (!$message->getWorkerTaskID()) { 36 36 - $mailer_task = new PhabricatorWorkerTask(); 37 37 - $mailer_task->setTaskClass('PhabricatorMetaMTAWorker'); 38 38 - $mailer_task->setData($message->getID()); 39 39 - $mailer_task->save(); 36 36 + $mailer_task = PhabricatorWorker::scheduleTask( 37 37 + 'PhabricatorMetaMTAWorker', 38 38 + $message->getID()); 40 39 41 40 $message->setWorkerTaskID($mailer_task->getID()); 42 41 $message->save();

+1 -4

scripts/repository/reparse.php

reviewed

··· 224 224 225 225 if ($all_from_repo && !$force_local) { 226 226 foreach ($classes as $class) { 227 227 - $task = new PhabricatorWorkerTask(); 228 228 - $task->setTaskClass($class); 229 229 - $task->setData($spec); 230 230 - $task->save(); 227 227 + PhabricatorWorker::scheduleTask($class, $spec); 231 228 232 229 $commit_name = 'r'.$callsign.$commit->getCommitIdentifier(); 233 230 echo " Queued '{$class}' for commit '{$commit_name}'.\n";

+4

src/__phutil_library_map__.php

reviewed

··· 1140 1140 'PhabricatorUserStatusOverlapException' => 'applications/people/exception/PhabricatorUserStatusOverlapException.php', 1141 1141 'PhabricatorUserTestCase' => 'applications/people/storage/__tests__/PhabricatorUserTestCase.php', 1142 1142 'PhabricatorWorker' => 'infrastructure/daemon/workers/PhabricatorWorker.php', 1143 1143 + 'PhabricatorWorkerActiveTask' => 'infrastructure/daemon/workers/storage/PhabricatorWorkerActiveTask.php', 1144 1144 + 'PhabricatorWorkerArchiveTask' => 'infrastructure/daemon/workers/storage/PhabricatorWorkerArchiveTask.php', 1143 1145 'PhabricatorWorkerDAO' => 'infrastructure/daemon/workers/storage/PhabricatorWorkerDAO.php', 1144 1146 'PhabricatorWorkerTask' => 'infrastructure/daemon/workers/storage/PhabricatorWorkerTask.php', 1145 1147 'PhabricatorWorkerTaskData' => 'infrastructure/daemon/workers/storage/PhabricatorWorkerTaskData.php', ··· 2300 2302 'PhabricatorUserStatusInvalidEpochException' => 'Exception', 2301 2303 'PhabricatorUserStatusOverlapException' => 'Exception', 2302 2304 'PhabricatorUserTestCase' => 'PhabricatorTestCase', 2305 2305 + 'PhabricatorWorkerActiveTask' => 'PhabricatorWorkerTask', 2306 2306 + 'PhabricatorWorkerArchiveTask' => 'PhabricatorWorkerTask', 2303 2307 'PhabricatorWorkerDAO' => 'PhabricatorLiskDAO', 2304 2308 'PhabricatorWorkerTask' => 'PhabricatorWorkerDAO', 2305 2309 'PhabricatorWorkerTaskData' => 'PhabricatorWorkerDAO',

+2 -2

src/applications/daemon/controller/PhabricatorDaemonConsoleController.php

reviewed

··· 34 34 $daemon_panel->setHeader('Recently Launched Daemons'); 35 35 $daemon_panel->appendChild($daemon_table); 36 36 37 37 - $tasks = id(new PhabricatorWorkerTask())->loadAllWhere( 37 37 + $tasks = id(new PhabricatorWorkerActiveTask())->loadAllWhere( 38 38 'leaseOwner IS NOT NULL'); 39 39 40 40 $rows = array(); ··· 80 80 $leased_panel->setHeader('Leased Tasks'); 81 81 $leased_panel->appendChild($leased_table); 82 82 83 83 - $task_table = new PhabricatorWorkerTask(); 83 83 + $task_table = new PhabricatorWorkerActiveTask(); 84 84 $queued = queryfx_all( 85 85 $task_table->establishConnection('r'), 86 86 'SELECT taskClass, count(*) N FROM %T GROUP BY taskClass

+1 -1

src/applications/daemon/controller/PhabricatorWorkerTaskDetailController.php

reviewed

··· 29 29 $request = $this->getRequest(); 30 30 $user = $request->getUser(); 31 31 32 32 - $task = id(new PhabricatorWorkerTask())->load($this->id); 32 32 + $task = id(new PhabricatorWorkerActiveTask())->load($this->id); 33 33 if (!$task) { 34 34 $error_view = new AphrontErrorView(); 35 35 $error_view->setTitle('No Such Task');

+1 -1

src/applications/daemon/controller/PhabricatorWorkerTaskUpdateController.php

reviewed

··· 31 31 $request = $this->getRequest(); 32 32 $user = $request->getUser(); 33 33 34 34 - $task = id(new PhabricatorWorkerTask())->load($this->id); 34 34 + $task = id(new PhabricatorWorkerActiveTask())->load($this->id); 35 35 if (!$task) { 36 36 return new Aphront404Response(); 37 37 }

+1 -4

src/applications/drydock/allocator/DrydockAllocator.php

reviewed

··· 59 59 $worker = new DrydockAllocatorWorker($data); 60 60 $worker->executeTask(); 61 61 } else { 62 62 - $task = new PhabricatorWorkerTask(); 63 63 - $task->setTaskClass('DrydockAllocatorWorker'); 64 64 - $task->setData($data); 65 65 - $task->save(); 62 62 + PhabricatorWorker::scheduleTask('DrydockAllocatorWorker', $data); 66 63 } 67 64 68 65 return $lease;

+4 -4

src/applications/metamta/storage/PhabricatorMetaMTAMail.php

reviewed

··· 298 298 parent::didWriteData(); 299 299 300 300 if (!$this->getWorkerTaskID()) { 301 301 - $mailer_task = new PhabricatorWorkerTask(); 302 302 - $mailer_task->setTaskClass('PhabricatorMetaMTAWorker'); 303 303 - $mailer_task->setData($this->getID()); 304 304 - $mailer_task->save(); 301 301 + $mailer_task = PhabricatorWorker::scheduleTask( 302 302 + 'PhabricatorMetaMTAWorker', 303 303 + $this->getID()); 304 304 + 305 305 $this->setWorkerTaskID($mailer_task->getID()); 306 306 $this->save(); 307 307 }

+1 -4

src/applications/repository/daemon/PhabricatorRepositoryPullLocalDaemon.php

reviewed

··· 450 450 throw new Exception("Unknown repository type '{$vcs}'!"); 451 451 } 452 452 453 453 - $task = new PhabricatorWorkerTask(); 454 454 - $task->setTaskClass($class); 455 453 $data['commitID'] = $commit->getID(); 456 454 457 457 - $task->setData($data); 458 458 - $task->save(); 455 455 + PhabricatorWorker::scheduleTask($class, $data); 459 456 } 460 457 461 458

+2 -4

src/applications/repository/worker/PhabricatorRepositoryCommitOwnersWorker.php

reviewed

··· 73 73 } 74 74 75 75 if ($this->shouldQueueFollowupTasks()) { 76 76 - $herald_task = new PhabricatorWorkerTask(); 77 77 - $herald_task->setTaskClass('PhabricatorRepositoryCommitHeraldWorker'); 78 78 - $herald_task->setData( 76 76 + PhabricatorWorker::scheduleTask( 77 77 + 'PhabricatorRepositoryCommitHeraldWorker', 79 78 array( 80 79 'commitID' => $commit->getID(), 81 80 )); 82 82 - $herald_task->save(); 83 81 } 84 82 } 85 83

+2 -4

src/applications/repository/worker/commitchangeparser/PhabricatorRepositoryCommitChangeParserWorker.php

reviewed

··· 76 76 PhabricatorSearchCommitIndexer::indexCommit($commit); 77 77 78 78 if ($this->shouldQueueFollowupTasks()) { 79 79 - $owner_task = new PhabricatorWorkerTask(); 80 80 - $owner_task->setTaskClass('PhabricatorRepositoryCommitOwnersWorker'); 81 81 - $owner_task->setData( 79 79 + PhabricatorWorker::scheduleTask( 80 80 + 'PhabricatorRepositoryCommitOwnersWorker', 82 81 array( 83 82 'commitID' => $commit->getID(), 84 83 )); 85 85 - $owner_task->save(); 86 84 } 87 85 } 88 86

+2 -4

src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryGitCommitMessageParserWorker.php

reviewed

··· 69 69 $this->updateCommitData($author, $message, $committer); 70 70 71 71 if ($this->shouldQueueFollowupTasks()) { 72 72 - $task = new PhabricatorWorkerTask(); 73 73 - $task->setTaskClass('PhabricatorRepositoryGitCommitChangeParserWorker'); 74 74 - $task->setData( 72 72 + PhabricatorWorker::scheduleTask( 73 73 + 'PhabricatorRepositoryGitCommitChangeParserWorker', 75 74 array( 76 75 'commitID' => $commit->getID(), 77 76 )); 78 78 - $task->save(); 79 77 } 80 78 } 81 79

+2 -5

src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryMercurialCommitMessageParserWorker.php

reviewed

··· 37 37 $this->updateCommitData($author, $message); 38 38 39 39 if ($this->shouldQueueFollowupTasks()) { 40 40 - $task = new PhabricatorWorkerTask(); 41 41 - $task->setTaskClass( 42 42 - 'PhabricatorRepositoryMercurialCommitChangeParserWorker'); 43 43 - $task->setData( 40 40 + PhabricatorWorker::scheduleTask( 41 41 + 'PhabricatorRepositoryMercurialCommitChangeParserWorker', 44 42 array( 45 43 'commitID' => $commit->getID(), 46 44 )); 47 47 - $task->save(); 48 45 } 49 46 } 50 47

+2 -4

src/applications/repository/worker/commitmessageparser/PhabricatorRepositorySvnCommitMessageParserWorker.php

reviewed

··· 38 38 $this->updateCommitData($author, $message); 39 39 40 40 if ($this->shouldQueueFollowupTasks()) { 41 41 - $task = new PhabricatorWorkerTask(); 42 42 - $task->setTaskClass('PhabricatorRepositorySvnCommitChangeParserWorker'); 43 43 - $task->setData( 41 41 + PhabricatorWorker::scheduleTask( 42 42 + 'PhabricatorRepositorySvnCommitChangeParserWorker', 44 43 array( 45 44 'commitID' => $commit->getID(), 46 45 )); 47 47 - $task->save(); 48 46 } 49 47 } 50 48

+44

src/infrastructure/daemon/PhabricatorGarbageCollectorDaemon.php

reviewed

··· 64 64 $n_daemon = $this->collectDaemonLogs(); 65 65 $n_parse = $this->collectParseCaches(); 66 66 $n_markup = $this->collectMarkupCaches(); 67 67 + $n_tasks = $this->collectArchivedTasks(); 67 68 68 69 $collected = array( 69 70 'Herald Transcript' => $n_herald, 70 71 'Daemon Log' => $n_daemon, 71 72 'Differential Parse Cache' => $n_parse, 72 73 'Markup Cache' => $n_markup, 74 74 + 'Archived Tasks' => $n_tasks, 73 75 ); 74 76 $collected = array_filter($collected); 75 77 ··· 170 172 time() - $ttl); 171 173 172 174 return $conn_w->getAffectedRows(); 175 175 + } 176 176 + 177 177 + private function collectArchivedTasks() { 178 178 + $key = 'gcdaemon.ttl.task-archive'; 179 179 + $ttl = PhabricatorEnv::getEnvConfig($key); 180 180 + if ($ttl <= 0) { 181 181 + return 0; 182 182 + } 183 183 + 184 184 + $table = new PhabricatorWorkerArchiveTask(); 185 185 + $data_table = new PhabricatorWorkerTaskData(); 186 186 + $conn_w = $table->establishConnection('w'); 187 187 + 188 188 + $rows = queryfx_all( 189 189 + $conn_w, 190 190 + 'SELECT id, dataID FROM %T WHERE dateCreated < %d LIMIT 100', 191 191 + $table->getTableName(), 192 192 + time() - $ttl); 193 193 + 194 194 + if (!$rows) { 195 195 + return 0; 196 196 + } 197 197 + 198 198 + $data_ids = array_filter(ipull($rows, 'dataID')); 199 199 + $task_ids = ipull($rows, 'id'); 200 200 + 201 201 + $table->openTransaction(); 202 202 + if ($data_ids) { 203 203 + queryfx( 204 204 + $conn_w, 205 205 + 'DELETE FROM %T WHERE id IN (%Ld)', 206 206 + $data_table->getTableName(), 207 207 + $data_ids); 208 208 + } 209 209 + queryfx( 210 210 + $conn_w, 211 211 + 'DELETE FROM %T WHERE id IN (%Ld)', 212 212 + $table->getTableName(), 213 213 + $task_ids); 214 214 + $table->saveTransaction(); 215 215 + 216 216 + return count($task_ids); 173 217 } 174 218 175 219 }

+17 -10

src/infrastructure/daemon/workers/PhabricatorTaskmasterDaemon.php

reviewed

··· 21 21 public function run() { 22 22 $lease_ownership_name = $this->getLeaseOwnershipName(); 23 23 24 24 - $task_table = new PhabricatorWorkerTask(); 24 24 + $task_table = new PhabricatorWorkerActiveTask(); 25 25 $taskdata_table = new PhabricatorWorkerTaskData(); 26 26 27 27 $sleep = 0; 28 28 do { 29 29 + $this->log('Dequeuing a task...'); 30 30 + 29 31 $conn_w = $task_table->establishConnection('w'); 30 32 queryfx( 31 33 $conn_w, ··· 36 38 $rows = $conn_w->getAffectedRows(); 37 39 38 40 if (!$rows) { 41 41 + $this->log('No unleased tasks. Dequeuing an expired lease...'); 39 42 queryfx( 40 43 $conn_w, 41 44 'UPDATE %T SET leaseOwner = %s, leaseExpires = UNIX_TIMESTAMP() + 15 ··· 70 73 } 71 74 72 75 foreach ($tasks as $task) { 76 76 + $id = $task->getID(); 77 77 + $class = $task->getTaskClass(); 78 78 + 79 79 + $this->log("Working on task {$id} ({$class})..."); 80 80 + 73 81 // TODO: We should detect if we acquired a task with an expired lease 74 82 // and log about it / bump up failure count. 75 83 ··· 77 85 // failure count and fail it permanently. 78 86 79 87 $data = idx($task_data, $task->getID()); 80 80 - $class = $task->getTaskClass(); 81 88 try { 82 89 if (!class_exists($class) || 83 90 !is_subclass_of($class, 'PhabricatorWorker')) { ··· 91 98 $task->setLeaseDuration($lease); 92 99 } 93 100 101 101 + $t_start = microtime(true); 94 102 $worker->executeTask(); 103 103 + $t_end = microtime(true); 95 104 96 96 - $task->delete(); 97 97 - if ($data !== null) { 98 98 - queryfx( 99 99 - $conn_w, 100 100 - 'DELETE FROM %T WHERE id = %d', 101 101 - $taskdata_table->getTableName(), 102 102 - $task->getDataID()); 103 103 - } 105 105 + $task->archiveTask( 106 106 + PhabricatorWorkerArchiveTask::RESULT_SUCCESS, 107 107 + (int)(1000000 * ($t_end - $t_start))); 108 108 + $this->log("Task {$id} complete! Moved to archive."); 104 109 } catch (Exception $ex) { 105 110 $task->setFailureCount($task->getFailureCount() + 1); 106 111 $task->save(); 112 112 + 113 113 + $this->log("Task {$id} failed!"); 107 114 throw $ex; 108 115 } 109 116 }

+9 -1

src/infrastructure/daemon/workers/PhabricatorWorker.php

reviewed

··· 1 1 <?php 2 2 3 3 /* 4 4 - * Copyright 2011 Facebook, Inc. 4 4 + * Copyright 2012 Facebook, Inc. 5 5 * 6 6 * Licensed under the Apache License, Version 2.0 (the "License"); 7 7 * you may not use this file except in compliance with the License. ··· 37 37 } 38 38 39 39 abstract protected function doWork(); 40 40 + 41 41 + final public static function scheduleTask($task_class, $data) { 42 42 + return id(new PhabricatorWorkerActiveTask()) 43 43 + ->setTaskClass($task_class) 44 44 + ->setData($data) 45 45 + ->save(); 46 46 + } 47 47 + 40 48 }

+104

src/infrastructure/daemon/workers/storage/PhabricatorWorkerActiveTask.php

reviewed

··· 1 1 + <?php 2 2 + 3 3 + /* 4 4 + * Copyright 2012 Facebook, Inc. 5 5 + * 6 6 + * Licensed under the Apache License, Version 2.0 (the "License"); 7 7 + * you may not use this file except in compliance with the License. 8 8 + * You may obtain a copy of the License at 9 9 + * 10 10 + * http://www.apache.org/licenses/LICENSE-2.0 11 11 + * 12 12 + * Unless required by applicable law or agreed to in writing, software 13 13 + * distributed under the License is distributed on an "AS IS" BASIS, 14 14 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 15 15 + * See the License for the specific language governing permissions and 16 16 + * limitations under the License. 17 17 + */ 18 18 + 19 19 + final class PhabricatorWorkerActiveTask extends PhabricatorWorkerTask { 20 20 + 21 21 + private $serverTime; 22 22 + private $localTime; 23 23 + 24 24 + public function getTableName() { 25 25 + return 'worker_task'; 26 26 + } 27 27 + 28 28 + public function getConfiguration() { 29 29 + return array( 30 30 + self::CONFIG_TIMESTAMPS => false, 31 31 + ) + parent::getConfiguration(); 32 32 + } 33 33 + 34 34 + public function setServerTime($server_time) { 35 35 + $this->serverTime = $server_time; 36 36 + $this->localTime = time(); 37 37 + return $this; 38 38 + } 39 39 + 40 40 + public function setLeaseDuration($lease_duration) { 41 41 + $server_lease_expires = $this->serverTime + $lease_duration; 42 42 + $this->setLeaseExpires($server_lease_expires); 43 43 + return $this->save(); 44 44 + } 45 45 + 46 46 + public function save() { 47 47 + $this->checkLease(); 48 48 + 49 49 + $is_new = !$this->getID(); 50 50 + if ($is_new) { 51 51 + $this->failureCount = 0; 52 52 + } 53 53 + 54 54 + if ($is_new && $this->getData()) { 55 55 + $data = new PhabricatorWorkerTaskData(); 56 56 + $data->setData($this->getData()); 57 57 + $data->save(); 58 58 + 59 59 + $this->setDataID($data->getID()); 60 60 + } 61 61 + 62 62 + return parent::save(); 63 63 + } 64 64 + 65 65 + protected function checkLease() { 66 66 + if ($this->leaseOwner) { 67 67 + $current_server_time = $this->serverTime + (time() - $this->localTime); 68 68 + if ($current_server_time >= $this->leaseExpires) { 69 69 + throw new Exception("Trying to update task after lease expiration!"); 70 70 + } 71 71 + } 72 72 + } 73 73 + 74 74 + public function delete() { 75 75 + throw new Exception( 76 76 + "Active tasks can not be deleted directly. ". 77 77 + "Use archiveTask() to move tasks to the archive."); 78 78 + } 79 79 + 80 80 + public function archiveTask($result, $duration) { 81 81 + if (!$this->getID()) { 82 82 + throw new Exception( 83 83 + "Attempting to archive a task which hasn't been save()d!"); 84 84 + } 85 85 + 86 86 + $this->checkLease(); 87 87 + 88 88 + $archive = id(new PhabricatorWorkerArchiveTask()) 89 89 + ->setID($this->getID()) 90 90 + ->setTaskClass($this->getTaskClass()) 91 91 + ->setLeaseOwner($this->getLeaseOwner()) 92 92 + ->setLeaseExpires($this->getLeaseExpires()) 93 93 + ->setFailureCount($this->getFailureCount()) 94 94 + ->setDataID($this->getDataID()) 95 95 + ->setResult($result) 96 96 + ->setDuration($duration); 97 97 + 98 98 + // NOTE: This deletes the active task (this object)! 99 99 + $archive->save(); 100 100 + 101 101 + return $archive; 102 102 + } 103 103 + 104 104 + }

+66

src/infrastructure/daemon/workers/storage/PhabricatorWorkerArchiveTask.php

reviewed

··· 1 1 + <?php 2 2 + 3 3 + /* 4 4 + * Copyright 2012 Facebook, Inc. 5 5 + * 6 6 + * Licensed under the Apache License, Version 2.0 (the "License"); 7 7 + * you may not use this file except in compliance with the License. 8 8 + * You may obtain a copy of the License at 9 9 + * 10 10 + * http://www.apache.org/licenses/LICENSE-2.0 11 11 + * 12 12 + * Unless required by applicable law or agreed to in writing, software 13 13 + * distributed under the License is distributed on an "AS IS" BASIS, 14 14 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 15 15 + * See the License for the specific language governing permissions and 16 16 + * limitations under the License. 17 17 + */ 18 18 + 19 19 + final class PhabricatorWorkerArchiveTask extends PhabricatorWorkerTask { 20 20 + 21 21 + const RESULT_SUCCESS = 0; 22 22 + const RESULT_FAILURE = 1; 23 23 + 24 24 + protected $duration; 25 25 + protected $result; 26 26 + 27 27 + public function save() { 28 28 + if (!$this->getID()) { 29 29 + throw new Exception( 30 30 + "Trying to archive a task with no ID."); 31 31 + } 32 32 + 33 33 + $other = new PhabricatorWorkerActiveTask(); 34 34 + $conn_w = $this->establishConnection('w'); 35 35 + 36 36 + $this->openTransaction(); 37 37 + queryfx( 38 38 + $conn_w, 39 39 + 'DELETE FROM %T WHERE id = %d', 40 40 + $other->getTableName(), 41 41 + $this->getID()); 42 42 + $result = parent::insert(); 43 43 + $this->saveTransaction(); 44 44 + 45 45 + return $result; 46 46 + } 47 47 + 48 48 + public function delete() { 49 49 + $this->openTransaction(); 50 50 + if ($this->getDataID()) { 51 51 + $conn_w = $this->establishConnection('w'); 52 52 + $data_table = new PhabricatorWorkerTaskData(); 53 53 + 54 54 + queryfx( 55 55 + $conn_w, 56 56 + 'DELETE FROM %T WHERE id = %d', 57 57 + $data_table->getTableName(), 58 58 + $this->getDataID()); 59 59 + } 60 60 + 61 61 + $result = parent::delete(); 62 62 + $this->saveTransaction(); 63 63 + return $result; 64 64 + } 65 65 + 66 66 + }

+3 -1

src/infrastructure/daemon/workers/storage/PhabricatorWorkerDAO.php

reviewed

··· 1 1 <?php 2 2 3 3 /* 4 4 - * Copyright 2011 Facebook, Inc. 4 4 + * Copyright 2012 Facebook, Inc. 5 5 * 6 6 * Licensed under the Apache License, Version 2.0 (the "License"); 7 7 * you may not use this file except in compliance with the License. ··· 17 17 */ 18 18 19 19 abstract class PhabricatorWorkerDAO extends PhabricatorLiskDAO { 20 20 + 20 21 public function getApplicationName() { 21 22 return 'worker'; 22 23 } 24 24 + 23 25 }

+3 -45

src/infrastructure/daemon/workers/storage/PhabricatorWorkerTask.php

reviewed

··· 16 16 * limitations under the License. 17 17 */ 18 18 19 19 - final class PhabricatorWorkerTask extends PhabricatorWorkerDAO { 19 19 + abstract class PhabricatorWorkerTask extends PhabricatorWorkerDAO { 20 20 21 21 + // NOTE: If you provide additional fields here, make sure they are handled 22 22 + // correctly in the archiving process. 21 23 protected $taskClass; 22 24 protected $leaseOwner; 23 25 protected $leaseExpires; 24 26 protected $failureCount; 25 27 protected $dataID; 26 28 27 27 - private $serverTime; 28 28 - private $localTime; 29 29 private $data; 30 30 - 31 31 - public function getConfiguration() { 32 32 - return array( 33 33 - self::CONFIG_TIMESTAMPS => false, 34 34 - ) + parent::getConfiguration(); 35 35 - } 36 36 - 37 37 - public function setServerTime($server_time) { 38 38 - $this->serverTime = $server_time; 39 39 - $this->localTime = time(); 40 40 - return $this; 41 41 - } 42 42 - 43 43 - public function setLeaseDuration($lease_duration) { 44 44 - $server_lease_expires = $this->serverTime + $lease_duration; 45 45 - $this->setLeaseExpires($server_lease_expires); 46 46 - return $this->save(); 47 47 - } 48 48 - 49 49 - public function save() { 50 50 - if ($this->leaseOwner) { 51 51 - $current_server_time = $this->serverTime + (time() - $this->localTime); 52 52 - if ($current_server_time >= $this->leaseExpires) { 53 53 - throw new Exception("Trying to update task after lease expiration!"); 54 54 - } 55 55 - } 56 56 - 57 57 - $is_new = !$this->getID(); 58 58 - if ($is_new) { 59 59 - $this->failureCount = 0; 60 60 - } 61 61 - 62 62 - if ($is_new && $this->data) { 63 63 - $data = new PhabricatorWorkerTaskData(); 64 64 - $data->setData($this->data); 65 65 - $data->save(); 66 66 - 67 67 - $this->setDataID($data->getID()); 68 68 - } 69 69 - 70 70 - return parent::save(); 71 71 - } 72 30 73 31 public function setData($data) { 74 32 $this->data = $data;

+4

src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php

reviewed

··· 1016 1016 'type' => 'sql', 1017 1017 'name' => $this->getPatchPath('statustxt.sql'), 1018 1018 ), 1019 1019 + 'daemontaskarchive.sql' => array( 1020 1020 + 'type' => 'sql', 1021 1021 + 'name' => $this->getPatchPath('daemontaskarchive.sql'), 1022 1022 + ), 1019 1023 ); 1020 1024 } 1021 1025