[incubator-gobblin] branch master updated: [GOBBLIN-1155] Make socket connect timeout configurable for couchbase writer

[kuyu]

This is an automated email from the ASF dual-hosted git repository.

kuyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-gobblin.git


The following commit(s) were added to refs/heads/master by this push:
     new eae35e4  [GOBBLIN-1155] Make socket connect timeout configurable for 
couchbase writer
eae35e4 is described below

commit eae35e425bd4ad55dd8d1ed57602b49e6f320e00
Author: Jack Moseley <jmose...@linkedin.com>
AuthorDate: Thu May 21 15:34:35 2020 -0700

    [GOBBLIN-1155] Make socket connect timeout configurable for couchbase writer
    
    Closes #2994 from jack-moseley/couchbase-socket-
    timeout
---
 .../gobblin/couchbase/writer/CouchbaseEnvironmentFactory.java       | 6 ++++--
 .../gobblin/couchbase/writer/CouchbaseWriterConfigurationKeys.java  | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git 
a/gobblin-modules/gobblin-couchbase/src/main/java/org/apache/gobblin/couchbase/writer/CouchbaseEnvironmentFactory.java
 
b/gobblin-modules/gobblin-couchbase/src/main/java/org/apache/gobblin/couchbase/writer/CouchbaseEnvironmentFactory.java
index 66972e5..e405a05 100644
--- 
a/gobblin-modules/gobblin-couchbase/src/main/java/org/apache/gobblin/couchbase/writer/CouchbaseEnvironmentFactory.java
+++ 
b/gobblin-modules/gobblin-couchbase/src/main/java/org/apache/gobblin/couchbase/writer/CouchbaseEnvironmentFactory.java
@@ -46,7 +46,8 @@ public class CouchbaseEnvironmentFactory {
     String sslTruststorePassword = ConfigUtils.getString(config, 
CouchbaseWriterConfigurationKeys.SSL_TRUSTSTORE_PASSWORD, "");
     Boolean certAuthEnabled = ConfigUtils.getBoolean(config, 
CouchbaseWriterConfigurationKeys.CERT_AUTH_ENABLED, false);
     Boolean dnsSrvEnabled = ConfigUtils.getBoolean(config, 
CouchbaseWriterConfigurationKeys.DNS_SRV_ENABLED, false);
-
+    Integer socketConnectTimeout = ConfigUtils.getInt(config, 
CouchbaseWriterConfigurationKeys.SOCKET_CONNECT_TIMEOUT,
+        DefaultCouchbaseEnvironment.SOCKET_CONNECT_TIMEOUT);
 
     DefaultCouchbaseEnvironment.Builder builder = 
DefaultCouchbaseEnvironment.builder()
         .sslEnabled(sslEnabled)
@@ -55,7 +56,8 @@ public class CouchbaseEnvironmentFactory {
         .sslTruststoreFile(sslTruststoreFile)
         .sslTruststorePassword(sslTruststorePassword)
         .certAuthEnabled(certAuthEnabled)
-        .dnsSrvEnabled(dnsSrvEnabled);
+        .dnsSrvEnabled(dnsSrvEnabled)
+        .socketConnectTimeout(socketConnectTimeout);
 
     if (couchbaseEnvironment == null)
     {
diff --git 
a/gobblin-modules/gobblin-couchbase/src/main/java/org/apache/gobblin/couchbase/writer/CouchbaseWriterConfigurationKeys.java
 
b/gobblin-modules/gobblin-couchbase/src/main/java/org/apache/gobblin/couchbase/writer/CouchbaseWriterConfigurationKeys.java
index 56dc5c1..782033f 100644
--- 
a/gobblin-modules/gobblin-couchbase/src/main/java/org/apache/gobblin/couchbase/writer/CouchbaseWriterConfigurationKeys.java
+++ 
b/gobblin-modules/gobblin-couchbase/src/main/java/org/apache/gobblin/couchbase/writer/CouchbaseWriterConfigurationKeys.java
@@ -42,6 +42,7 @@ public class CouchbaseWriterConfigurationKeys {
   public static final String SSL_TRUSTSTORE_PASSWORD = 
prefix("sslTruststorePassword");
   public static final String CERT_AUTH_ENABLED = prefix("certAuthEnabled");
   public static final String DNS_SRV_ENABLED = prefix("dnsSrvEnabled");
+  public static final String SOCKET_CONNECT_TIMEOUT = 
prefix("socketConnectTimeout");
 
   public static final String DOCUMENT_TTL = prefix("documentTTL");
   public static final String DOCUMENT_TTL_UNIT = prefix("documentTTLUnits");