diff options
| author | Jon Marius Venstad <venstad@gmail.com> | 2020-11-26 10:20:27 +0100 |
|---|---|---|
| committer | Jon Marius Venstad <venstad@gmail.com> | 2020-11-26 10:20:42 +0100 |
| commit | 3f6c8f625342d3cbd9e145e135e6b127286fb23d (patch) | |
| tree | 5e9c405247b743371a17033c831ef3cec98915ad /config-model | |
| parent | 4429843d149d0f5761ec2fb92b342bc66bc3871b (diff) | |
Non-functional changes
Diffstat (limited to 'config-model')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/content/Redundancy.java | 1 | ||||
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java | 25 |
2 files changed, 13 insertions, 13 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/Redundancy.java b/config-model/src/main/java/com/yahoo/vespa/model/content/Redundancy.java index aa9b04d084d..655ee1d1d57 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/Redundancy.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/Redundancy.java @@ -48,6 +48,7 @@ public class Redundancy implements StorDistributionConfig.Producer, ProtonConfig builder.redundancy(effectiveFinalRedundancy()); builder.ready_copies(effectiveReadyCopies()); } + @Override public void getConfig(ProtonConfig.Builder builder) { ProtonConfig.Distribution.Builder distBuilder = new ProtonConfig.Distribution.Builder(); diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java index 16ccbad00c0..8ae895b0695 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java @@ -582,20 +582,19 @@ public class ContentCluster extends AbstractConfigProducer implements @Override public void getConfig(MessagetyperouteselectorpolicyConfig.Builder builder) { - if (!getSearch().hasIndexedCluster()) return; - builder. - defaultroute(com.yahoo.vespa.model.routing.DocumentProtocol.getDirectRouteName(getConfigId())). - route(new MessagetyperouteselectorpolicyConfig.Route.Builder(). - messagetype(DocumentProtocol.MESSAGE_PUTDOCUMENT). - name(com.yahoo.vespa.model.routing.DocumentProtocol.getIndexedRouteName(getConfigId()))). - route(new MessagetyperouteselectorpolicyConfig.Route.Builder(). - messagetype(DocumentProtocol.MESSAGE_REMOVEDOCUMENT). - name(com.yahoo.vespa.model.routing.DocumentProtocol.getIndexedRouteName(getConfigId()))). - route(new MessagetyperouteselectorpolicyConfig.Route.Builder(). - messagetype(DocumentProtocol.MESSAGE_UPDATEDOCUMENT). - name(com.yahoo.vespa.model.routing.DocumentProtocol.getIndexedRouteName(getConfigId()))); + if ( ! getSearch().hasIndexedCluster()) return; + builder.defaultroute(com.yahoo.vespa.model.routing.DocumentProtocol.getDirectRouteName(getConfigId())) + .route(new MessagetyperouteselectorpolicyConfig.Route.Builder() + .messagetype(DocumentProtocol.MESSAGE_PUTDOCUMENT) + .name(com.yahoo.vespa.model.routing.DocumentProtocol.getIndexedRouteName(getConfigId()))) + .route(new MessagetyperouteselectorpolicyConfig.Route.Builder() + .messagetype(DocumentProtocol.MESSAGE_REMOVEDOCUMENT) + .name(com.yahoo.vespa.model.routing.DocumentProtocol.getIndexedRouteName(getConfigId()))) + .route(new MessagetyperouteselectorpolicyConfig.Route.Builder() + .messagetype(DocumentProtocol.MESSAGE_UPDATEDOCUMENT) + .name(com.yahoo.vespa.model.routing.DocumentProtocol.getIndexedRouteName(getConfigId()))); } - + public com.yahoo.vespa.model.content.StorageGroup getRootGroup() { return rootGroup; } |