Skip to content

The Unified and Autonomous Development Platform

Add resource pending allocation log statement

Robin Shen0d06a292fee4
diff --git a/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java
index 96d969ab8a..8bcebe0985 100644
--- a/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java
+++ b/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java
@@ -562,7 +562,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
logManager.addJobLogger(jobToken, jobLogger);
serverStepThreads.put(jobToken, new ArrayList<>());
try {
- jobExecutor.execute(jobContext);
+ jobExecutor.execute(jobContext, jobLogger);
break;
} catch (Throwable e) {
if (retried.getAndIncrement() < maxRetries.get() && sessionManager.call(new Callable<Boolean>() {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java
index b5f0cdafb7..9b7e284f26 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java
@@ -4,6 +4,7 @@ import com.google.common.base.Splitter;
import com.google.common.base.Throwables;
import io.onedev.commons.loader.ExtensionPoint;
import io.onedev.commons.utils.FileUtils;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.OneDev;
import io.onedev.server.ServerConfig;
import io.onedev.server.entitymanager.AgentManager;
@@ -124,7 +125,7 @@ public abstract class JobExecutor implements Serializable {
this.cacheTTL = cacheTTL;
}
- public abstract void execute(JobContext jobContext);
+ public abstract void execute(JobContext jobContext, TaskLogger jobLogger);
public boolean isPlaceholderAllowed() {
return true;
diff --git a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java
index 448c9b39fa..d8094749c9 100644
--- a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java
+++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java
@@ -231,7 +231,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
}
@Override
- public void execute(JobContext jobContext) {
+ public void execute(JobContext jobContext, TaskLogger jobLogger) {
var servers = new ArrayList<>(OneDev.getInstance(ClusterManager.class)
.getHazelcastInstance().getCluster().getMembers());
var serverUUID = servers.get(RandomUtils.nextInt(0, servers.size())).getUuid();
diff --git a/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerExecutor.java b/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerExecutor.java
index d9b6431f2b..2edef016dd 100644
--- a/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerExecutor.java
+++ b/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerExecutor.java
@@ -86,7 +86,7 @@ public class RemoteDockerExecutor extends ServerDockerExecutor {
}
@Override
- public void execute(JobContext jobContext) {
+ public void execute(JobContext jobContext, TaskLogger jobLogger) {
AgentRunnable runnable = (agentId) -> {
getJobManager().runJobLocal(jobContext, new JobRunnable() {
@@ -147,7 +147,8 @@ public class RemoteDockerExecutor extends ServerDockerExecutor {
});
};
-
+
+ jobLogger.log("Pending resource allocation...");
getResourceAllocator().runAgentJob(
AgentQuery.parse(agentQuery, true), getName(), getConcurrencyNumber(),
jobContext.getServices().size()+1, runnable);
@@ -171,7 +172,7 @@ public class RemoteDockerExecutor extends ServerDockerExecutor {
getLogManager().addJobLogger(jobToken, jobLogger);
try {
UUID localServerUUID = getClusterManager().getLocalServerUUID();
- jobLogger.log("Waiting for resources...");
+ jobLogger.log("Pending resource allocation...");
AgentRunnable runnable = agentId -> {
TaskLogger currentJobLogger = new TaskLogger() {
diff --git a/server-plugin/server-plugin-executor-remoteshell/src/main/java/io/onedev/server/plugin/executor/remoteshell/RemoteShellExecutor.java b/server-plugin/server-plugin-executor-remoteshell/src/main/java/io/onedev/server/plugin/executor/remoteshell/RemoteShellExecutor.java
index 2a23a1f937..583d273eab 100644
--- a/server-plugin/server-plugin-executor-remoteshell/src/main/java/io/onedev/server/plugin/executor/remoteshell/RemoteShellExecutor.java
+++ b/server-plugin/server-plugin-executor-remoteshell/src/main/java/io/onedev/server/plugin/executor/remoteshell/RemoteShellExecutor.java
@@ -77,7 +77,7 @@ public class RemoteShellExecutor extends ServerShellExecutor {
}
@Override
- public void execute(JobContext jobContext) {
+ public void execute(JobContext jobContext, TaskLogger jobLogger) {
AgentRunnable runnable = (agentId) -> {
getJobManager().runJobLocal(jobContext, new JobRunnable() {
@@ -138,7 +138,8 @@ public class RemoteShellExecutor extends ServerShellExecutor {
});
};
-
+
+ jobLogger.log("Pending resource allocation...");
getResourceAllocator().runAgentJob(AgentQuery.parse(agentQuery, true), getName(),
getConcurrencyNumber(), 1, runnable);
}
@@ -173,7 +174,7 @@ public class RemoteShellExecutor extends ServerShellExecutor {
getLogManager().addJobLogger(jobToken, jobLogger);
try {
UUID localServerUUID = getClusterManager().getLocalServerUUID();
- jobLogger.log("Waiting for resources...");
+ jobLogger.log("Pending resource allocation...");
AgentRunnable runnable = agentId -> {
TaskLogger currentJobLogger = new TaskLogger() {
diff --git a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java
index a977641cee..faa35461b9 100644
--- a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java
+++ b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java
@@ -34,6 +34,7 @@ import io.onedev.server.util.validation.annotation.ClassValidating;
import io.onedev.server.web.editable.annotation.*;
import io.onedev.server.web.util.Testable;
import org.apache.commons.lang3.SystemUtils;
+import org.apache.tools.ant.Task;
import javax.annotation.Nullable;
import javax.validation.ConstraintValidatorContext;
@@ -212,7 +213,7 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa
}
@Override
- public void execute(JobContext jobContext) {
+ public void execute(JobContext jobContext, TaskLogger jobLogger) {
ClusterRunnable runnable = () -> {
getJobManager().runJobLocal(jobContext, new JobRunnable() {
@@ -550,6 +551,7 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa
});
};
+ jobLogger.log("Pending resource allocation...");
getResourceAllocator().runServerJob(getName(), getConcurrencyNumber(),
jobContext.getServices().size() + 1, runnable);
}
diff --git a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java
index 77dee837fe..5eb3b52572 100644
--- a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java
+++ b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java
@@ -103,7 +103,7 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDat
}
@Override
- public void execute(JobContext jobContext) {
+ public void execute(JobContext jobContext, TaskLogger jobLogger) {
ClusterRunnable runnable = () -> {
getJobManager().runJobLocal(jobContext, new JobRunnable() {
@@ -315,6 +315,7 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDat
});
};
+ jobLogger.log("Pending resource allocation...");
getResourceAllocator().runServerJob(getName(), getConcurrencyNumber(), 1, runnable);
}