beam-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From al...@apache.org
Subject [beam] branch master updated: [BEAM-6182] Disable conscrypt by default (#7203)
Date Wed, 05 Dec 2018 18:25:49 GMT
This is an automated email from the ASF dual-hosted git repository.

altay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new 9448dba  [BEAM-6182] Disable conscrypt by default (#7203)
9448dba is described below

commit 9448dba9cc97c144d97084480d56d4bda3ba7ea3
Author: Ahmet Altay <aaltay@gmail.com>
AuthorDate: Wed Dec 5 10:25:42 2018 -0800

    [BEAM-6182] Disable conscrypt by default (#7203)
    
    * Disable conscrypt by default
---
 .../dataflow/worker/DataflowWorkerHarnessHelper.java        | 13 +++++++------
 .../beam/runners/dataflow/worker/ExperimentContext.java     |  6 +++++-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/DataflowWorkerHarnessHelper.java
b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/DataflowWorkerHarnessHelper.java
index 75662f4..37ce990 100644
--- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/DataflowWorkerHarnessHelper.java
+++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/DataflowWorkerHarnessHelper.java
@@ -57,18 +57,19 @@ public final class DataflowWorkerHarnessHelper {
 
     ExperimentContext ec = ExperimentContext.parseFrom(pipelineOptions);
 
-    String experimentName = Experiment.DisableConscryptSecurityProvider.getName();
-    if (!ec.isEnabled(Experiment.DisableConscryptSecurityProvider)) {
+    String experimentName = Experiment.EnableConscryptSecurityProvider.getName();
+    if (ec.isEnabled(Experiment.EnableConscryptSecurityProvider)) {
       /* Enable fast SSL provider. */
       LOG.info(
-          "Dataflow runner uses conscrypt by default for SSL. To disable this feature, "
-              + "pass pipeline option --experiments={}",
+          "Dataflow runner is using conscrypt SSL. To disable this feature, "
+              + "remove the pipeline option --experiments={}",
           experimentName);
       Security.insertProviderAt(new OpenSSLProvider(), 1);
     } else {
       LOG.info(
-          "Experiment {} specified, disabling conscrypt SSL. Note this is the default "
-              + "Java behavior, but may have reduced performance.",
+          "Not using conscrypt SSL. Note this is the default Java behavior, but may "
+              + "have reduced performance. To use conscrypt SSL pass pipeline option "
+              + "--experiments={}",
           experimentName);
     }
     return pipelineOptions;
diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/ExperimentContext.java
b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/ExperimentContext.java
index 3ce1e08..3bf1ca8 100644
--- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/ExperimentContext.java
+++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/ExperimentContext.java
@@ -36,7 +36,11 @@ public class ExperimentContext {
 
   /** Enumeration of all known experiments. */
   public enum Experiment {
-    DisableConscryptSecurityProvider("disable_conscrypt_security_provider"),
+    /**
+     * Use the Conscrypt OpenSSL Java Security Provider. This may improve the performance
of SSL
+     * operations for some IO connectors.
+     */
+    EnableConscryptSecurityProvider("enable_conscrypt_security_provider"),
     IntertransformIO("intertransform_io"), // Intertransform metrics for Shuffle IO (insights)
     SideInputIOMetrics("sideinput_io_metrics"); // Intertransform metrics for Side Input
IO
 


Mime
View raw message