PHPC-164: Throw MongoDB\Driver\ConnectionTimeoutException

Author: bjori

config.m4

@@ -195,6 +195,7 @@ if test "$PHONGO" != "no"; then
       src/MongoDB/SSLConnectionException.c \
       src/MongoDB/DuplicateKeyException.c \
       src/MongoDB/ExecutionTimeoutException.c \
+      src/MongoDB/ConnectionTimeoutException.c \
       src/MongoDB/WriteException.c \
   ";
 

php_phongo.c

@@ -93,6 +93,8 @@ zend_class_entry* phongo_exception_from_mongoc_domain(uint32_t /* mongoc_error_d
 	switch(code) {
 		case 50: /* ExceededTimeLimit */
 			return php_phongo_executiontimeoutexception_ce;
+		case MONGOC_ERROR_STREAM_SOCKET:
+			return php_phongo_connectiontimeoutexception_ce;
 		case 11000: /* DuplicateKey */
 			return php_phongo_duplicatekeyexception_ce;
 		case MONGOC_ERROR_CLIENT_AUTHENTICATE:
@@ -101,7 +103,6 @@ zend_class_entry* phongo_exception_from_mongoc_domain(uint32_t /* mongoc_error_d
 		case MONGOC_ERROR_STREAM_INVALID_TYPE:
 		case MONGOC_ERROR_STREAM_INVALID_STATE:
 		case MONGOC_ERROR_STREAM_NAME_RESOLUTION:
-		case MONGOC_ERROR_STREAM_SOCKET:
 		case MONGOC_ERROR_STREAM_CONNECT:
 		case MONGOC_ERROR_STREAM_NOT_ESTABLISHED:
 			return php_phongo_connectionexception_ce;
@@ -747,8 +748,6 @@ ssize_t phongo_stream_writev(mongoc_stream_t *stream, mongoc_iovec_t *iov, size_
 	php_phongo_stream_socket *base_stream = (php_phongo_stream_socket *)stream;
 	TSRMLS_FETCH_FROM_CTX(base_stream->tsrm_ls);
 
-	php_phongo_set_timeout(base_stream, timeout_msec);
-
 	for (i = 0; i < iovcnt; i++) {
 		sent += php_stream_write(base_stream->stream, iov[i].iov_base, iov[i].iov_len);
 	}
@@ -767,6 +766,8 @@ ssize_t phongo_stream_readv(mongoc_stream_t *stream, mongoc_iovec_t *iov, size_t
 	size_t cur = 0;
 	TSRMLS_FETCH_FROM_CTX(base_stream->tsrm_ls);
 
+	php_phongo_set_timeout(base_stream, timeout_msec);
+
 	do {
 		read = php_stream_read(base_stream->stream, iov[cur].iov_base, iov[cur].iov_len);
 		mongoc_log(MONGOC_LOG_LEVEL_DEBUG, MONGOC_LOG_DOMAIN, "Reading got: %ld wanted: %ld", read, min_bytes);
@@ -1622,6 +1623,7 @@ PHP_MINIT_FUNCTION(phongo)
 	PHP_MINIT(WriteException)(INIT_FUNC_ARGS_PASSTHRU);
 	PHP_MINIT(DuplicateKeyException)(INIT_FUNC_ARGS_PASSTHRU);
 	PHP_MINIT(ExecutionTimeoutException)(INIT_FUNC_ARGS_PASSTHRU);
+	PHP_MINIT(ConnectionTimeoutException)(INIT_FUNC_ARGS_PASSTHRU);
 
 	PHP_MINIT(Type)(INIT_FUNC_ARGS_PASSTHRU);
 	PHP_MINIT(Serializable)(INIT_FUNC_ARGS_PASSTHRU);

php_phongo_classes.h

@@ -207,6 +207,7 @@ extern PHONGO_API zend_class_entry *php_phongo_authenticationexception_ce;
 extern PHONGO_API zend_class_entry *php_phongo_sslconnectionexception_ce;
 extern PHONGO_API zend_class_entry *php_phongo_duplicatekeyexception_ce;
 extern PHONGO_API zend_class_entry *php_phongo_executiontimeoutexception_ce;
+extern PHONGO_API zend_class_entry *php_phongo_connectiontimeoutexception_ce;
 extern PHONGO_API zend_class_entry *php_phongo_writeexception_ce;
 
 extern PHONGO_API zend_class_entry *php_phongo_type_ce;
@@ -247,6 +248,7 @@ PHP_MINIT_FUNCTION(AuthenticationException);
 PHP_MINIT_FUNCTION(SSLConnectionException);
 PHP_MINIT_FUNCTION(DuplicateKeyException);
 PHP_MINIT_FUNCTION(ExecutionTimeoutException);
+PHP_MINIT_FUNCTION(ConnectionTimeoutException);
 PHP_MINIT_FUNCTION(WriteException);
 
 PHP_MINIT_FUNCTION(Type);

src/MongoDB/ConnectionTimeoutException.c

@@ -0,0 +1,81 @@
+/*
+  +---------------------------------------------------------------------------+
+  | PHP Driver for MongoDB                                                    |
+  +---------------------------------------------------------------------------+
+  | Copyright 2013-2014 MongoDB, 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.                                            |
+  +---------------------------------------------------------------------------+
+  | Copyright (c) 2014, MongoDB, Inc.                                         |
+  +---------------------------------------------------------------------------+
+*/
+
+#ifdef HAVE_CONFIG_H
+#	include "config.h"
+#endif
+
+/* External libs */
+#include <bson.h>
+#include <mongoc.h>
+
+/* PHP Core stuff */
+#include <php.h>
+#include <php_ini.h>
+#include <ext/standard/info.h>
+#include <Zend/zend_interfaces.h>
+#include <ext/spl/spl_iterators.h>
+/* Our Compatability header */
+#include "php_compat_53.h"
+
+/* Our stuffz */
+#include "php_phongo.h"
+#include "php_bson.h"
+#include <ext/spl/spl_exceptions.h>
+
+
+PHONGO_API zend_class_entry *php_phongo_connectiontimeoutexception_ce;
+
+/* {{{ MongoDB\Driver\ConnectionTimeoutException */
+
+static zend_function_entry php_phongo_connectiontimeoutexception_me[] = {
+	PHP_FE_END
+};
+
+/* }}} */
+
+
+/* {{{ PHP_MINIT_FUNCTION */
+PHP_MINIT_FUNCTION(ConnectionTimeoutException)
+{
+	(void)type;
+	(void)module_number;
+	zend_class_entry ce;
+
+	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "ConnectionTimeoutException", php_phongo_connectiontimeoutexception_me);
+	php_phongo_connectiontimeoutexception_ce = zend_register_internal_class_ex(&ce, php_phongo_connectionexception_ce, NULL TSRMLS_CC);
+	php_phongo_connectiontimeoutexception_ce->ce_flags |= ZEND_ACC_FINAL_CLASS;
+
+	return SUCCESS;
+}
+/* }}} */
+
+
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */

tests/standalone/connectiontimeoutexception-001.phpt

@@ -0,0 +1,30 @@
+--TEST--
+ConnectionTimeoutException: exceeding sockettimeoutms
+--SKIPIF--
+<?php require "tests/utils/basic-skipif.inc" ?>
+--FILE--
+<?php
+require_once "tests/utils/basic.inc";
+
+$manager = new MongoDB\Driver\Manager(MONGODB_URI . "/?sockettimeoutms=1004");
+
+$cmd = array(
+    "sleep" => 1,
+    "w" => false,
+    "secs" => 2,
+);
+$command = new MongoDB\Driver\Command($cmd);
+
+throws(function() use ($manager, $command) {
+    $result = $manager->executeCommand("admin", $command);
+}, "MongoDB\Driver\ConnectionTimeoutException");
+
+/* Sleep one second longer then needing to make sure later processes don't get affected */
+sleep(3);
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECT--
+OK: Got MongoDB\Driver\ConnectionTimeoutException
+===DONE===