diff options
| author | Harald Musum <musum@oath.com> | 2018-10-22 21:17:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-22 21:17:10 +0200 |
| commit | 0cb728da217126017bd1e8af6ab67325aec1c190 (patch) | |
| tree | bb1686dcdd2a5801342a2cb57834ddf855dded9c /node-repository | |
| parent | ef3e85efcef79bc316c1e8777d2d3e06b760918c (diff) | |
| parent | 8b6792e9bfd9c82a99ae9d8e6b6851b9cf90549e (diff) | |
Merge pull request #7396 from vespa-engine/hmusum/fix-logging
More logging when adding docker node fails
Diffstat (limited to 'node-repository')
2 files changed, 6 insertions, 3 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 8c3e3e28777..b0e1632002b 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 @@ -291,7 +291,8 @@ public class NodeRepository extends AbstractComponent { Optional<Node> existing = getNode(node.hostname()); if (existing.isPresent()) throw new IllegalArgumentException("Cannot add " + node.hostname() + ": A node with this name already exists (" + - node + ", " + node.history() + ")"); + existing.get() + ", " + existing.get().history() + "). Node to be added: " + + node + ", " + node.history()); } try (Mutex lock = lockUnallocated()) { return db.addNodesInState(nodes, Node.State.reserved); diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java index fd28975bfad..f8067cb8661 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java @@ -13,6 +13,7 @@ import com.yahoo.config.provision.NodeFlavors; import com.yahoo.config.provision.NodeType; import com.yahoo.config.provision.ProvisionLogger; import com.yahoo.config.provision.Provisioner; +import com.yahoo.config.provision.SystemName; import com.yahoo.config.provision.Zone; import com.yahoo.log.LogLevel; import com.yahoo.transaction.NestedTransaction; @@ -73,8 +74,9 @@ public class NodeRepositoryProvisioner implements Provisioner { throw new IllegalArgumentException("Requested " + requestedCapacity.nodeCount() + " nodes in " + wantedGroups + " groups, " + "which doesn't allow the nodes to be divided evenly into groups"); - log.log(LogLevel.DEBUG, () -> "Received deploy prepare request for " + requestedCapacity + " in " + - wantedGroups + " groups for application " + application + ", cluster " + cluster); + log.log(zone.system() == SystemName.cd ? Level.INFO : LogLevel.DEBUG, + () -> "Received deploy prepare request for " + requestedCapacity + " in " + + wantedGroups + " groups for application " + application + ", cluster " + cluster); int effectiveGroups; NodeSpec requestedNodes; |