diff --git a/composer.lock b/composer.lock index 91596d04e9..1e57ede67b 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "e922d0ba4d0c7d12cc24cff52b552803", + "content-hash": "1842adc3102a8d4af14a013751acd366", "packages": [ { "name": "adhocore/jwt", diff --git a/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php b/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php index 77ba3c89b9..fae32bf76a 100644 --- a/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php +++ b/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php @@ -249,19 +249,28 @@ class Builds extends Action if ($deployment->getAttribute('status') === 'canceled') { $resource = $this->updateLatestDeployment($dbForProject, $resource); - $this->cancelDeployment($deployment->getId(), $dbForProject, $queueForRealtime); + $this->finalizeCanceledDeployment($deployment->getId(), $dbForProject, $queueForRealtime); return; } $deploymentId = $deployment->getId(); - $deployment->setAttribute('buildStartedAt', $startTime); - $deployment->setAttribute('status', 'processing'); - $deployment = $dbForProject->updateDocument('deployments', $deployment->getId(), new Document([ + $updated = $dbForProject->updateDocuments('deployments', new Document([ 'buildStartedAt' => $startTime, 'status' => 'processing', - ])); + ]), [ + Query::equal('$id', [$deploymentId]), + Query::notEqual('status', 'canceled'), + ]); + + if ($updated === 0) { + $resource = $this->updateLatestDeployment($dbForProject, $resource); + $this->finalizeCanceledDeployment($deploymentId, $dbForProject, $queueForRealtime); + return; + } + + $deployment = $dbForProject->getDocument('deployments', $deploymentId); $resource = $this->updateLatestDeployment($dbForProject, $resource); @@ -389,7 +398,7 @@ class Builds extends Action Console::execute('mkdir -p ' . \escapeshellarg('/tmp/builds/' . $deploymentId), '', $stdout, $stderr); if ($dbForProject->getDocument('deployments', $deploymentId)->getAttribute('status') === 'canceled') { - $this->cancelDeployment($deployment->getId(), $dbForProject, $queueForRealtime); + $this->finalizeCanceledDeployment($deployment->getId(), $dbForProject, $queueForRealtime); return; } @@ -531,10 +540,19 @@ class Builds extends Action } /** Request the executor to build the code... */ - $deployment->setAttribute('status', 'building'); - $deployment = $dbForProject->updateDocument('deployments', $deployment->getId(), new Document([ + $updated = $dbForProject->updateDocuments('deployments', new Document([ 'status' => 'building', - ])); + ]), [ + Query::equal('$id', [$deploymentId]), + Query::notEqual('status', 'canceled'), + ]); + + if ($updated === 0) { + $this->finalizeCanceledDeployment($deploymentId, $dbForProject, $queueForRealtime); + return; + } + + $deployment = $dbForProject->getDocument('deployments', $deploymentId); Span::add('deployment.status', 'building'); $resource = $this->updateLatestDeployment($dbForProject, $resource); @@ -672,7 +690,7 @@ class Builds extends Action $err = null; if ($dbForProject->getDocument('deployments', $deploymentId)->getAttribute('status') === 'canceled') { - $this->cancelDeployment($deployment->getId(), $dbForProject, $queueForRealtime); + $this->finalizeCanceledDeployment($deployment->getId(), $dbForProject, $queueForRealtime); return; } @@ -827,7 +845,7 @@ class Builds extends Action $latestDeployment = $dbForProject->getDocument('deployments', $deploymentId); if ($latestDeployment->getAttribute('status') === 'canceled') { - $this->cancelDeployment($deployment->getId(), $dbForProject, $queueForRealtime); + $this->finalizeCanceledDeployment($deployment->getId(), $dbForProject, $queueForRealtime); return; } @@ -1073,7 +1091,7 @@ class Builds extends Action ->trigger(); if ($dbForProject->getDocument('deployments', $deploymentId)->getAttribute('status') === 'canceled') { - $this->cancelDeployment($deployment->getId(), $dbForProject, $queueForRealtime); + $this->finalizeCanceledDeployment($deployment->getId(), $dbForProject, $queueForRealtime); return; } @@ -1105,7 +1123,7 @@ class Builds extends Action } } catch (\Throwable $th) { if ($dbForProject->getDocument('deployments', $deploymentId)->getAttribute('status') === 'canceled') { - $this->cancelDeployment($deployment->getId(), $dbForProject, $queueForRealtime); + $this->finalizeCanceledDeployment($deployment->getId(), $dbForProject, $queueForRealtime); return; } @@ -1521,7 +1539,7 @@ class Builds extends Action ); } - private function cancelDeployment(string $deploymentId, Database $dbForProject, Realtime $queueForRealtime) + private function finalizeCanceledDeployment(string $deploymentId, Database $dbForProject, Realtime $queueForRealtime) { Span::add('deployment.status', 'canceled');