1 files changed, 7 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
index 6b6192a04ef..5adea6d50e8 100755
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
@@ -412,6 +412,8 @@ public abstract class ContainerCluster<CONTAINER extends Container>
 
     @Override
     public void getConfig(DocumentmanagerConfig.Builder builder) {
+        if (containerDocproc != null && containerDocproc.isCompressDocuments())
+            builder.enablecompression(true);
         if (containerDocumentApi != null)
             builder.ignoreundefinedfields(containerDocumentApi.ignoreUndefinedFields());
     }
@@ -537,7 +539,9 @@ public abstract class ContainerCluster<CONTAINER extends Container>
 
     @Override
     public void getConfig(IlscriptsConfig.Builder builder) {
-        for (SearchCluster searchCluster : Content.getSearchClusters(getRoot().configModelRepo())) {
+        List<SearchCluster> searchClusters = new ArrayList<>();
+        searchClusters.addAll(Content.getSearchClusters(getRoot().configModelRepo()));
+        for (SearchCluster searchCluster : searchClusters) {
             searchCluster.getConfig(builder);
         }
     }
@@ -609,6 +613,8 @@ public abstract class ContainerCluster<CONTAINER extends Container>
 
     public void setEnvironmentVars(String environmentVars) { this.environmentVars = environmentVars; }
 
+    public String getEnvironmentVars() { return environmentVars; }
+
     public Optional<String> getJvmGCOptions() { return Optional.ofNullable(jvmGCOptions); }
 
     public final void setRpcServerEnabled(boolean rpcServerEnabled) { this.rpcServerEnabled = rpcServerEnabled; }