diff options
Diffstat (limited to 'vespa-hadoop/src/main/java')
-rw-r--r-- | vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaRecordWriter.java | 6 | ||||
-rw-r--r-- | vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaConfiguration.java | 9 |
2 files changed, 15 insertions, 0 deletions
diff --git a/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaRecordWriter.java b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaRecordWriter.java index c381ec87492..6d6c3789835 100644 --- a/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaRecordWriter.java +++ b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaRecordWriter.java @@ -130,6 +130,12 @@ public class VespaRecordWriter extends RecordWriter<Object, Object> { .setMaxStreamPerConnection(streamsPerConnection) .setDryrun(config.dryrun()) .setRetryStrategy(retryStrategy(config)); + if (config.proxyHost() != null) { + URI proxyUri = URI.create(String.format( + "%s://%s:%d", config.proxyScheme(), config.proxyHost(), config.proxyPort())); + log.info("Using proxy " + proxyUri); + feedClientBuilder.setProxy(proxyUri); + } onFeedClientInitialization(feedClientBuilder); return feedClientBuilder.build(); diff --git a/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaConfiguration.java b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaConfiguration.java index 1421a3fcd43..715546fe6fe 100644 --- a/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaConfiguration.java +++ b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaConfiguration.java @@ -16,6 +16,7 @@ public class VespaConfiguration { public static final String USE_SSL = "vespa.feed.ssl"; public static final String PROXY_HOST = "vespa.feed.proxy.host"; public static final String PROXY_PORT = "vespa.feed.proxy.port"; + public static final String PROXY_SCHEME = "vespa.feed.proxy.scheme"; public static final String DRYRUN = "vespa.feed.dryrun"; public static final String USE_COMPRESSION = "vespa.feed.usecompression"; public static final String DATA_FORMAT = "vespa.feed.data.format"; @@ -71,6 +72,13 @@ public class VespaConfiguration { } + public String proxyScheme() { + String raw = getString(PROXY_SCHEME); + if (raw == null) return "http"; + return raw; + } + + public boolean dryrun() { return getBoolean(DRYRUN, false); } @@ -186,6 +194,7 @@ public class VespaConfiguration { sb.append(USE_SSL + ": " + useSSL().map(Object::toString).orElse("<empty>") + "\n"); sb.append(PROXY_HOST + ": " + proxyHost() + "\n"); sb.append(PROXY_PORT + ": " + proxyPort() + "\n"); + sb.append(PROXY_SCHEME + ": " + proxyScheme() + "\n"); sb.append(DRYRUN + ": " + dryrun() +"\n"); sb.append(USE_COMPRESSION + ": " + useCompression() +"\n"); sb.append(DATA_FORMAT + ": " + dataFormat() +"\n"); |