Also allow for testing of the adaptive task executor.

2 files changed, 2 insertions, 1 deletions

diff --git a/searchcore/src/vespa/searchcore/config/proton.def b/searchcore/src/vespa/searchcore/config/proton.def
index 6040fc651c2..9434fe7d7ff 100644
--- a/searchcore/src/vespa/searchcore/config/proton.def
+++ b/searchcore/src/vespa/searchcore/config/proton.def
@@ -119,7 +119,7 @@ indexing.threads int default=1 restart
 
 ## Option to specify what is most important during indexing.
 ## This is experimental and will most likely be temporary.
-indexing.optimize enum {LATENCY, THROUGHPUT} default=LATENCY restart
+indexing.optimize enum {LATENCY, THROUGHPUT, ADAPTIVE} default=LATENCY restart
 
 ## Maximum number of pending operations for each of the internal
 ## indexing threads.  Only used when visibility delay is zero.
diff --git a/searchcore/src/vespa/searchcore/proton/server/threading_service_config.cpp b/searchcore/src/vespa/searchcore/proton/server/threading_service_config.cpp
index 5bc6ef543f3..e95920ca606 100644
--- a/searchcore/src/vespa/searchcore/proton/server/threading_service_config.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/threading_service_config.cpp
@@ -39,6 +39,7 @@ selectOptimization(ProtonConfig::Indexing::Optimize optimize) {
     switch (optimize) {
         case CfgOptimize::LATENCY: return OptimizeFor::LATENCY;
         case CfgOptimize::THROUGHPUT: return OptimizeFor::THROUGHPUT;
+        case CfgOptimize::ADAPTIVE: return OptimizeFor::ADAPTIVE;
     }
     return OptimizeFor::LATENCY;
 }