diff options
author | Ola Aunrønning <olaa@yahoo-inc.com> | 2017-08-11 16:59:17 +0200 |
---|---|---|
committer | Ola Aunrønning <olaa@yahoo-inc.com> | 2017-08-15 12:29:46 +0200 |
commit | e1096ce179dcc5c6c16cd80e17159e6e27f5bbfb (patch) | |
tree | 7ca2ab0715114a009c11df792a9d2f9249989da6 /node-maintainer | |
parent | 4c22842dc0a49bc6abef62966a6540bc011fcc38 (diff) |
Delete previous hardwareDivergence if it is not a valid JSON. Perform initVespalogging in main functions
Diffstat (limited to 'node-maintainer')
3 files changed, 16 insertions, 1 deletions
diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/report/ReportSender.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/report/ReportSender.java index d123b5abcac..03013881de9 100644 --- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/report/ReportSender.java +++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/report/ReportSender.java @@ -8,9 +8,13 @@ import com.yahoo.vespa.hosted.node.verification.commons.noderepo.NodeRepoJsonMod import java.io.IOException; import java.net.URL; import java.util.ArrayList; +import java.util.logging.Level; +import java.util.logging.Logger; public class ReportSender { + private static final Logger logger = Logger.getLogger(ReportSender.class.getName()); + private static void printHardwareDivergenceReport(HardwareDivergenceReport hardwareDivergenceReport) throws IOException { ObjectMapper om = new ObjectMapper(); String report; @@ -41,6 +45,13 @@ public class ReportSender { if (nodeRepoJsonModel.getHardwareDivergence() == null) { return new HardwareDivergenceReport(); } - return om.readValue(nodeRepoJsonModel.getHardwareDivergence(), HardwareDivergenceReport.class); + try { + HardwareDivergenceReport hardwareDivergenceReport = om.readValue(nodeRepoJsonModel.getHardwareDivergence(), HardwareDivergenceReport.class); + return hardwareDivergenceReport; + } + catch (IOException e){ + logger.log(Level.WARNING, "Failed to parse hardware divergence report from node repo. Report:\n" + nodeRepoJsonModel.getHardwareDivergence(), e.getMessage()); + return new HardwareDivergenceReport(); + } } } diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/HardwareBenchmarker.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/HardwareBenchmarker.java index d9f6c6f06e2..a9f00e40740 100644 --- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/HardwareBenchmarker.java +++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/HardwareBenchmarker.java @@ -1,5 +1,6 @@ package com.yahoo.vespa.hosted.node.verification.hardware; +import com.yahoo.log.LogSetup; import com.yahoo.vespa.hosted.node.verification.commons.CommandExecutor; import com.yahoo.vespa.hosted.node.verification.commons.HostURLGenerator; import com.yahoo.vespa.hosted.node.verification.commons.report.ReportSender; @@ -39,6 +40,7 @@ public class HardwareBenchmarker { } public static void main(String[] args) throws IOException { + LogSetup.initVespaLogging("hardware-benchmarker"); CommandExecutor commandExecutor = new CommandExecutor(); ArrayList<URL> nodeInfoUrls; if (args.length == 0) { diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/SpecVerifier.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/SpecVerifier.java index 4756929bc79..2893351a01f 100644 --- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/SpecVerifier.java +++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/SpecVerifier.java @@ -1,5 +1,6 @@ package com.yahoo.vespa.hosted.node.verification.spec; +import com.yahoo.log.LogSetup; import com.yahoo.vespa.hosted.node.verification.commons.CommandExecutor; import com.yahoo.vespa.hosted.node.verification.commons.HostURLGenerator; import com.yahoo.vespa.hosted.node.verification.commons.report.ReportSender; @@ -53,6 +54,7 @@ public class SpecVerifier { } public static void main(String[] args) { + LogSetup.initVespaLogging("spec-verifier"); CommandExecutor commandExecutor = new CommandExecutor(); ArrayList<URL> nodeInfoUrls; if (args.length == 0) { |