diff options
| author | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-04-06 00:36:47 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-04-06 00:36:47 +0200 |
| commit | 0628240875e40a87325f04b9b6820b5ca38a18fc (patch) | |
| tree | 6a660a08ca372efec46d3e87a7cb90dbae1f954c /config-application-package | |
| parent | 05ad9689ffc3a5f439a66e5117c65119838db8d6 (diff) | |
Region overrides implies environment=prod
Diffstat (limited to 'config-application-package')
2 files changed, 4 insertions, 2 deletions
diff --git a/config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java b/config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java index 1e77ad1a8f7..c1a3b75c3a1 100644 --- a/config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java +++ b/config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java @@ -120,7 +120,8 @@ class OverrideProcessor implements PreProcessor { Element child = elemIt.next(); Optional<Environment> env = getEnvironment(child); RegionName reg = getRegion(child); - if ((env.isPresent() && !environment.equals(env.get())) || (!reg.isDefault() && !region.equals(reg))) { + if ((env.isPresent() && !environment.equals(env.get())) || + (!reg.isDefault() && (!region.equals(reg) || !environment.equals(Environment.prod)))) { parent.removeChild(child); elemIt.remove(); } diff --git a/config-application-package/src/test/java/com/yahoo/config/application/OverrideProcessorTest.java b/config-application-package/src/test/java/com/yahoo/config/application/OverrideProcessorTest.java index 41b69e9a7aa..adced18bb85 100644 --- a/config-application-package/src/test/java/com/yahoo/config/application/OverrideProcessorTest.java +++ b/config-application-package/src/test/java/com/yahoo/config/application/OverrideProcessorTest.java @@ -268,7 +268,8 @@ public class OverrideProcessorTest { " <document mode=\"index\" type=\"music2\"/>" + " </documents>" + " <nodes>" + - " <node distribution-key=\"0\" hostalias=\"node1\"/>" + + // node1 is specified for us-west but does not match because region overrides implies environment=prod + " <node distribution-key=\"0\" hostalias=\"node0\"/>" + " </nodes>" + " </content>" + " <jdisc id=\"stateless\" version=\"1.0\">" + |