From 5bf3b7054c73ace58ceab8d7980e7721c6946f44 Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Tue, 17 May 2016 20:51:54 -0400 Subject: [PATCH] Fix compilation from FsInfo# change in core This commit fixes some test compilation issues due to upstream changes in core that added I/O statistics on Linux. Original commit: elastic/x-pack-elasticsearch@a0877aa0aa90bb0a6b410a57bb2c0d6f2819c600 --- .../agent/resolver/cluster/ClusterStatsResolverTests.java | 2 +- .../marvel/agent/resolver/node/NodeStatsResolverTests.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/agent/resolver/cluster/ClusterStatsResolverTests.java b/elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/agent/resolver/cluster/ClusterStatsResolverTests.java index 12a82894e3e..80beba90765 100644 --- a/elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/agent/resolver/cluster/ClusterStatsResolverTests.java +++ b/elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/agent/resolver/cluster/ClusterStatsResolverTests.java @@ -128,7 +128,7 @@ public class ClusterStatsResolverTests extends MonitoringIndexNameResolverTestCa statsByShard.put(index, Collections.singletonList(new IndexShardStats(new ShardId(index, 0), randomShardStats()))); return new NodeStats(new DiscoveryNode("node_0", DummyTransportAddress.INSTANCE, emptyMap(), emptySet(), Version.CURRENT), 0, new NodeIndicesStats(new CommonStats(), statsByShard), null, null, null, null, - new FsInfo(0, pathInfo), null, null, null, null, null, null); + new FsInfo(0, null, pathInfo), null, null, null, null, null, null); } /** diff --git a/elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/agent/resolver/node/NodeStatsResolverTests.java b/elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/agent/resolver/node/NodeStatsResolverTests.java index a2a6c7aa229..f9ff1b162a5 100644 --- a/elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/agent/resolver/node/NodeStatsResolverTests.java +++ b/elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/agent/resolver/node/NodeStatsResolverTests.java @@ -137,6 +137,6 @@ public class NodeStatsResolverTests extends MonitoringIndexNameResolverTestCase< new NodeIndicesStats(new CommonStats(), statsByShard), OsProbe.getInstance().osStats(), ProcessProbe.getInstance().processStats(), JvmStats.jvmStats(), new ThreadPoolStats(threadPoolStats), - new FsInfo(0, pathInfo), null, null, null, null, null, null); + new FsInfo(0, null, pathInfo), null, null, null, null, null, null); } }