PCBC-246 Add support for LCB_CNTL_SKIP_CONFIGURATION_ERRORS_ON_CONNECT

Change-Id: Ib3a165a9d8d5eadc951771e0cf6fbfa66969c251
Reviewed-on: http://review.couchbase.org/28566
Reviewed-by: Trond Norbye <trond.norbye@gmail.com>
Tested-by: Trond Norbye <trond.norbye@gmail.com>

Author: trondn

apidecl.c

@@ -1241,6 +1241,14 @@ STD_PHP_INI_BOOLEAN(PCBC_INIENT_INST_RESTFLUSH,
 					zend_couchbase_globals,
 					couchbase_globals)
 
+STD_PHP_INI_BOOLEAN(PCBC_INIENT_INST_SKIP_CONFIG_ERROR_ON_CONNECT,
+					PCBC_INIDEFL_INST_SKIP_CONFIG_ERROR_ON_CONNECT,
+					PHP_INI_ALL,
+					OnUpdateBool,
+					skip_config_errors_on_connect,
+					zend_couchbase_globals,
+					couchbase_globals)
+
 PHP_INI_END()
 
 

create.c

@@ -366,6 +366,19 @@ void php_couchbase_create_impl(INTERNAL_FUNCTION_PARAMETERS, int oo)
 									   "Failed to create libcouchbase instance");
 				return;
 			}
+
+            if (COUCHBASE_G(skip_config_errors_on_connect)) {
+                int enable = 1;
+                if (lcb_cntl(handle, LCB_CNTL_SET,
+                             LCB_CNTL_SKIP_CONFIGURATION_ERRORS_ON_CONNECT,
+                             &enable) != LCB_SUCCESS) {
+                    free_connparams(&cparams);
+                    lcb_destroy(handle);
+                    couchbase_report_error(INTERNAL_FUNCTION_PARAM_PASSTHRU, oo,
+                                           cb_lcb_exception,
+                                           "Failed to enable skip_config_errors_on_connect");
+                }
+            }
 		} else {
 			lcb_error_t err;
 			char cachefile[1024];

example/couchbase.ini

@@ -97,3 +97,14 @@ couchbase.restflush = On
 ; containing the cluster topology (used to cache the configuration
 ; instead of connecting to the rest server each time to download it)
 couchbase.config_cache = ""
+
+; Try to connect to the next node in the configuration list if
+; the node don't contain the name of the bucket, or the
+; credentials is incorrect. This situation may occur if
+; the node is removed from the cluster, but is still listening
+; on the port.
+;
+; The parameter may be set to:
+;   On = Try next node if bucket doesn't exist (or with incorrect cred)
+;   Off = Fail if the bucket doesn't exist or the credentials is incorrect
+couchbase.skip_config_errors_on_connect = Off

internal.h

@@ -174,6 +174,7 @@ typedef struct _php_couchbase_ctx {
 ZEND_BEGIN_MODULE_GLOBALS(couchbase)
 zend_bool persistent;
 zend_bool restflush;
+zend_bool skip_config_errors_on_connect;
 char serializer_real;
 char *serializer;
 char compressor_real;
@@ -320,6 +321,9 @@ PHP_FUNCTION(couchbase_list_design_docs);
 #define PCBC_INIENT_CONFIG_CACHE "couchbase.config_cache"
 #define PCBC_INIDEFL_CONFIG_CACHE ""
 
+#define PCBC_INIENT_INST_SKIP_CONFIG_ERROR_ON_CONNECT "couchbase.skip_config_errors_on_connect"
+#define PCBC_INIDEFL_INST_SKIP_CONFIG_ERROR_ON_CONNECT "Off"
+
 /**
  * Hash table manipulation functions.
  */