diff options
author | valerijf <valerijf@yahoo-inc.com> | 2017-04-07 15:25:36 +0200 |
---|---|---|
committer | valerijf <valerijf@yahoo-inc.com> | 2017-04-07 15:25:36 +0200 |
commit | a817fb6c294978c4a7ed5a7349984e35bc874a92 (patch) | |
tree | 782ac02091ae0c32ca6f74799426ac3a73a1be8b /node-maintainer | |
parent | bde2604037eee583a9e1d21e0f2c352f206816c6 (diff) |
Remove unnecessary wrapping of command
Diffstat (limited to 'node-maintainer')
2 files changed, 5 insertions, 5 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 96691f8402e..90527c69b2d 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 @@ -57,7 +57,7 @@ public class CoreCollector { Path readBinPathFallback(Path coredumpPath) throws IOException, InterruptedException { String command = GDB_PATH + " -n -batch -core " + coredumpPath + " | grep \'^Core was generated by\'"; - Pair<Integer, String> result = processExecuter.exec(new String[]{"sh", "-c", "\"" + command + "\""}); + Pair<Integer, String> result = processExecuter.exec(new String[]{"sh", "-c", command}); Matcher matcher = CORE_GENERATOR_PATH_PATTERN.matcher(result.getSecond()); if (! matcher.find()) { @@ -111,7 +111,7 @@ public class CoreCollector { data.put("backtrace", readBacktrace(coredumpPath, binPath, false)); data.put("backtrace_all_threads", readBacktrace(coredumpPath, binPath, true)); } catch (Throwable e) { - logger.log(Level.WARNING, "Failed to extrect backtrace", e); + logger.log(Level.WARNING, "Failed to extract backtrace", e); } yinstStatePath.ifPresent(yinstState -> { @@ -131,7 +131,7 @@ public class CoreCollector { try { deleteDecompressedCoredump(coredumpPath); } catch (IOException e) { - logger.log(Level.WARNING, "Failed to deleting compressed core dump", e); + logger.log(Level.WARNING, "Failed to delete decompressed core dump", e); } return data; } 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 ae771504729..7c32a8a9912 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 @@ -87,7 +87,7 @@ public class CoreCollectorTest { Path fallbackResponse = Paths.get("/response/from/fallback"); - mockExec(new String[]{"sh", "-c", "\"/home/y/bin64/gdb -n -batch -core /tmp/core.1234 | grep '^Core was generated by'\""}, + mockExec(new String[]{"sh", "-c", "/home/y/bin64/gdb -n -batch -core /tmp/core.1234 | grep '^Core was generated by'"}, "Core was generated by `/response/from/fallback'."); mockExec(cmd, "/tmp/core.1234: ELF 64-bit LSB core file x86-64, version 1 (SYSV), SVR4-style"); @@ -100,7 +100,7 @@ public class CoreCollectorTest { @Test public void extractsBinaryPathUsingGdbTest() throws IOException, InterruptedException { final String[] cmd = new String[]{"sh", "-c", - "\"/home/y/bin64/gdb -n -batch -core /tmp/core.1234 | grep '^Core was generated by'\""}; + "/home/y/bin64/gdb -n -batch -core /tmp/core.1234 | grep '^Core was generated by'"}; mockExec(cmd, "Core was generated by `/usr/bin/program-from-gdb --identity foo/search/cluster.content_'."); assertEquals(Paths.get("/usr/bin/program-from-gdb"), coreCollector.readBinPathFallback(TEST_CORE_PATH)); |