You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by al...@apache.org on 2018/11/21 21:22:41 UTC
[beam] branch master updated: typo fix in experiments flag name in
the log (#7076)
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 6d8fa45 typo fix in experiments flag name in the log (#7076)
6d8fa45 is described below
commit 6d8fa455d4b478335167235f56620744d9e22784
Author: Ahmet Altay <aa...@gmail.com>
AuthorDate: Wed Nov 21 13:22:35 2018 -0800
typo fix in experiments flag name in the log (#7076)
* typo fix in experiments flag name in the log
---
.../dataflow/worker/DataflowWorkerHarnessHelper.java | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 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 aeeec33..75662f4 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,16 +57,19 @@ public final class DataflowWorkerHarnessHelper {
ExperimentContext ec = ExperimentContext.parseFrom(pipelineOptions);
+ String experimentName = Experiment.DisableConscryptSecurityProvider.getName();
if (!ec.isEnabled(Experiment.DisableConscryptSecurityProvider)) {
/* Enable fast SSL provider. */
LOG.info(
"Dataflow runner uses conscrypt by default for SSL. To disable this feature, "
- + "pass pipeline option --experiment=disable_conscrypt_security_provider");
+ + "pass pipeline option --experiments={}",
+ experimentName);
Security.insertProviderAt(new OpenSSLProvider(), 1);
} else {
LOG.info(
- "Experiment disable_conscrypt_security_provider specified, disabling conscrypt "
- + "SSL. Note this is the default Java behavior, but may have reduced performance.");
+ "Experiment {} specified, disabling conscrypt SSL. Note this is the default "
+ + "Java behavior, but may have reduced performance.",
+ experimentName);
}
return pipelineOptions;
}
@@ -113,13 +116,13 @@ public final class DataflowWorkerHarnessHelper {
public static @Nullable RunnerApi.Pipeline getPipelineFromEnv() throws IOException {
String pipelinePath = System.getenv(PIPELINE_PATH);
if (pipelinePath == null) {
- LOG.warn("Missing pipeline environment variable '%s'", PIPELINE_PATH);
+ LOG.warn("Missing pipeline environment variable '{}'", PIPELINE_PATH);
return null;
}
File pipelineFile = new File(System.getenv(PIPELINE_PATH));
if (!pipelineFile.exists()) {
- LOG.warn("Pipeline path '%s' does not exist", pipelineFile);
+ LOG.warn("Pipeline path '{}' does not exist", pipelineFile);
return null;
}