Skip to content

The Unified and Autonomous Development Platform

feat: Workspace terminal is slow sometimes (OD-2755)

Robin Shen52ad3de38577
diff --git a/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.java b/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.java
index 2105771fa3..bfa74323d6 100644
--- a/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.java
+++ b/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.java
@@ -19,8 +19,6 @@ import static org.apache.commons.lang3.StringUtils.substringBeforeLast;
import static org.apache.tika.mime.MimeTypes.OCTET_STREAM;
import static org.glassfish.jersey.client.ClientProperties.REQUEST_ENTITY_PROCESSING;
-import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/workspaceprovisioner/WorkspaceProvisioner.java b/server-core/src/main/java/io/onedev/server/model/support/administration/workspaceprovisioner/WorkspaceProvisioner.java
index dff75c07b8..44620a7074 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/workspaceprovisioner/WorkspaceProvisioner.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/workspaceprovisioner/WorkspaceProvisioner.java
@@ -5,11 +5,9 @@ import static io.onedev.k8shelper.KubernetesHelper.initRepository;
import static io.onedev.k8shelper.KubernetesHelper.installGitLfs;
import static io.onedev.k8shelper.KubernetesHelper.setupGitCerts;
import static io.onedev.k8shelper.KubernetesHelper.setupOriginUrl;
-import static java.util.stream.Collectors.toMap;
import java.io.File;
import java.io.Serializable;
-import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
import javax.validation.constraints.Min;
@@ -27,11 +25,9 @@ import io.onedev.server.annotation.Editable;
import io.onedev.server.cluster.ClusterService;
import io.onedev.server.git.CommandUtils;
import io.onedev.server.git.GitUtils;
-import io.onedev.server.git.hook.HookUtils;
import io.onedev.server.git.location.GitLocation;
import io.onedev.server.model.Project;
import io.onedev.server.model.Workspace;
-import io.onedev.server.model.support.workspace.spec.EnvVar;
import io.onedev.server.persistence.SessionService;
import io.onedev.server.service.ProjectService;
import io.onedev.server.util.usage.Usage;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/terminal/TerminalPanel.java b/server-core/src/main/java/io/onedev/server/web/component/terminal/TerminalPanel.java
index a790770d1c..1e648cf4fd 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/terminal/TerminalPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/terminal/TerminalPanel.java
@@ -35,6 +35,7 @@ public abstract class TerminalPanel extends Panel {
protected void onInitialize() {
super.onInitialize();
+ var canWriteToStdin = canWriteToStdin();
add(new WebSocketBehavior() {
@Override
@@ -60,7 +61,8 @@ public abstract class TerminalPanel extends Panel {
if (connection != null) {
if (message.getText().startsWith("SHELL_INPUT:")) {
String data = message.getText().substring("SHELL_INPUT:".length());
- writeToStdin(connection, data);
+ if (canWriteToStdin)
+ writeToStdin(connection, data);
} else if (message.getText().startsWith("TERMINAL_RESIZE:")) {
String size = message.getText().substring("TERMINAL_RESIZE:".length());
int rows = Integer.parseInt(StringUtils.substringBefore(size, ","));
@@ -112,4 +114,8 @@ public abstract class TerminalPanel extends Panel {
protected abstract void onShellExit(IPartialPageRequestHandler handler);
+ protected boolean canWriteToStdin() {
+ return true;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/error/GeneralErrorPage.java b/server-core/src/main/java/io/onedev/server/web/page/error/GeneralErrorPage.java
index 010edc2226..f1b01646b1 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/error/GeneralErrorPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/error/GeneralErrorPage.java
@@ -84,7 +84,7 @@ public class GeneralErrorPage extends SimplePage {
}.setBody(Model.of(_T("Sync Replica Status and Back to Home"))));
} else {
- container.add(new ViewStateAwarePageLink<Void>("home", HomePage.class));
+ container.add(new ViewStateAwarePageLink<Void>("home", HomePage.class).setBody(Model.of(_T("Back To Home"))));
}
container.add(new AjaxLink<Void>("showDetail") {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/detail/terminal/WorkspaceTerminalPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/detail/terminal/WorkspaceTerminalPage.java
index 340f48e00d..2b17d9243f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/detail/terminal/WorkspaceTerminalPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/detail/terminal/WorkspaceTerminalPage.java
@@ -71,8 +71,7 @@ public class WorkspaceTerminalPage extends WorkspaceDetailPage {
@Override
protected void writeToStdin(IWebSocketConnection connection, String data) {
- if (SecurityUtils.canModifyOrDelete(getWorkspace()))
- workspaceService.onMessage(connection, getWorkspace(), shellId, "SHELL_INPUT:" + data);
+ workspaceService.onMessage(connection, getWorkspace(), shellId, "SHELL_INPUT:" + data);
}
@Override
@@ -81,6 +80,11 @@ public class WorkspaceTerminalPage extends WorkspaceDetailPage {
"TERMINAL_RESIZE:" + rows + "," + cols);
}
+ @Override
+ protected boolean canWriteToStdin() {
+ return SecurityUtils.canModifyOrDelete(getWorkspace());
+ }
+
@Override
protected void onShellExit(IPartialPageRequestHandler handler) {
setResponsePage(WorkspaceDashboardPage.class, WorkspaceDashboardPage.paramsOf(getWorkspace()));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
index b828832dca..dc263e7de0 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
@@ -21,7 +21,7 @@ public class TestPage extends BasePage {
add(new Link<Void>("test") {
@Override
- public void onClick() {
+ public void onClick() {
}
});
diff --git a/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java b/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java
index b029f8fb15..c5d29ed9d6 100644
--- a/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java
+++ b/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java
@@ -5,9 +5,12 @@ import static java.nio.charset.StandardCharsets.UTF_8;
import static java.nio.file.StandardOpenOption.TRUNCATE_EXISTING;
import static java.nio.file.StandardOpenOption.WRITE;
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+import java.io.UncheckedIOException;
import java.nio.file.Files;
-import java.nio.file.Paths;
import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.Collection;
@@ -62,8 +65,8 @@ import io.onedev.server.event.ListenerRegistry;
import io.onedev.server.event.entity.EntityRemoved;
import io.onedev.server.event.project.workspace.WorkspaceActive;
import io.onedev.server.event.project.workspace.WorkspaceCreated;
-import io.onedev.server.event.project.workspace.WorkspaceInactive;
import io.onedev.server.event.project.workspace.WorkspaceEvent;
+import io.onedev.server.event.project.workspace.WorkspaceInactive;
import io.onedev.server.event.project.workspace.WorkspacePending;
import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.event.system.SystemStopping;
@@ -196,18 +199,6 @@ public class DefaultWorkspaceService extends BaseEntityService<Workspace>
workspace.setNumberScope(workspace.getProject().getForkRoot());
workspace.setNumber(getNumberGenerator().getNextSequence(workspace.getNumberScope()));
dao.persist(workspace);
-
- var projectId = workspace.getProject().getId();
- var workspaceNumber = workspace.getNumber();
- projectService.runOnActiveServer(projectId, new ClusterTask<Void>() {
-
- @Override
- public Void call() throws Exception {
- FileUtils.cleanDir(getWorkspaceDir(projectId, workspaceNumber));
- return null;
- }
-
- });
listenerRegistry.post(new WorkspaceCreated(workspace));
}
@@ -1119,24 +1110,4 @@ public class DefaultWorkspaceService extends BaseEntityService<Workspace>
}
- private static class HasLfsObjectsTask implements ClusterTask<Boolean> {
-
- private static final long serialVersionUID = 1L;
-
- private final Long projectId;
-
- private final Long workspaceNumber;
-
- public HasLfsObjectsTask(Long projectId, Long workspaceNumber) {
- this.projectId = projectId;
- this.workspaceNumber = workspaceNumber;
- }
-
- @Override
- public Boolean call() throws Exception {
- var workspaceService = OneDev.getInstance(DefaultWorkspaceService.class);
- return workspaceService.projectService.runOnActiveServer(projectId, () -> workspaceService.hasLfsObjects(projectId, workspaceNumber));
- }
-
- }
}
diff --git a/server-plugin/server-plugin-provisioner-docker/src/main/java/io/onedev/server/plugin/provisioner/docker/DockerProvisioner.java b/server-plugin/server-plugin-provisioner-docker/src/main/java/io/onedev/server/plugin/provisioner/docker/DockerProvisioner.java
index 967c2bd0ca..a28f535418 100644
--- a/server-plugin/server-plugin-provisioner-docker/src/main/java/io/onedev/server/plugin/provisioner/docker/DockerProvisioner.java
+++ b/server-plugin/server-plugin-provisioner-docker/src/main/java/io/onedev/server/plugin/provisioner/docker/DockerProvisioner.java
@@ -25,10 +25,6 @@ import java.util.concurrent.ExecutorService;
import javax.validation.Valid;
import javax.validation.constraints.NotEmpty;
-import io.onedev.server.ServerConfig;
-import io.onedev.server.model.Workspace;
-import io.onedev.server.model.support.workspace.spec.EnvVar;
-import io.onedev.server.util.SiteSyncUtils;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.SystemUtils;
import org.jspecify.annotations.Nullable;
@@ -56,9 +52,11 @@ import io.onedev.server.annotation.Patterns;
import io.onedev.server.annotation.ReservedOptions;
import io.onedev.server.cache.WorkspaceCacheProvisioner;
import io.onedev.server.model.Project;
+import io.onedev.server.model.Workspace;
import io.onedev.server.model.support.administration.DockerAware;
import io.onedev.server.model.support.administration.workspaceprovisioner.RegistryLogin;
import io.onedev.server.model.support.administration.workspaceprovisioner.WorkspaceProvisioner;
+import io.onedev.server.model.support.workspace.spec.EnvVar;
import io.onedev.server.terminal.CommandlineShell;
import io.onedev.server.terminal.Shell;
import io.onedev.server.terminal.Terminal;
diff --git a/server-plugin/server-plugin-provisioner-shell/src/main/java/io/onedev/server/plugin/provisioner/shell/ShellProvisioner.java b/server-plugin/server-plugin-provisioner-shell/src/main/java/io/onedev/server/plugin/provisioner/shell/ShellProvisioner.java
index c06674782f..26920c62fc 100644
--- a/server-plugin/server-plugin-provisioner-shell/src/main/java/io/onedev/server/plugin/provisioner/shell/ShellProvisioner.java
+++ b/server-plugin/server-plugin-provisioner-shell/src/main/java/io/onedev/server/plugin/provisioner/shell/ShellProvisioner.java
@@ -14,7 +14,6 @@ import java.util.concurrent.CountDownLatch;
import javax.validation.constraints.NotEmpty;
-import io.onedev.server.model.support.workspace.spec.EnvVar;
import org.apache.commons.io.FilenameUtils;
import io.onedev.commons.codeassist.InputSuggestion;
@@ -29,10 +28,10 @@ import io.onedev.server.annotation.Editable;
import io.onedev.server.annotation.Patterns;
import io.onedev.server.cache.WorkspaceCacheProvisioner;
import io.onedev.server.git.CommandUtils;
-import io.onedev.server.git.hook.HookUtils;
import io.onedev.server.model.Project;
import io.onedev.server.model.Workspace;
import io.onedev.server.model.support.administration.workspaceprovisioner.WorkspaceProvisioner;
+import io.onedev.server.model.support.workspace.spec.EnvVar;
import io.onedev.server.terminal.CommandlineShell;
import io.onedev.server.terminal.Shell;
import io.onedev.server.terminal.Terminal;