archive-gh-me/onedev
1
0
Fork 0
mirror of https://github.com/theonedev/onedev.git synced 2025-12-08 18:26:30 +00:00
Code Issues Projects Releases Wiki Activity

Show more detailed error message when k8s image pull fails

Browse Source
This commit is contained in:
Robin Shen 2020-06-04 13:01:55 +08:00
parent 901fb47445
commit d7ccd98481
1 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java
View File

@ -1222,33 +1222,35 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
@Override
public void consume(String line) {
if (line.startsWith("{")) {
json.append("{").append("\n");
} else if (line.startsWith("}")) {
json.append("}");
logger.trace("Watching event:\n" + json.toString());
try {
JsonNode eventNode = mapper.readTree(json.toString());
String type = eventNode.get("type").asText();
String reason = eventNode.get("reason").asText();
JsonNode messageNode = eventNode.get("message");
String message = messageNode!=null? messageNode.asText(): reason;
if (type.equals("Warning")) {
if (reason.equals("FailedScheduling"))
jobLogger.log("Kubernetes: " + message);
else
stopWatchRef.set(new StopWatch(new OneException(message)));
} else if (type.equals("Normal") && reason.equals("Started")) {
stopWatchRef.set(new StopWatch(null));
if (stopWatchRef.get() == null) {
if (line.startsWith("{")) {
json.append("{").append("\n");
} else if (line.startsWith("}")) {
json.append("}");
logger.trace("Checking event:\n" + json.toString());
try {
JsonNode eventNode = mapper.readTree(json.toString());
String type = eventNode.get("type").asText();
String reason = eventNode.get("reason").asText();
JsonNode messageNode = eventNode.get("message");
String message = messageNode!=null? messageNode.asText(): reason;
if (type.equals("Warning")) {
if (reason.equals("FailedScheduling"))
jobLogger.log("Kubernetes: " + message);
else
stopWatchRef.set(new StopWatch(new OneException(message)));
} else if (type.equals("Normal") && reason.equals("Started")) {
stopWatchRef.set(new StopWatch(null));
}
if (stopWatchRef.get() != null)
thread.interrupt();
} catch (Exception e) {
logger.error("Error processing event watching record", e);
}
if (stopWatchRef.get() != null)
thread.interrupt();
} catch (Exception e) {
logger.error("Error processing event watching record", e);
json.setLength(0);
} else {
json.append(line).append("\n");
}
json.setLength(0);
} else {
json.append(line).append("\n");
}
}