github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-06-30 18:33:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix merge fumble

Browse source
This commit is contained in:
Rory Hunter 2021-09-01 12:08:21 +01:00
parent eff6cd69e6
commit 722a71bc02
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
server/src/test/java/org/elasticsearch/monitor/os/OsProbeTests.java
View file

@ -315,7 +315,7 @@ public class OsProbeTests extends ESTestCase {
// It doesn't really matter if cgroupsVersion == 0 here // It doesn't really matter if cgroupsVersion == 0 here
if (cgroupsVersion == 2) { if (cgroupsVersion == 2) {
return List.of("0::/" + hierarchy); return org.elasticsearch.core.List.of("0::/" + hierarchy);
} }
return Arrays.asList( return Arrays.asList(
@ -430,7 +430,7 @@ public class OsProbeTests extends ESTestCase {
@Override @Override
List<String> readCgroupV2CpuStats(String controlGroup) { List<String> readCgroupV2CpuStats(String controlGroup) {
assertThat(controlGroup, equalTo("/" + hierarchy)); assertThat(controlGroup, equalTo("/" + hierarchy));
return List.of( return org.elasticsearch.core.List.of(
"usage_usec 364869866063112", "usage_usec 364869866063112",
"user_usec 34636", "user_usec 34636",
"system_usec 9896", "system_usec 9896",
@ -453,7 +453,7 @@ public class OsProbeTests extends ESTestCase {
final String hierarchy, final String hierarchy,
List<String> procSelfCgroupLines List<String> procSelfCgroupLines
) { ) {
return buildStubOsProbe(areCgroupStatsAvailable, hierarchy, procSelfCgroupLines, org.elasticsearch.core.List.of()); return buildStubOsProbe(availableCgroupsVersion, hierarchy, procSelfCgroupLines, org.elasticsearch.core.List.of());
} }
} }