summaryrefslogtreecommitdiffstats
path: root/node-maintainer
diff options
context:
space:
mode:
authorquiye <zamasu@gmail.com>2018-02-11 22:23:13 +0900
committerquiye <zamasu@gmail.com>2018-02-11 22:23:13 +0900
commit98276b978c65880ec968b367ab308ff583ba7d7b (patch)
treee4999af5fb981cf273fdf518793dc27ce4d22328 /node-maintainer
parent38a5af4c6be8020fbf4dd0370b6931399af4c8ff (diff)
replace "yinst" with "install"
Diffstat (limited to 'node-maintainer')
-rw-r--r--node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/CoreCollector.java2
-rw-r--r--node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/Maintainer.java2
-rw-r--r--node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/maintainer/CoreCollectorTest.java4
3 files changed, 4 insertions, 4 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 de08bdbe107..c82f4406015 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
@@ -127,7 +127,7 @@ public class CoreCollector {
installStatePath.ifPresent(installState -> {
try {
- data.put("yinst_state", readInstallState(installState));
+ data.put("install_state", readInstallState(installState));
} catch (Exception e) {
logger.log(Level.WARNING, "Failed to read install state", e);
}
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 1e95ca15c3d..6c8388c3f28 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,7 +142,7 @@ 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> installStatePath = SlimeUtils.optionalString(arguments.field("yinstStatePath")).map(Paths::get);
+ Optional<Path> installStatePath = SlimeUtils.optionalString(arguments.field("installStatePath")).map(Paths::get);
String feedEndpoint = getFieldOrFail(arguments, "feedEndpoint").asString();
try {
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 869b53dc7a7..4b58c16bdc3 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
@@ -160,7 +160,7 @@ public class CoreCollectorTest {
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<>(INSTALL_STATE));
+ expectedData.put("install_state", new ArrayList<>(INSTALL_STATE));
expectedData.put("rpm_packages", new ArrayList<>(RPM_PACKAGES));
assertEquals(expectedData, coreCollector.collect(TEST_CORE_PATH, Optional.of(INSTALL_STATE_PATH)));
}
@@ -171,7 +171,7 @@ public class CoreCollectorTest {
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<>(INSTALL_STATE));
+ expectedData.put("install_state", new ArrayList<>(INSTALL_STATE));
assertEquals(expectedData, coreCollector.collect(TEST_CORE_PATH, Optional.of(INSTALL_STATE_PATH)));
}