diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2021-01-27 08:19:17 +0100 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2021-01-27 08:19:17 +0100 |
commit | c60c8eda6c469854167e625335e360d78d6b4f42 (patch) | |
tree | 77eb3b85cd298891b69f9102c41529bf680a4388 | |
parent | ce2849c7dde877da40c81a2370e038812b3831fa (diff) |
Address review
3 files changed, 12 insertions, 5 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java index 6b293c955ca..095434c8e04 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java @@ -103,8 +103,11 @@ public class ContentClusterTest extends ContentBaseTest { DistributionConfig.Builder distributionBuilder = new DistributionConfig.Builder(); cc.getConfig(distributionBuilder); DistributionConfig distributionConfig = distributionBuilder.build(); + assertEquals(3, distributionConfig.cluster("storage").ready_copies()); + assertEquals(15, distributionConfig.cluster("storage").initial_redundancy()); assertEquals(15, distributionConfig.cluster("storage").redundancy()); assertEquals(4, distributionConfig.cluster("storage").group().size()); + assertEquals(1, distributionConfig.cluster().size()); StorDistributionConfig.Builder storBuilder = new StorDistributionConfig.Builder(); cc.getConfig(storBuilder); @@ -143,6 +146,8 @@ public class ContentClusterTest extends ContentBaseTest { DistributionConfig.Builder distributionBuilder = new DistributionConfig.Builder(); cc.getConfig(distributionBuilder); DistributionConfig distributionConfig = distributionBuilder.build(); + assertEquals(3, distributionConfig.cluster("storage").ready_copies()); + assertEquals(4, distributionConfig.cluster("storage").initial_redundancy()); assertEquals(5, distributionConfig.cluster("storage").redundancy()); StorDistributionConfig.Builder storBuilder = new StorDistributionConfig.Builder(); diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentProtocol.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentProtocol.java index 9a889f72115..0ce83a3c204 100755 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentProtocol.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentProtocol.java @@ -261,8 +261,10 @@ public class DocumentProtocol implements Protocol { DocumentProtocolPoliciesConfig policiesConfig, DistributionConfig distributionConfig) { if (docMan != null) this.docMan = docMan; - else - DocumentTypeManagerConfigurer.configure(this.docMan = new DocumentTypeManager(), configId); + else { + this.docMan = new DocumentTypeManager(); + DocumentTypeManagerConfigurer.configure(this.docMan, configId); + } this.routableRepository = new RoutableRepository(set); // When adding factories to this list, please KEEP THEM ORDERED alphabetically like they are now. diff --git a/vdslib/src/main/java/com/yahoo/vdslib/distribution/Distribution.java b/vdslib/src/main/java/com/yahoo/vdslib/distribution/Distribution.java index 393c7ab7697..accf3942e4d 100644 --- a/vdslib/src/main/java/com/yahoo/vdslib/distribution/Distribution.java +++ b/vdslib/src/main/java/com/yahoo/vdslib/distribution/Distribution.java @@ -166,9 +166,9 @@ public class Distribution { configure(config); } - private long lastNBits(long value, int n) { - if (n < 0 || n > 64) - throw new IllegalArgumentException("n must be in [0, 64], but was " + n); + private static long lastNBits(long value, int n) { + if (n < 0 || n > 63) + throw new IllegalArgumentException("n must be in [0, 63], but was " + n); return value & ((1L << n) - 1); } |