diff options
Diffstat (limited to 'clustercontroller-core')
28 files changed, 29 insertions, 30 deletions
diff --git a/clustercontroller-core/OWNERS b/clustercontroller-core/OWNERS index b5f3398d1a0..abe8e49c8d6 100644 --- a/clustercontroller-core/OWNERS +++ b/clustercontroller-core/OWNERS @@ -1,3 +1,3 @@ vekterli -hakon +hakonhall bratseth diff --git a/clustercontroller-core/pom.xml b/clustercontroller-core/pom.xml index a010d88915b..93317a54dec 100644 --- a/clustercontroller-core/pom.xml +++ b/clustercontroller-core/pom.xml @@ -6,7 +6,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>clustercontroller-core</artifactId> <version>6-SNAPSHOT</version> diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterInfo.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterInfo.java index 19f8f81c628..4274b8098d1 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterInfo.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterInfo.java @@ -17,7 +17,7 @@ import java.util.TreeMap; /** * Detail information about the current state of all the distributor and storage nodes of the cluster. * - * @author hakon + * @author hakonhall * @author bratseth */ public class ClusterInfo { diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterStateView.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterStateView.java index 3444f4c2540..328acfb4dbe 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterStateView.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterStateView.java @@ -22,7 +22,7 @@ import java.util.logging.Logger; * are mostly represented by the ClusterState. The dynamic parts include stats for tracking outstanding * merges before steady-state is reached. * - * @author hakon + * @author hakonhall * @since 5.33 */ public class ClusterStateView { diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterStatsAggregator.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterStatsAggregator.java index a52034d10a2..4c0b582c3d3 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterStatsAggregator.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterStatsAggregator.java @@ -29,7 +29,7 @@ import com.yahoo.log.LogLevel; * for a given storage nodes. So we need to keep track of the latest info * from each distributor. * - * @author hakon + * @author hakonhall * @since 5.34 */ public class ClusterStatsAggregator { diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/DistributorNodeInfo.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/DistributorNodeInfo.java index 32c68aff083..1884dee5863 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/DistributorNodeInfo.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/DistributorNodeInfo.java @@ -11,7 +11,7 @@ import com.yahoo.vespa.clustercontroller.core.hostinfo.StorageNodeStatsBridge; * Class encapsulating what the Cluster Controller knows about a distributor node. Most of the information is * common between Storage- and Distributor- nodes, and stored in the base class NodeInfo. * - * @author hakon + * @author hakonhall */ public class DistributorNodeInfo extends NodeInfo { diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/LatencyStats.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/LatencyStats.java index 482bfbf6004..6cdbb50e1eb 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/LatencyStats.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/LatencyStats.java @@ -3,7 +3,7 @@ package com.yahoo.vespa.clustercontroller.core; /** * LatencyStats handles adding latencies and counts. - * @author hakon + * @author hakonhall */ public class LatencyStats { diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/MetricUpdater.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/MetricUpdater.java index ce6686c3ad9..433df4c2249 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/MetricUpdater.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/MetricUpdater.java @@ -81,11 +81,11 @@ public class MetricUpdater { } public void recordNewNodeEvent() { - // TODO(hakon): Replace add() with a persistent aggregate metric. + // TODO(hakonhall): Replace add() with a persistent aggregate metric. metricReporter.add("node-event", 1); } public void updateMergeOpMetrics(Map<String, NodeMergeStats> storageNodeStats) { - // TODO(hakon): Remove this method once we figure out how to propagate metrics to state HTTP API. + // TODO(hakonhall): Remove this method once we figure out how to propagate metrics to state HTTP API. } } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeMergeStats.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeMergeStats.java index 67f11574c5b..22d9fc0cac8 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeMergeStats.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeMergeStats.java @@ -4,7 +4,7 @@ package com.yahoo.vespa.clustercontroller.core; import com.yahoo.vespa.clustercontroller.core.hostinfo.StorageNode; /** - * @author hakon + * @author hakonhall * @since 5.33 */ public class NodeMergeStats { diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeStateChangeChecker.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeStateChangeChecker.java index 12018ac4b6f..df0d2f78c61 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeStateChangeChecker.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeStateChangeChecker.java @@ -14,7 +14,7 @@ import java.util.List; /** * Checks if a node can be upgraded. * - * @author dybdahl + * @author dybis */ public class NodeStateChangeChecker { diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StatsForStorageNodes.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StatsForStorageNodes.java index a7e34c7321f..186d78f35e4 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StatsForStorageNodes.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StatsForStorageNodes.java @@ -8,7 +8,7 @@ import java.util.Map; * by Distributors from their getnodestate RPCs. The stats for a single storage node * is represented by the StorageNodeStats class. * - * @author hakon + * @author hakonhall */ public class StatsForStorageNodes { diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StorageMergeStats.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StorageMergeStats.java index 2c719f9fb3c..40f704922fe 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StorageMergeStats.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StorageMergeStats.java @@ -9,7 +9,7 @@ import java.util.Set; /** * Class for storing the pending merge operation stats for all the storage nodes. * - * @author hakon + * @author hakonhall * @since 5.34 */ public class StorageMergeStats implements Iterable<NodeMergeStats> { diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StorageNodeInfo.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StorageNodeInfo.java index 86f8be36a9d..1cafdd1ed0f 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StorageNodeInfo.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StorageNodeInfo.java @@ -9,7 +9,7 @@ import com.yahoo.vdslib.state.NodeType; * Class encapsulating what the Cluster Controller knows about a storage node. Most of the information is * common between Storage- and Distributor- nodes, and stored in the base class NodeInfo. * - * @author hakon + * @author hakonhall */ public class StorageNodeInfo extends NodeInfo { diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StorageNodeStats.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StorageNodeStats.java index c46e489453b..5b87b86bc0f 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StorageNodeStats.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StorageNodeStats.java @@ -4,7 +4,7 @@ package com.yahoo.vespa.clustercontroller.core; /** * Contains stats related to a single storage node. * - * @author hakon + * @author hakonhall */ public class StorageNodeStats { diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StorageNodeStatsContainer.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StorageNodeStatsContainer.java index bb01bf80d77..ca8fcfb97ea 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StorageNodeStatsContainer.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StorageNodeStatsContainer.java @@ -9,7 +9,7 @@ import java.util.Map; * by Distributors from their getnodestate RPCs. The stats for a single storage node * is represented by the StorageNodeStats class. * - * @author hakon + * @author hakonhall */ public class StorageNodeStatsContainer { diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/MasterDataGatherer.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/MasterDataGatherer.java index 69c5e10246c..21c4a7f677b 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/MasterDataGatherer.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/MasterDataGatherer.java @@ -84,7 +84,7 @@ public class MasterDataGatherer { private class DirCallback implements AsyncCallback.ChildrenCallback { public void processResult(int version, String path, Object context, List<String> nodes) { if (nodes == null) nodes = new LinkedList<String>(); - log.log(LogLevel.DEBUG, "Fleetcontroller " + nodeIndex + ": Got node list response from " + path + " version " + version + " with " + nodes.size() + " nodes"); + log.log(LogLevel.INFO, "Fleetcontroller " + nodeIndex + ": Got node list response from " + path + " version " + version + " with " + nodes.size() + " nodes"); // Detect what nodes are added and what nodes have been removed. Others can be ignored. List<Integer> addedNodes = new LinkedList<Integer>(); synchronized (nextMasterData) { @@ -103,7 +103,7 @@ public class MasterDataGatherer { nextMasterData.remove(index); } for (Integer index : addedNodes) { - log.log(LogLevel.DEBUG, "Fleetcontroller " + nodeIndex + ": Attempting to fetch data in node '" + zooKeeperRoot + index + "' to see vote"); + log.log(LogLevel.INFO, "Fleetcontroller " + nodeIndex + ": Attempting to fetch data in node '" + zooKeeperRoot + index + "' to see vote"); nextMasterData.put(index, null); session.getData(zooKeeperRoot + "indexes/" + index, changeWatcher, nodeListener, null); } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/Distributor.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/Distributor.java index c48c203a55c..28bb10c4a98 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/Distributor.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/Distributor.java @@ -8,7 +8,7 @@ import java.util.List; /** * Class for handling Distributor part of HostInfo. - * @author dybdahl + * @author dybis */ public class Distributor { diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/HostInfo.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/HostInfo.java index fbc53128415..fd7c4db30b8 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/HostInfo.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/HostInfo.java @@ -11,7 +11,7 @@ import java.util.logging.Logger; /** * Parsing and keeping of host info from nodes. - * @author dybdahl + * @author dybis */ public class HostInfo { diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/Metrics.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/Metrics.java index 23c502063a6..b2924516f26 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/Metrics.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/Metrics.java @@ -9,7 +9,7 @@ import java.util.List; /** * Keeper for Metrics for HostInfo. - * @author dybdahl + * @author dybis */ public class Metrics { diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/StorageNode.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/StorageNode.java index 4a8cff2d5bb..c208c0a3e19 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/StorageNode.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/StorageNode.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; /** * Keeping information about a storage node seen from the distributor. - * @author dybdahl + * @author dybis */ public class StorageNode { diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/StorageNodeStatsBridge.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/StorageNodeStatsBridge.java index ed4664c5b44..980a8b4681f 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/StorageNodeStatsBridge.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/StorageNodeStatsBridge.java @@ -13,7 +13,7 @@ import java.util.Map; /** * Class used to create a StorageNodeStatsContainer from HostInfo. - * @author hakon + * @author hakonhall */ public class StorageNodeStatsBridge { diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/Vtag.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/Vtag.java index b4d445c1844..c18be1cea64 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/Vtag.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/Vtag.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; /** * Class for handling version. - * @author dybdahl + * @author dybis */ public class Vtag { diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterStateViewTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterStateViewTest.java index a62a8676096..8583f57935b 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterStateViewTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterStateViewTest.java @@ -14,7 +14,7 @@ import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.*; /** - * @author hakon + * @author hakonhall * @since 5.34 */ public class ClusterStateViewTest { diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterStatsAggregatorTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterStatsAggregatorTest.java index e87cad135c8..eab5f3ac0da 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterStatsAggregatorTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterStatsAggregatorTest.java @@ -14,7 +14,7 @@ import static org.mockito.Matchers.any; import static org.mockito.Mockito.*; /** - * @author hakon + * @author hakonhall * @since 5.34 */ @RunWith(MockitoJUnitRunner.class) diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StatsForStorageNodeTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StatsForStorageNodeTest.java index ddf0286b0fe..8cb62beda15 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StatsForStorageNodeTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StatsForStorageNodeTest.java @@ -11,7 +11,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; /** - * @author hakon + * @author hakonhall */ public class StatsForStorageNodeTest { @Test diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StorageNodeStatsContainerTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StorageNodeStatsContainerTest.java index e2832c5b6b9..958218c3585 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StorageNodeStatsContainerTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StorageNodeStatsContainerTest.java @@ -11,7 +11,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; /** - * @author hakon + * @author hakonhall */ public class StorageNodeStatsContainerTest { @Test diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StorageNodeStatsTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StorageNodeStatsTest.java index b905cd32979..d75fabbbb94 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StorageNodeStatsTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StorageNodeStatsTest.java @@ -6,7 +6,7 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; /** - * @author hakon + * @author hakonhall */ public class StorageNodeStatsTest { @Test diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/hostinfo/StorageNodeStatsBridgeTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/hostinfo/StorageNodeStatsBridgeTest.java index 9d23031cd55..77e2c771f41 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/hostinfo/StorageNodeStatsBridgeTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/hostinfo/StorageNodeStatsBridgeTest.java @@ -19,7 +19,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; /** - * @author hakon + * @author hakonhall */ public class StorageNodeStatsBridgeTest { |