mirror of
https://we.phorge.it/source/phorge.git
synced 2024-12-01 11:12:42 +01:00
89b37f0357
Summary: Tightens up a bunch of stuff: - In `drydock lease`, pull and print logs so the user can see what's happening. - Remove `DrydockAllocator`, which was a dumb class that did nothing. Move the tiny amount of logic it held directly to `DrydockLease`. - Move `resourceType` from worker task metadata directly to `DrydockLease`. Other things (like the web UI) can be more informative with this information available. - Pass leases to `allocateResource()`. We always allocate in response to a lease activation request, and the lease often has vital information. This also allows us to associate logs with leases correctly. Test Plan: Ran `drydock lease --type host` and saw it perform a host allocation in EC2. Reviewers: btrahan Reviewed By: btrahan CC: aran Maniphest Tasks: T2015 Differential Revision: https://secure.phabricator.com/D3870
102 lines
2.4 KiB
PHP
102 lines
2.4 KiB
PHP
<?php
|
|
|
|
/*
|
|
* Copyright 2012 Facebook, Inc.
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
final class DrydockLogQuery extends PhabricatorOffsetPagedQuery {
|
|
|
|
const ORDER_EPOCH = 'order-epoch';
|
|
const ORDER_ID = 'order-id';
|
|
|
|
private $resourceIDs;
|
|
private $leaseIDs;
|
|
private $afterID;
|
|
private $order = self::ORDER_EPOCH;
|
|
|
|
public function withResourceIDs(array $ids) {
|
|
$this->resourceIDs = $ids;
|
|
return $this;
|
|
}
|
|
|
|
public function withLeaseIDs(array $ids) {
|
|
$this->leaseIDs = $ids;
|
|
return $this;
|
|
}
|
|
|
|
public function setOrder($order) {
|
|
$this->order = $order;
|
|
return $this;
|
|
}
|
|
|
|
public function withAfterID($id) {
|
|
$this->afterID = $id;
|
|
return $this;
|
|
}
|
|
|
|
public function execute() {
|
|
$table = new DrydockLog();
|
|
$conn_r = $table->establishConnection('r');
|
|
|
|
$data = queryfx_all(
|
|
$conn_r,
|
|
'SELECT log.* FROM %T log %Q %Q %Q',
|
|
$table->getTableName(),
|
|
$this->buildWhereClause($conn_r),
|
|
$this->buildOrderClause($conn_r),
|
|
$this->buildLimitClause($conn_r));
|
|
|
|
return $table->loadAllFromArray($data);
|
|
}
|
|
|
|
private function buildWhereClause(AphrontDatabaseConnection $conn_r) {
|
|
$where = array();
|
|
|
|
if ($this->resourceIDs) {
|
|
$where[] = qsprintf(
|
|
$conn_r,
|
|
'resourceID IN (%Ld)',
|
|
$this->resourceIDs);
|
|
}
|
|
|
|
if ($this->leaseIDs) {
|
|
$where[] = qsprintf(
|
|
$conn_r,
|
|
'leaseID IN (%Ld)',
|
|
$this->leaseIDs);
|
|
}
|
|
|
|
if ($this->afterID) {
|
|
$where[] = qsprintf(
|
|
$conn_r,
|
|
'id > %d',
|
|
$this->afterID);
|
|
}
|
|
|
|
return $this->formatWhereClause($where);
|
|
}
|
|
|
|
private function buildOrderClause(AphrontDatabaseConnection $conn_r) {
|
|
switch ($this->order) {
|
|
case self::ORDER_EPOCH:
|
|
return 'ORDER BY log.epoch DESC';
|
|
case self::ORDER_ID:
|
|
return 'ORDER BY id ASC';
|
|
default:
|
|
throw new Exception("Unknown order '{$this->order}'!");
|
|
}
|
|
}
|
|
|
|
}
|