diff options
| author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-09-11 17:21:26 +0200 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-09-11 17:21:26 +0200 |
| commit | 3f55e908a2492945fc512fb258cae00865ad0dca (patch) | |
| tree | 8d9f9a31afa5f33f636330ccfd744cf4aaae13f1 /node-repository | |
| parent | 05c46525cb5637a15a44382700b7575b0aa21237 (diff) | |
Let tenant nodes trust all parents
Diffstat (limited to 'node-repository')
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java index a237b09b6dd..d924ff6caec 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java @@ -229,8 +229,14 @@ public class NodeRepository extends AbstractComponent { // Tenant nodes in other states than ready, trust: // - config servers // - proxy nodes + // - parents of the nodes in the same application: If some of the nodes are on a different IP versions + // or only a subset of them are dual-stacked, the communication between the nodes may be NATed + // with via parent's IP address. trustedNodes.addAll(candidates.nodeType(NodeType.config).asList()); trustedNodes.addAll(candidates.nodeType(NodeType.proxy).asList()); + node.allocation().ifPresent(allocation -> + trustedNodes.addAll(candidates.parentsOf(candidates.owner(allocation.owner()).asList()).asList())); + if (node.state() == Node.State.ready) { // Tenant nodes in state ready, trust: // - All tenant nodes in zone. When a ready node is allocated to a an application there's a brief |