Appwrite/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite.git synced 2026-05-26 13:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix executor execution request

Browse Source
This commit is contained in:
Matej Bačo
2022-07-19 11:00:43 +00:00
parent 4766542b3a
commit faef5af96c
3 changed files with 50 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/executor.php
+30 -3
View File
@@ -3,6 +3,7 @@
require_once __DIR__ . '/../vendor/autoload.php';
use Appwrite\Runtimes\Runtimes;
use Executor\Executor;
use Swoole\ConnectionPool;
use Swoole\Http\Request as SwooleRequest;
use Swoole\Http\Response as SwooleResponse;
@@ -451,18 +452,42 @@ App::delete('/v1/runtimes/:runtimeId')
App::post('/v1/execution')
->desc('Create an execution')
// execution-related
->param('runtimeId', '', new Text(64), 'The runtimeID to execute.')
->param('vars', [], new Assoc(), 'Environment variables required for the build.')
->param('vars', [], new Assoc(), 'Environment variables required for the build.') // TODO: Possibly introduce build-vars and execution-vars in future
->param('data', '', new Text(8192), 'Data to be forwarded to the function, this is user specified.', true)
->param('timeout', 15, new Range(1, (int) App::getEnv('_APP_FUNCTIONS_TIMEOUT', 900)), 'Function maximum execution time in seconds.')
// runtime-related
->param('projectId', '', new Text(64), 'The project ID of function.')
->param('deploymentId', '', new Text(64), 'The deployment ID of function.')
->param('source', '', new Text(0), 'Path to source files.')
->param('destination', '', new Text(0), 'Destination folder to store build files into.', true)
->param('commands', [], new ArrayList(new Text(1024), 100), 'Commands required to build the container. Maximum of 100 commands are allowed, each 1024 characters long.')
->param('runtime', '', new Text(128), 'Runtime for the cloud function.')
->param('baseImage', '', new Text(128), 'Base image name of the runtime.')
->param('entrypoint', '', new Text(256), 'Entrypoint of the code file.', true)
->inject('activeRuntimes')
->inject('response')
->action(
function (string $runtimeId, array $vars, string $data, $timeout, $activeRuntimes, Response $response) {
function (string $runtimeId, array $vars, string $data, $timeout, string $projectId, string $deploymentId, string $source, string $destination, array $commands, string $runtime, string $baseImage, string $entrypoint, $activeRuntimes, Response $response) {
// Prepare runtime
if (!$activeRuntimes->exists($runtimeId)) {
throw new Exception('Runtime not found. Please create the runtime.', 404);
// TODO: Try multiple times?
$executor = new Executor('http://localhost:3000/v1');
$response = $executor->createRuntime(
deploymentId: $deploymentId,
projectId: $projectId,
source: $source,
runtime: $runtime,
baseImage: $baseImage,
vars: $vars,
entrypoint: $entrypoint,
commands: []
);
\var_dump($response);
}
// Ensure runtime started
for ($i = 0; $i < 5; $i++) {
if ($activeRuntimes->get($runtimeId)['status'] === 'pending') {
Console::info('Waiting for runtime to be ready...');
@@ -524,6 +549,8 @@ App::post('/v1/execution')
\curl_close($ch);
// TODO: Re-run in case of 406
switch (true) {
/** No Error. */
case $errNo === 0:
app/functionsProxy.php
+4
View File
@@ -95,6 +95,10 @@ function fetchExecutorsState(RedisPool $redisPool, bool $forceShowError = false)
\curl_close($ch);
\var_dump($executorResponse);
\var_dump($statusCode);
\var_dump($error);
if ($statusCode === 200) {
markOnline($cache, $id, $forceShowError);
} else {
src/Executor/Executor.php
+16 -38
View File
@@ -156,10 +156,21 @@ class Executor
'x-appwrite-executor-key' => App::getEnv('_APP_FUNCTIONS_PROXY_SECRET', '')
];
$params = [
// execution-related
'runtimeId' => "$projectId-$deploymentId",
'vars' => $vars,
'data' => $data,
'timeout' => $timeout,
// runtime-related
'deploymentId' => $deploymentId,
'projectId' => $projectId,
'source' => $path,
'runtime' => $runtime,
'baseImage' => $baseImage,
'vars' => $vars,
'entrypoint' => $entrypoint,
'commands' => []
];
/* Add 2 seconds as a buffer to the actual timeout value since there can be a slight variance*/
@@ -168,44 +179,11 @@ class Executor
$response = $this->call(self::METHOD_POST, $route, $headers, $params, true, $requestTimeout);
$status = $response['headers']['status-code'];
for ($attempts = 0; $attempts < 10; $attempts++) {
try {
switch (true) {
case $status < 400:
return $response['body'];
case $status === 404:
$response = $this->createRuntime(
deploymentId: $deploymentId,
projectId: $projectId,
source: $path,
runtime: $runtime,
baseImage: $baseImage,
vars: $vars,
entrypoint: $entrypoint,
commands: []
);
$response = $this->call(self::METHOD_POST, $route, $headers, $params, true, $requestTimeout);
$status = $response['headers']['status-code'];
if ($status < 400) {
return $response['body'];
}
break;
case $status === 406:
$response = $this->call(self::METHOD_POST, $route, $headers, $params, true, $requestTimeout);
$status = $response['headers']['status-code'];
if ($status < 400) {
return $response['body'];
}
break;
default:
throw new \Exception($response['body']['message'], $status);
}
} catch (\Exception $e) {
throw new \Exception($e->getMessage(), $e->getCode());
}
sleep(2);
switch (true) {
case $status < 400:
return $response['body'];
default:
throw new \Exception($response['body']['message'], $status);
}
throw new Exception($response['body']['message'], 503);