Merge pull request #44 from hollodotme/2.x-dev

hollodotme · web-flow · commit 785608e89059 · 2019-05-31T00:57:49.000+02:00
Release v2.7.1
diff --git a/.docker/php/7.1/Dockerfile b/.docker/php/7.1/Dockerfile
@@ -1,10 +1,12 @@
 FROM php:7.1-fpm-alpine
+ENV XDEBUG_VERSION=2.7.2
 ENV PHP_CONF_DIR=/usr/local/etc
-RUN apk update && apk upgrade && apk add --no-cache $PHPIZE_DEPS \
-    && pecl install xdebug-2.7.1 \
+RUN apk update && apk upgrade && apk add --no-cache ${PHPIZE_DEPS} \
+    && pecl install xdebug-${XDEBUG_VERSION} \
     && docker-php-ext-enable xdebug \
-    && apk del $PHPIZE_DEPS
-COPY network-socket.pool.conf $PHP_CONF_DIR/php-fpm.d/network-socket.pool.conf
-COPY restricted-unix-domain-socket.pool.conf $PHP_CONF_DIR/php-fpm.d/restricted-unix-domain-socket.pool.conf
-COPY unix-domain-socket.pool.conf $PHP_CONF_DIR/php-fpm.d/unix-domain-socket.pool.conf
+    && apk del ${PHPIZE_DEPS} \
+    && rm -rf /var/cache/apk/*
+COPY network-socket.pool.conf ${PHP_CONF_DIR}/php-fpm.d/network-socket.pool.conf
+COPY restricted-unix-domain-socket.pool.conf ${PHP_CONF_DIR}/php-fpm.d/restricted-unix-domain-socket.pool.conf
+COPY unix-domain-socket.pool.conf ${PHP_CONF_DIR}/php-fpm.d/unix-domain-socket.pool.conf
 WORKDIR /repo
diff --git a/.docker/php/7.2/Dockerfile b/.docker/php/7.2/Dockerfile
@@ -1,10 +1,12 @@
 FROM php:7.2-fpm-alpine
+ENV XDEBUG_VERSION=2.7.2
 ENV PHP_CONF_DIR=/usr/local/etc
-RUN apk update && apk upgrade && apk add --no-cache $PHPIZE_DEPS \
-    && pecl install xdebug-2.7.1 \
+RUN apk update && apk upgrade && apk add --no-cache ${PHPIZE_DEPS} \
+    && pecl install xdebug-${XDEBUG_VERSION} \
     && docker-php-ext-enable xdebug \
-    && apk del $PHPIZE_DEPS
-COPY network-socket.pool.conf $PHP_CONF_DIR/php-fpm.d/network-socket.pool.conf
-COPY restricted-unix-domain-socket.pool.conf $PHP_CONF_DIR/php-fpm.d/restricted-unix-domain-socket.pool.conf
-COPY unix-domain-socket.pool.conf $PHP_CONF_DIR/php-fpm.d/unix-domain-socket.pool.conf
+    && apk del ${PHPIZE_DEPS} \
+    && rm -rf /var/cache/apk/*
+COPY network-socket.pool.conf ${PHP_CONF_DIR}/php-fpm.d/network-socket.pool.conf
+COPY restricted-unix-domain-socket.pool.conf ${PHP_CONF_DIR}/php-fpm.d/restricted-unix-domain-socket.pool.conf
+COPY unix-domain-socket.pool.conf ${PHP_CONF_DIR}/php-fpm.d/unix-domain-socket.pool.conf
 WORKDIR /repo
diff --git a/.docker/php/7.3/Dockerfile b/.docker/php/7.3/Dockerfile
@@ -1,10 +1,12 @@
 FROM php:7.3-fpm-alpine
+ENV XDEBUG_VERSION=2.7.2
 ENV PHP_CONF_DIR=/usr/local/etc
-RUN apk update && apk upgrade && apk add --no-cache $PHPIZE_DEPS \
-    && pecl install xdebug-2.7.1 \
+RUN apk update && apk upgrade && apk add --no-cache ${PHPIZE_DEPS} \
+    && pecl install xdebug-${XDEBUG_VERSION} \
     && docker-php-ext-enable xdebug \
-    && apk del $PHPIZE_DEPS
-COPY network-socket.pool.conf $PHP_CONF_DIR/php-fpm.d/network-socket.pool.conf
-COPY restricted-unix-domain-socket.pool.conf $PHP_CONF_DIR/php-fpm.d/restricted-unix-domain-socket.pool.conf
-COPY unix-domain-socket.pool.conf $PHP_CONF_DIR/php-fpm.d/unix-domain-socket.pool.conf
+    && apk del ${PHPIZE_DEPS} \
+    && rm -rf /var/cache/apk/*
+COPY network-socket.pool.conf ${PHP_CONF_DIR}/php-fpm.d/network-socket.pool.conf
+COPY restricted-unix-domain-socket.pool.conf ${PHP_CONF_DIR}/php-fpm.d/restricted-unix-domain-socket.pool.conf
+COPY unix-domain-socket.pool.conf ${PHP_CONF_DIR}/php-fpm.d/unix-domain-socket.pool.conf
 WORKDIR /repo
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 /.idea/
 /vendor/
 /build/logs/
-/.phpunit.result.cache
+/build/.phpunit.result.cache
 /composer.lock
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a CHANGELOG](http://keepachangelog.com).
 
+## [2.7.2] - 2019-05-31
+
+### Improved
+
+* Handling of `stream_select` returning `false` in case of a system call interrupt. - [#41]
+
+### Fixed
+
+* Remove/close sockets after fetching their responses triggered async requests in order to prevent halt on further 
+  request processing, if the number of requests exceeds php-fpm's `pm.max_children` setting. - [#40]
+
 ## [2.7.1] - 2019-04-29
 
 ### Fixed
@@ -193,6 +204,7 @@ Based on [Pierrick Charron](https://github.com/adoy)'s [PHP-FastCGI-Client](http
  * Getters/Setters for connect timeout, read/write timeout, keep alive, socket persistence from `Client` (now part of the socket connection)
  * Method `Client->getValues()`
 
+[2.7.2]: https://github.com/hollodotme/fast-cgi-client/compare/v2.7.1...v2.7.2
 [2.7.1]: https://github.com/hollodotme/fast-cgi-client/compare/v2.7.0...v2.7.1
 [2.7.0]: https://github.com/hollodotme/fast-cgi-client/compare/v2.6.0...v2.7.0
 [2.6.0]: https://github.com/hollodotme/fast-cgi-client/compare/v2.5.0...v2.6.0
@@ -221,3 +233,5 @@ Based on [Pierrick Charron](https://github.com/adoy)'s [PHP-FastCGI-Client](http
 [#27]: https://github.com/hollodotme/fast-cgi-client/issues/27
 [#33]: https://github.com/hollodotme/fast-cgi-client/pull/33
 [#37]: https://github.com/hollodotme/fast-cgi-client/issue/37
+[#40]: https://github.com/hollodotme/fast-cgi-client/issue/40
+[#41]: https://github.com/hollodotme/fast-cgi-client/issue/41
diff --git a/composer.json b/composer.json
@@ -4,7 +4,8 @@
   "keywords": [
     "fastcgi",
     "php-fpm",
-    "socket"
+    "socket",
+    "async"
   ],
   "minimum-stability": "dev",
   "prefer-stable": true,
diff --git a/src/Client.php b/src/Client.php
@@ -172,10 +172,7 @@ public function waitForResponses( ?int $timeoutMs = null ) : void
 
 		while ( $this->hasUnhandledResponses() )
 		{
-			foreach ( $this->getSocketsHavingResponse() as $socket )
-			{
-				$this->fetchResponseAndNotifyCallback( $socket, $timeoutMs );
-			}
+			$this->handleReadyResponses( $timeoutMs );
 		}
 	}
 
@@ -193,10 +190,12 @@ private function fetchResponseAndNotifyCallback( Socket $socket, ?int $timeoutMs
 		}
 		catch ( Throwable $e )
 		{
-			$this->sockets->remove( $socket->getId() );
-
 			$socket->notifyFailureCallbacks( $e );
 		}
+		finally
+		{
+			$this->sockets->remove( $socket->getId() );
+		}
 	}
 
 	/**
@@ -207,18 +206,6 @@ public function hasUnhandledResponses() : bool
 		return $this->sockets->hasBusySockets();
 	}
 
-	/**
-	 * @return Generator|Socket[]
-	 * @throws ReadFailedException
-	 */
-	private function getSocketsHavingResponse() : Generator
-	{
-		foreach ( $this->getRequestIdsHavingResponse() as $requestId )
-		{
-			yield $this->sockets->getById( $requestId );
-		}
-	}
-
 	/**
 	 * @param int $requestId
 	 *
@@ -244,7 +231,12 @@ public function getRequestIdsHavingResponse() : array
 		$reads  = $this->sockets->collectResources();
 		$writes = $excepts = null;
 
-		stream_select( $reads, $writes, $excepts, 0, Socket::STREAM_SELECT_USEC );
+		$result = @stream_select( $reads, $writes, $excepts, 0, Socket::STREAM_SELECT_USEC );
+
+		if ( false === $result || 0 === count( $reads ) )
+		{
+			return [];
+		}
 
 		return $this->sockets->getSocketIdsByResources( $reads );
 	}
@@ -264,6 +256,10 @@ public function readResponses( ?int $timeoutMs = null, int ...$requestIds ) : Ge
 				yield $this->sockets->getById( $requestId )->fetchResponse( $timeoutMs );
 			}
 			catch ( Throwable $e )
+			{
+				# Skip unknown request ids
+			}
+			finally
 			{
 				$this->sockets->remove( $requestId );
 			}
diff --git a/src/Sockets/Socket.php b/src/Sockets/Socket.php
@@ -52,8 +52,10 @@
 use function stream_select;
 use function stream_set_timeout;
 use function stream_socket_client;
+use function stream_socket_shutdown;
 use function strlen;
 use function substr;
+use const STREAM_SHUT_RDWR;
 
 final class Socket
 {
@@ -541,6 +543,7 @@ private function disconnect() : void
 	{
 		if ( is_resource( $this->resource ) )
 		{
+			@stream_socket_shutdown( $this->resource, STREAM_SHUT_RDWR );
 			fclose( $this->resource );
 		}
 	}
diff --git a/tests/Integration/AsyncRequestsTest.php b/tests/Integration/AsyncRequestsTest.php
diff --git a/tests/Integration/SignaledWorkersTest.php b/tests/Integration/SignaledWorkersTest.php
diff --git a/tests/runTestsOnAllLocalPhpVersions.sh b/tests/runTestsOnAllLocalPhpVersions.sh

Original file line number	Diff line number	Diff line change
`@@ -172,10 +172,7 @@ public function waitForResponses( ?int $timeoutMs = null ) : void`
`172`	`172`
`173`	`173`	`while ( $this->hasUnhandledResponses() )`
`174`	`174`	`{`
`175`		`- foreach ( $this->getSocketsHavingResponse() as $socket )`
`176`		`- {`
`177`		`- $this->fetchResponseAndNotifyCallback( $socket, $timeoutMs );`
`178`		`- }`
	`175`	`+ $this->handleReadyResponses( $timeoutMs );`
`179`	`176`	`}`
`180`	`177`	`}`
`181`	`178`
`@@ -193,10 +190,12 @@ private function fetchResponseAndNotifyCallback( Socket $socket, ?int $timeoutMs`
`193`	`190`	`}`
`194`	`191`	`catch ( Throwable $e )`
`195`	`192`	`{`
`196`		`- $this->sockets->remove( $socket->getId() );`
`197`		`-`
`198`	`193`	`$socket->notifyFailureCallbacks( $e );`
`199`	`194`	`}`
	`195`	`+ finally`
	`196`	`+ {`
	`197`	`+ $this->sockets->remove( $socket->getId() );`
	`198`	`+ }`
`200`	`199`	`}`
`201`	`200`
`202`	`201`	`/**`
`@@ -207,18 +206,6 @@ public function hasUnhandledResponses() : bool`
`207`	`206`	`return $this->sockets->hasBusySockets();`
`208`	`207`	`}`
`209`	`208`
`210`		`- /**`
`211`		`- * @return Generator\|Socket[]`
`212`		`- * @throws ReadFailedException`
`213`		`- */`
`214`		`- private function getSocketsHavingResponse() : Generator`
`215`		`- {`
`216`		`- foreach ( $this->getRequestIdsHavingResponse() as $requestId )`
`217`		`- {`
`218`		`- yield $this->sockets->getById( $requestId );`
`219`		`- }`
`220`		`- }`
`221`		`-`
`222`	`209`	`/**`
`223`	`210`	`* @param int $requestId`
`224`	`211`	`*`
`@@ -244,7 +231,12 @@ public function getRequestIdsHavingResponse() : array`
`244`	`231`	`$reads = $this->sockets->collectResources();`
`245`	`232`	`$writes = $excepts = null;`
`246`	`233`
`247`		`- stream_select( $reads, $writes, $excepts, 0, Socket::STREAM_SELECT_USEC );`
	`234`	`+ $result = @stream_select( $reads, $writes, $excepts, 0, Socket::STREAM_SELECT_USEC );`
	`235`	`+`
	`236`	`+ if ( false === $result \|\| 0 === count( $reads ) )`
	`237`	`+ {`
	`238`	`+ return [];`
	`239`	`+ }`
`248`	`240`
`249`	`241`	`return $this->sockets->getSocketIdsByResources( $reads );`
`250`	`242`	`}`
`@@ -264,6 +256,10 @@ public function readResponses( ?int $timeoutMs = null, int ...$requestIds ) : Ge`
`264`	`256`	`yield $this->sockets->getById( $requestId )->fetchResponse( $timeoutMs );`
`265`	`257`	`}`
`266`	`258`	`catch ( Throwable $e )`
	`259`	`+ {`
	`260`	`+ # Skip unknown request ids`
	`261`	`+ }`
	`262`	`+ finally`
`267`	`263`	`{`
`268`	`264`	`$this->sockets->remove( $requestId );`
`269`	`265`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,8 +52,10 @@`
`52`	`52`	`use function stream_select;`
`53`	`53`	`use function stream_set_timeout;`
`54`	`54`	`use function stream_socket_client;`
	`55`	`+use function stream_socket_shutdown;`
`55`	`56`	`use function strlen;`
`56`	`57`	`use function substr;`
	`58`	`+use const STREAM_SHUT_RDWR;`
`57`	`59`
`58`	`60`	`final class Socket`
`59`	`61`	`{`
`@@ -541,6 +543,7 @@ private function disconnect() : void`
`541`	`543`	`{`
`542`	`544`	`if ( is_resource( $this->resource ) )`
`543`	`545`	`{`
	`546`	`+ @stream_socket_shutdown( $this->resource, STREAM_SHUT_RDWR );`
`544`	`547`	`fclose( $this->resource );`
`545`	`548`	`}`
`546`	`549`	`}`