diff options
4 files changed, 22 insertions, 22 deletions
diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/CoreCollector.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/CoreCollector.java index eb77e75ce66..86ef43b5bea 100644 --- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/CoreCollector.java +++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/CoreCollector.java @@ -39,11 +39,11 @@ public class CoreCollector { this.processExecuter = processExecuter; } - List<String> readYinstState(Path yinstStatePath) throws IOException { - Pair<Integer, String> result = processExecuter.exec(new String[]{"cat", yinstStatePath.toString()}); + List<String> readInstallState(Path installStatePath) throws IOException { + Pair<Integer, String> result = processExecuter.exec(new String[]{"cat", installStatePath.toString()}); if (result.getFirst() != 0) { - throw new RuntimeException("Failed to read yinst state file at: " + yinstStatePath + ", result: " + result); + throw new RuntimeException("Failed to read install state file at: " + installStatePath + ", result: " + result); } return Arrays.asList(result.getSecond().split("\n")); } @@ -98,7 +98,7 @@ public class CoreCollector { return Arrays.asList(result.getSecond().split("\n")); } - Map<String, Object> collect(Path coredumpPath, Optional<Path> yinstStatePath) { + Map<String, Object> collect(Path coredumpPath, Optional<Path> installStatePath) { Map<String, Object> data = new LinkedHashMap<>(); try { coredumpPath = compressCoredump(coredumpPath); @@ -116,11 +116,11 @@ public class CoreCollector { logger.log(Level.WARNING, "Failed to extract backtrace", e); } - yinstStatePath.ifPresent(yinstState -> { + installStatePath.ifPresent(installState -> { try { - data.put("yinst_state", readYinstState(yinstState)); + data.put("yinst_state", readInstallState(installState)); } catch (Exception e) { - logger.log(Level.WARNING, "Failed to read yinst state", e); + logger.log(Level.WARNING, "Failed to read install state", e); } try { diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/CoredumpHandler.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/CoredumpHandler.java index 816391660d4..54b9898972a 100644 --- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/CoredumpHandler.java +++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/CoredumpHandler.java @@ -40,17 +40,17 @@ public class CoredumpHandler { private final Path coredumpsPath; private final Path doneCoredumpsPath; private final Map<String, Object> nodeAttributes; - private final Optional<Path> yinstStatePath; + private final Optional<Path> installStatePath; private final String feedEndpoint; public CoredumpHandler(HttpClient httpClient, CoreCollector coreCollector, Path coredumpsPath, Path doneCoredumpsPath, - Map<String, Object> nodeAttributes, Optional<Path> yinstStatePath, String feedEndpoint) { + Map<String, Object> nodeAttributes, Optional<Path> installStatePath, String feedEndpoint) { this.httpClient = httpClient; this.coreCollector = coreCollector; this.coredumpsPath = coredumpsPath; this.doneCoredumpsPath = doneCoredumpsPath; this.nodeAttributes = nodeAttributes; - this.yinstStatePath = yinstStatePath; + this.installStatePath = installStatePath; this.feedEndpoint = feedEndpoint; } @@ -124,7 +124,7 @@ public class CoredumpHandler { if (!Files.exists(metadataPath)) { Path coredumpPath = Files.list(coredumpDirectory).findFirst() .orElseThrow(() -> new RuntimeException("No coredump file found in processing directory " + coredumpDirectory)); - Map<String, Object> metadata = coreCollector.collect(coredumpPath, yinstStatePath); + Map<String, Object> metadata = coreCollector.collect(coredumpPath, installStatePath); metadata.putAll(nodeAttributes); Map<String, Object> fields = new HashMap<>(); diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/Maintainer.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/Maintainer.java index 3ee22bf1e49..0cda14ba397 100644 --- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/Maintainer.java +++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/Maintainer.java @@ -142,12 +142,12 @@ public class Maintainer { Path coredumpsPath = Paths.get(getFieldOrFail(arguments, "coredumpsPath").asString()); Path doneCoredumpsPath = Paths.get(getFieldOrFail(arguments, "doneCoredumpsPath").asString()); Map<String, Object> attributesMap = parseMap(arguments); - Optional<Path> yinstStatePath = SlimeUtils.optionalString(arguments.field("yinstStatePath")).map(Paths::get); + Optional<Path> installStatePath = SlimeUtils.optionalString(arguments.field("yinstStatePath")).map(Paths::get); String feedEndpoint = getFieldOrFail(arguments, "feedEndpoint").asString(); try { CoredumpHandler coredumpHandler = new CoredumpHandler(httpClient, coreCollector, coredumpsPath, - doneCoredumpsPath, attributesMap, yinstStatePath, + doneCoredumpsPath, attributesMap, installStatePath, feedEndpoint); coredumpHandler.processAll(); } catch (IOException e) { diff --git a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/maintainer/CoreCollectorTest.java b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/maintainer/CoreCollectorTest.java index c2e6a274dd1..b63871955d2 100644 --- a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/maintainer/CoreCollectorTest.java +++ b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/maintainer/CoreCollectorTest.java @@ -34,7 +34,7 @@ public class CoreCollectorTest { private final ProcessExecuter processExecuter = mock(ProcessExecuter.class); private final CoreCollector coreCollector = new CoreCollector(processExecuter); - private final Path YINST_STATE_PATH = Paths.get("/path/to/yinst.state"); + private final Path INSTALL_STATE_PATH = Paths.get("/path/to/install.state"); private final Path TEST_CORE_PATH = Paths.get("/tmp/core.1234"); private final Path TEST_BIN_PATH = Paths.get("/usr/bin/program"); private final List<String> GDB_BACKTRACE = Arrays.asList("[New Thread 2703]", @@ -42,7 +42,7 @@ public class CoreCollectorTest { "#0 0x00000000004004d8 in main (argv=0x1) at main.c:4", "4\t printf(argv[3]);", "#0 0x00000000004004d8 in main (argv=0x1) at main.c:4"); - private final List<String> YINST_STATE = Arrays.asList("package: some_package-0.0.2", + private final List<String> INSTALL_STATE = Arrays.asList("package: some_package-0.0.2", "variable 'value'", "ca_file /path/to/ca.pem"); @@ -151,26 +151,26 @@ public class CoreCollectorTest { mockExec(new String[]{GDB_PATH, "-n", "-ex", "thread apply all bt", "-batch", "/usr/bin/program", "/tmp/core.1234"}, String.join("\n", GDB_BACKTRACE)); - mockExec(new String[]{"cat", YINST_STATE_PATH.toString()}, String.join("\n", YINST_STATE)); + mockExec(new String[]{"cat", INSTALL_STATE_PATH.toString()}, String.join("\n", INSTALL_STATE)); mockExec(new String[]{"rpm", "-qa"}, String.join("\n", RPM_PACKAGES)); Map<String, Object> expectedData = new HashMap<>(); expectedData.put("bin_path", TEST_BIN_PATH.toString()); expectedData.put("backtrace", new ArrayList<>(GDB_BACKTRACE)); expectedData.put("backtrace_all_threads", new ArrayList<>(GDB_BACKTRACE)); - expectedData.put("yinst_state", new ArrayList<>(YINST_STATE)); + expectedData.put("yinst_state", new ArrayList<>(INSTALL_STATE)); expectedData.put("rpm_packages", new ArrayList<>(RPM_PACKAGES)); - assertEquals(expectedData, coreCollector.collect(TEST_CORE_PATH, Optional.of(YINST_STATE_PATH))); + assertEquals(expectedData, coreCollector.collect(TEST_CORE_PATH, Optional.of(INSTALL_STATE_PATH))); } @Test public void collectsPartialIfUnableToDetermineDumpingProgramTest() throws IOException, InterruptedException { - // We fail to get backtrace and RPM packages, but yinst state works, make sure it is returned - mockExec(new String[]{"cat", YINST_STATE_PATH.toString()}, String.join("\n", YINST_STATE)); + // We fail to get backtrace and RPM packages, but install state works, make sure it is returned + mockExec(new String[]{"cat", INSTALL_STATE_PATH.toString()}, String.join("\n", INSTALL_STATE)); Map<String, Object> expectedData = new HashMap<>(); - expectedData.put("yinst_state", new ArrayList<>(YINST_STATE)); - assertEquals(expectedData, coreCollector.collect(TEST_CORE_PATH, Optional.of(YINST_STATE_PATH))); + expectedData.put("yinst_state", new ArrayList<>(INSTALL_STATE)); + assertEquals(expectedData, coreCollector.collect(TEST_CORE_PATH, Optional.of(INSTALL_STATE_PATH))); } @Test |