2 files changed, 5 insertions, 1 deletions
diff --git a/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaOutputFormat.java b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaOutputFormat.java
index 74f23e8cc6a..97bc7dc838e 100644
--- a/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaOutputFormat.java
+++ b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaOutputFormat.java
@@ -35,7 +35,9 @@ public class VespaOutputFormat extends OutputFormat {
     public RecordWriter getRecordWriter(TaskAttemptContext context) throws IOException, InterruptedException {
         VespaCounters counters = VespaCounters.get(context);
         VespaConfiguration configuration = VespaConfiguration.get(context.getConfiguration(), configOverride);
-        return new LegacyVespaRecordWriter(configuration, counters);
+        return configuration.useLegacyClient()
+                ? new LegacyVespaRecordWriter(configuration, counters)
+                : new VespaRecordWriter(configuration, counters);
     }
 
 
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 2a1179dbec6..7219e621486 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
@@ -27,6 +27,7 @@ public class VespaConfiguration {
     public static final String MAX_IN_FLIGHT_REQUESTS = "vespa.feed.max.in.flight.requests";
     public static final String RANDOM_STARTUP_SLEEP = "vespa.feed.random.startup.sleep.ms";
     public static final String NUM_RETRIES = "vespa.feed.num.retries";
+    public static final String USE_LEGACY_CLIENT = "vespa.feed.uselegacyclient";
 
     private final Configuration conf;
     private final Properties override;
@@ -130,6 +131,7 @@ public class VespaConfiguration {
         return getInt(PROGRESS_REPORT, 1000);
     }
 
+    public boolean useLegacyClient() { return getBoolean(USE_LEGACY_CLIENT, true); }
 
     public String getString(String name) {
         if (override != null && override.containsKey(name)) {