danog/parallel
1
0
Fork 0
mirror of https://github.com/danog/parallel.git synced 2025-01-22 14:01:14 +01:00
Code Issues Projects Releases Wiki Activity

Improve process communication error handling

Browse Source
This commit is contained in:
Aaron Piotrowski 2018-10-23 22:14:51 -05:00
parent 14def89bff
commit fe293c09bb
No known key found for this signature in database
GPG Key ID: ADD1EF783EDE9EEB
4 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Context/Internal/ProcessHub.php
View File

@ -65,10 +65,12 @@ final class ProcessHub
try {
$received = yield Promise\timeout($channel->receive(), self::KEY_RECEIVE_TIMEOUT);
} catch (TimeoutException $exception) {
$channel->close();
return; // Ignore possible foreign connection attempt.
}
if (!\is_string($received) || !isset($keys[$received])) {
$channel->close();
return; // Ignore possible foreign connection attempt.
}
@ -77,10 +79,6 @@ final class ProcessHub
$deferred = $acceptor[$pid];
unset($acceptor[$pid], $keys[$received]);
$deferred->resolve($channel);
if (empty($acceptor)) {
Loop::disable($watcher);
}
});
Loop::disable($this->watcher);
@ -112,17 +110,19 @@ final class ProcessHub
Loop::enable($this->watcher);
try {
return yield Promise\timeout($this->acceptor[$pid]->promise(), self::PROCESS_START_TIMEOUT);
$channel = yield Promise\timeout($this->acceptor[$pid]->promise(), self::PROCESS_START_TIMEOUT);
} catch (TimeoutException $exception) {
$key = \array_search($pid, $this->keys, true);
\assert(\is_string($key), "Key for {$pid} not found");
unset($this->acceptor[$pid], $this->keys[$key]);
throw new ContextException("Starting the process timed out", 0, $exception);
} finally {
if (empty($this->acceptor)) {
Loop::disable($this->watcher);
}
throw new ContextException("Starting the process timed out", 0, $exception);
}
return $channel;
});
}
}

11
lib/Context/Process.php
View File

@ -184,11 +184,16 @@ final class Process implements Context
public function start(): Promise
{
return call(function () {
$pid = yield $this->process->start();
try {
$pid = yield $this->process->start();
yield $this->process->getStdin()->write($this->hub->generateKey($pid, self::KEY_LENGTH));
yield $this->process->getStdin()->write($this->hub->generateKey($pid, self::KEY_LENGTH));
$this->channel = yield $this->hub->accept($pid);
$this->channel = yield $this->hub->accept($pid);
} catch (\Throwable $exception) {
$this->process->kill();
throw new ContextException("Staring the process failed", 0, $exception);
}
});
}

6
lib/Sync/SerializationException.php
View File

@ -2,6 +2,10 @@
namespace Amp\Parallel\Sync;
class SerializationException extends ChannelException
class SerializationException extends \Exception
{
public function __construct(string $message, \Throwable $previous = null)
{
parent::__construct($message, 0, $previous);
}
}

11
lib/Worker/AbstractWorker.php
View File

@ -4,6 +4,7 @@ namespace Amp\Parallel\Worker;
use Amp\Parallel\Context\Context;
use Amp\Parallel\Context\StatusError;
use Amp\Parallel\Sync\ChannelException;
use Amp\Promise;
use Amp\Success;
use function Amp\call;
@ -23,7 +24,7 @@ abstract class AbstractWorker implements Worker
private $pending;
/**
* @param \Amp\Parallel\Context\Context $context
* @param \Amp\Parallel\Context\Context $context A context running an instance of TaskRunner.
*/
public function __construct(Context $context)
{
@ -78,8 +79,12 @@ abstract class AbstractWorker implements Worker
$job = new Internal\Job($task);
yield $this->context->send($job);
$result = yield $this->context->receive();
try {
yield $this->context->send($job);
$result = yield $this->context->receive();
} catch (ChannelException $exception) {
throw new WorkerException("Communicating with the worker failed", $exception);
}
if (!$result instanceof Internal\TaskResult) {
$this->kill();