Increase mongo-orchestration HTTP timeout

jmikola · jmikola · commit c682fd3a860b · 2015-10-01T14:21:54.000-04:00
diff --git a/scripts/convert-mo-tests.php b/scripts/convert-mo-tests.php
@@ -14,7 +14,7 @@ function mo_delete($id) {
     $opts = array("http" =>
         array(
             "method"  => "DELETE",
-            "timeout" => 30,
+            "timeout" => 60,
             "header"  => "Accept: application/json\r\n" .
             "Content-type: application/x-www-form-urlencoded",
             "ignore_errors" => true,
@@ -32,7 +32,7 @@ function mo_post($url, $body) {
     $opts = array("http" =>
         array(
             "method"  => "POST",
-            "timeout" => 30,
+            "timeout" => 60,
             "header"  => "Accept: application/json\r\n" .
             "Content-type: application/x-www-form-urlencoded",
             "content" => json_encode($body),
diff --git a/tests/cluster/rs/connection/read/primary-available.phpt b/tests/cluster/rs/connection/read/primary-available.phpt
@@ -11,7 +11,7 @@ function mo_delete($id) {
     $opts = array("http" =>
         array(
             "method"  => "DELETE",
-            "timeout" => 30,
+            "timeout" => 60,
             "header"  => "Accept: application/json\r\n" .
             "Content-type: application/x-www-form-urlencoded",
             "ignore_errors" => true,
@@ -29,7 +29,7 @@ function mo_post($url, $body) {
     $opts = array("http" =>
         array(
             "method"  => "POST",
-            "timeout" => 30,
+            "timeout" => 60,
             "header"  => "Accept: application/json\r\n" .
             "Content-type: application/x-www-form-urlencoded",
             "content" => json_encode($body),
diff --git a/tests/cluster/rs/connection/read/primary-not-available.phpt b/tests/cluster/rs/connection/read/primary-not-available.phpt
@@ -11,7 +11,7 @@ function mo_delete($id) {
     $opts = array("http" =>
         array(
             "method"  => "DELETE",
-            "timeout" => 30,
+            "timeout" => 60,
             "header"  => "Accept: application/json\r\n" .
             "Content-type: application/x-www-form-urlencoded",
             "ignore_errors" => true,
@@ -29,7 +29,7 @@ function mo_post($url, $body) {
     $opts = array("http" =>
         array(
             "method"  => "POST",
-            "timeout" => 30,
+            "timeout" => 60,
             "header"  => "Accept: application/json\r\n" .
             "Content-type: application/x-www-form-urlencoded",
             "content" => json_encode($body),
diff --git a/tests/cluster/rs/connection/write/primary-available.phpt b/tests/cluster/rs/connection/write/primary-available.phpt
@@ -11,7 +11,7 @@ function mo_delete($id) {
     $opts = array("http" =>
         array(
             "method"  => "DELETE",
-            "timeout" => 30,
+            "timeout" => 60,
             "header"  => "Accept: application/json\r\n" .
             "Content-type: application/x-www-form-urlencoded",
             "ignore_errors" => true,
@@ -29,7 +29,7 @@ function mo_post($url, $body) {
     $opts = array("http" =>
         array(
             "method"  => "POST",
-            "timeout" => 30,
+            "timeout" => 60,
             "header"  => "Accept: application/json\r\n" .
             "Content-type: application/x-www-form-urlencoded",
             "content" => json_encode($body),
diff --git a/tests/cluster/rs/connection/write/primary-not-available.phpt b/tests/cluster/rs/connection/write/primary-not-available.phpt
@@ -11,7 +11,7 @@ function mo_delete($id) {
     $opts = array("http" =>
         array(
             "method"  => "DELETE",
-            "timeout" => 30,
+            "timeout" => 60,
             "header"  => "Accept: application/json\r\n" .
             "Content-type: application/x-www-form-urlencoded",
             "ignore_errors" => true,
@@ -29,7 +29,7 @@ function mo_post($url, $body) {
     $opts = array("http" =>
         array(
             "method"  => "POST",
-            "timeout" => 30,
+            "timeout" => 60,
             "header"  => "Accept: application/json\r\n" .
             "Content-type: application/x-www-form-urlencoded",
             "content" => json_encode($body),
diff --git a/tests/cluster/rs/connection/write/primary-restarted.phpt b/tests/cluster/rs/connection/write/primary-restarted.phpt
@@ -11,7 +11,7 @@ function mo_delete($id) {
     $opts = array("http" =>
         array(
             "method"  => "DELETE",
-            "timeout" => 30,
+            "timeout" => 60,
             "header"  => "Accept: application/json\r\n" .
             "Content-type: application/x-www-form-urlencoded",
             "ignore_errors" => true,
@@ -29,7 +29,7 @@ function mo_post($url, $body) {
     $opts = array("http" =>
         array(
             "method"  => "POST",
-            "timeout" => 30,
+            "timeout" => 60,
             "header"  => "Accept: application/json\r\n" .
             "Content-type: application/x-www-form-urlencoded",
             "content" => json_encode($body),
diff --git a/tests/cluster/rs/discovery/remove-all-add-members.phpt b/tests/cluster/rs/discovery/remove-all-add-members.phpt
@@ -11,7 +11,7 @@ function mo_delete($id) {
     $opts = array("http" =>
         array(
             "method"  => "DELETE",
-            "timeout" => 30,
+            "timeout" => 60,
             "header"  => "Accept: application/json\r\n" .
             "Content-type: application/x-www-form-urlencoded",
             "ignore_errors" => true,
@@ -29,7 +29,7 @@ function mo_post($url, $body) {
     $opts = array("http" =>
         array(
             "method"  => "POST",
-            "timeout" => 30,
+            "timeout" => 60,
             "header"  => "Accept: application/json\r\n" .
             "Content-type: application/x-www-form-urlencoded",
             "content" => json_encode($body),
diff --git a/tests/cluster/rs/discovery/stepped-down-primary-triggers-refresh.phpt b/tests/cluster/rs/discovery/stepped-down-primary-triggers-refresh.phpt
@@ -11,7 +11,7 @@ function mo_delete($id) {
     $opts = array("http" =>
         array(
             "method"  => "DELETE",
-            "timeout" => 30,
+            "timeout" => 60,
             "header"  => "Accept: application/json\r\n" .
             "Content-type: application/x-www-form-urlencoded",
             "ignore_errors" => true,
@@ -29,7 +29,7 @@ function mo_post($url, $body) {
     $opts = array("http" =>
         array(
             "method"  => "POST",
-            "timeout" => 30,
+            "timeout" => 60,
             "header"  => "Accept: application/json\r\n" .
             "Content-type: application/x-www-form-urlencoded",
             "content" => json_encode($body),
diff --git a/tests/cluster/sharded/connection/all-mongos-available.phpt b/tests/cluster/sharded/connection/all-mongos-available.phpt
@@ -11,7 +11,7 @@ function mo_delete($id) {
     $opts = array("http" =>
         array(
             "method"  => "DELETE",
-            "timeout" => 30,
+            "timeout" => 60,
             "header"  => "Accept: application/json\r\n" .
             "Content-type: application/x-www-form-urlencoded",
             "ignore_errors" => true,
@@ -29,7 +29,7 @@ function mo_post($url, $body) {
     $opts = array("http" =>
         array(
             "method"  => "POST",
-            "timeout" => 30,
+            "timeout" => 60,
             "header"  => "Accept: application/json\r\n" .
             "Content-type: application/x-www-form-urlencoded",
             "content" => json_encode($body),
diff --git a/tests/cluster/sharded/connection/no-mongos-available.phpt b/tests/cluster/sharded/connection/no-mongos-available.phpt
@@ -11,7 +11,7 @@ function mo_delete($id) {
     $opts = array("http" =>
         array(
             "method"  => "DELETE",
-            "timeout" => 30,
+            "timeout" => 60,
             "header"  => "Accept: application/json\r\n" .
             "Content-type: application/x-www-form-urlencoded",
             "ignore_errors" => true,
@@ -29,7 +29,7 @@ function mo_post($url, $body) {
     $opts = array("http" =>
         array(
             "method"  => "POST",
-            "timeout" => 30,
+            "timeout" => 60,
             "header"  => "Accept: application/json\r\n" .
             "Content-type: application/x-www-form-urlencoded",
             "content" => json_encode($body),
diff --git a/tests/cluster/single/connection/read/standalone-available.phpt b/tests/cluster/single/connection/read/standalone-available.phpt
@@ -11,7 +11,7 @@ function mo_delete($id) {
     $opts = array("http" =>
         array(
             "method"  => "DELETE",
-            "timeout" => 30,
+            "timeout" => 60,
             "header"  => "Accept: application/json\r\n" .
             "Content-type: application/x-www-form-urlencoded",
             "ignore_errors" => true,
@@ -29,7 +29,7 @@ function mo_post($url, $body) {
     $opts = array("http" =>
         array(
             "method"  => "POST",
-            "timeout" => 30,
+            "timeout" => 60,
             "header"  => "Accept: application/json\r\n" .
             "Content-type: application/x-www-form-urlencoded",
             "content" => json_encode($body),
diff --git a/tests/cluster/single/connection/read/standalone-not-available.phpt b/tests/cluster/single/connection/read/standalone-not-available.phpt
@@ -11,7 +11,7 @@ function mo_delete($id) {
     $opts = array("http" =>
         array(
             "method"  => "DELETE",
-            "timeout" => 30,
+            "timeout" => 60,
             "header"  => "Accept: application/json\r\n" .
             "Content-type: application/x-www-form-urlencoded",
             "ignore_errors" => true,
@@ -29,7 +29,7 @@ function mo_post($url, $body) {
     $opts = array("http" =>
         array(
             "method"  => "POST",
-            "timeout" => 30,
+            "timeout" => 60,
             "header"  => "Accept: application/json\r\n" .
             "Content-type: application/x-www-form-urlencoded",
             "content" => json_encode($body),
diff --git a/tests/cluster/single/connection/read/standalone-restarted.phpt b/tests/cluster/single/connection/read/standalone-restarted.phpt
@@ -11,7 +11,7 @@ function mo_delete($id) {
     $opts = array("http" =>
         array(
             "method"  => "DELETE",
-            "timeout" => 30,
+            "timeout" => 60,
             "header"  => "Accept: application/json\r\n" .
             "Content-type: application/x-www-form-urlencoded",
             "ignore_errors" => true,
@@ -29,7 +29,7 @@ function mo_post($url, $body) {
     $opts = array("http" =>
         array(
             "method"  => "POST",
-            "timeout" => 30,
+            "timeout" => 60,
             "header"  => "Accept: application/json\r\n" .
             "Content-type: application/x-www-form-urlencoded",
             "content" => json_encode($body),
diff --git a/tests/cluster/single/connection/write/standalone-available.phpt b/tests/cluster/single/connection/write/standalone-available.phpt
@@ -11,7 +11,7 @@ function mo_delete($id) {
     $opts = array("http" =>
         array(
             "method"  => "DELETE",
-            "timeout" => 30,
+            "timeout" => 60,
             "header"  => "Accept: application/json\r\n" .
             "Content-type: application/x-www-form-urlencoded",
             "ignore_errors" => true,
@@ -29,7 +29,7 @@ function mo_post($url, $body) {
     $opts = array("http" =>
         array(
             "method"  => "POST",
-            "timeout" => 30,
+            "timeout" => 60,
             "header"  => "Accept: application/json\r\n" .
             "Content-type: application/x-www-form-urlencoded",
             "content" => json_encode($body),
diff --git a/tests/cluster/single/connection/write/standalone-not-available.phpt b/tests/cluster/single/connection/write/standalone-not-available.phpt
@@ -11,7 +11,7 @@ function mo_delete($id) {
     $opts = array("http" =>
         array(
             "method"  => "DELETE",
-            "timeout" => 30,
+            "timeout" => 60,
             "header"  => "Accept: application/json\r\n" .
             "Content-type: application/x-www-form-urlencoded",
             "ignore_errors" => true,
@@ -29,7 +29,7 @@ function mo_post($url, $body) {
     $opts = array("http" =>
         array(
             "method"  => "POST",
-            "timeout" => 30,
+            "timeout" => 60,
             "header"  => "Accept: application/json\r\n" .
             "Content-type: application/x-www-form-urlencoded",
             "content" => json_encode($body),
diff --git a/tests/cluster/single/connection/write/standalone-restarted.phpt b/tests/cluster/single/connection/write/standalone-restarted.phpt
@@ -11,7 +11,7 @@ function mo_delete($id) {
     $opts = array("http" =>
         array(
             "method"  => "DELETE",
-            "timeout" => 30,
+            "timeout" => 60,
             "header"  => "Accept: application/json\r\n" .
             "Content-type: application/x-www-form-urlencoded",
             "ignore_errors" => true,
@@ -29,7 +29,7 @@ function mo_post($url, $body) {
     $opts = array("http" =>
         array(
             "method"  => "POST",
-            "timeout" => 30,
+            "timeout" => 60,
             "header"  => "Accept: application/json\r\n" .
             "Content-type: application/x-www-form-urlencoded",
             "content" => json_encode($body),
diff --git a/tests/utils/tools.php b/tests/utils/tools.php
@@ -148,7 +148,7 @@ function START($id, array $options = array()) {
     $options += array("name" => "mongod", "id" => $id);
     $opts = array(
         "http" => array(
-            "timeout" => 30,
+            "timeout" => 60,
             "method"  => "PUT",
             "header"  => "Accept: application/json\r\n" .
                          "Content-type: application/x-www-form-urlencoded",
@@ -177,7 +177,7 @@ function START($id, array $options = array()) {
 function DELETE($id) {
     $opts = array(
         "http" => array(
-            "timeout" => 30,
+            "timeout" => 60,
             "method"  => "DELETE",
             "header"  => "Accept: application/json\r\n",
             "ignore_errors" => true,
