Skip to content

The Unified and Autonomous Development Platform

fix: Workspace user data not saved after workspace deletion (OD-2750)

Robin Shenfed114d6f67b
diff --git a/pom.xml b/pom.xml
index 354bd2e2a9..17df212b6d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -682,7 +682,7 @@
</repositories>
<properties>
<commons.version>3.2.9</commons.version>
- <agent.version>2.5.4</agent.version>
+ <agent.version>2.5.5</agent.version>
<slf4j.version>2.0.9</slf4j.version>
<logback.version>1.4.14</logback.version>
<antlr.version>4.7.2</antlr.version>
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildService.java
index 8fce6c6b66..1ab7e68fcd 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildService.java
@@ -254,18 +254,20 @@ public class DefaultBuildService extends BaseEntityService<Build> implements Bui
Long buildId = build.getProject().getId();
Long buildNumber = build.getNumber();
- String activeServer = projectService.getActiveServer(projectId, false);
+ String projectServer = projectService.getActiveServer(projectId, false);
transactionService.runAfterCommit(() -> {
cache.remove(buildId);
- if (activeServer != null) {
- clusterService.submitToServer(activeServer, () -> {
+ if (projectServer != null) {
+ clusterService.submitToServer(projectServer, () -> {
try {
var buildDir = getBuildDir(projectId, buildNumber);
FileUtils.deleteDir(buildDir);
projectService.directoryModified(projectId, buildDir.getParentFile());
} catch (Throwable e) {
- logger.error("Error deleting storage directory of build id '" + buildId + "'", e);
+ var message = "Error deleting build storage directory (project id: %d, build number: %d)"
+ .formatted(projectId, buildNumber);
+ logger.error(message, e);
}
return null;
});
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultProjectService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultProjectService.java
index bcea1677bc..5d9ce18220 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultProjectService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultProjectService.java
@@ -489,13 +489,16 @@ public class DefaultProjectService extends BaseEntityService<Project>
query.setParameter("sourceProject", project);
query.executeUpdate();
- for (Build build : project.getBuilds())
+ for (var workspace: project.getWorkspaces())
+ workspaceService.delete(workspace);
+
+ for (var build : project.getBuilds())
buildService.delete(build);
- for (Pack pack : project.getPacks())
+ for (var pack : project.getPacks())
packService.delete(pack);
- for (PackBlob packBlob : project.getPackBlobs())
+ for (var packBlob : project.getPackBlobs())
packBlobService.delete(packBlob);
dao.remove(project);
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 ed0b1de9e9..37a816a6fb 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
@@ -250,6 +250,41 @@ public class DefaultWorkspaceService extends BaseEntityService<Workspace>
Project project = (Project) event.getEntity();
if (project.getForkRoot().equals(project))
getNumberGenerator().removeNextSequence(project);
+ } else if (event.getEntity() instanceof Workspace) {
+ var workspace = (Workspace) event.getEntity();
+ var loggingSupport = workspace.getLoggingSupport();
+ var projectId = workspace.getProject().getId();
+ var workspaceNumber = workspace.getNumber();
+ var workspaceId = workspace.getId();
+
+ // record project server since workspace deletion can be called while
+ // deleting a project
+ var projectServer = projectService.getActiveServer(projectId, true);
+
+ if (projectServer != null) {
+ transactionService.runAfterCommit(() -> {
+ clusterService.submitToServer(projectServer, (ClusterTask<Void>) () -> {
+ try {
+ checkImmediately = true;
+
+ // Delete workspace directory after workspace runtime is removed to
+ // give a chance for cache to be uploaded
+ while (workspaceRuntimes.containsKey(workspaceId))
+ Thread.sleep(1000);
+ logService.flush(loggingSupport);
+
+ var workspaceDir = getWorkspaceDir(projectId, workspaceNumber);
+ FileUtils.deleteDir(workspaceDir);
+ projectService.directoryModified(projectId, workspaceDir.getParentFile());
+ } catch (Throwable t) {
+ var message = "Error deleting workspace storage directory (project id: %d, workspace number: %d)"
+ .formatted(projectId, workspaceNumber);
+ logger.error(message, t);
+ }
+ return null;
+ });
+ });
+ }
}
}
@@ -400,51 +435,6 @@ public class DefaultWorkspaceService extends BaseEntityService<Workspace>
listenerRegistry.post(new WorkspacePending(workspace));
}
- @Transactional
- @Override
- public void delete(Workspace workspace) {
- dao.remove(workspace);
-
- var loggingSupport = workspace.getLoggingSupport();
- var projectId = workspace.getProject().getId();
- var workspaceNumber = workspace.getNumber();
- var workspaceId = workspace.getId();
-
- transactionService.runAfterCommit(() -> {
- projectService.submitToActiveServer(projectId, new ClusterTask<Void>() {
-
- @Override
- public Void call() throws Exception {
- checkImmediately = true;
-
- // Delete workspace directory after workspace runtime is removed to
- // give a chance for cache to be uploaded
- while (workspaceRuntimes.containsKey(workspaceId))
- Thread.sleep(1000);
- logService.flush(loggingSupport);
-
- var workspaceDir = getWorkspaceDir(projectId, workspaceNumber);
- var dockerExecutableFile = new File(workspaceDir, "docker-executable");
- if (!Bootstrap.isInDocker() && dockerExecutableFile.exists()) {
- var dockerExecutable = FileUtils.readFileToString(dockerExecutableFile, UTF_8);
- AgentUtils.deleteDirWithDocker(workspaceDir, new Commandline(dockerExecutable), new TaskLogger() {
-
- @Override
- public void log(String message, @Nullable String sessionId) {
- logger.info(message);
- }
-
- });
- } else {
- FileUtils.deleteDir(workspaceDir);
- }
- return null;
- }
-
- });
- });
- }
-
private void applyOrders(Root<Workspace> root, CriteriaQuery<?> criteriaQuery,
CriteriaBuilder builder, EntityQuery<Workspace> sessionQuery) {
List<Order> orders = new ArrayList<>();
@@ -729,7 +719,9 @@ public class DefaultWorkspaceService extends BaseEntityService<Workspace>
logger.success("Workspace provisioned and is active now");
runtime.await();
- return null;
+ } catch (Throwable t) {
+ if (ExceptionUtils.find(t, InterruptedException.class) == null)
+ DefaultWorkspaceService.logger.error("Error awaiting workspace runtime", t);
} finally {
for (var shellId : runtime.getShellLabels().keySet())
terminateShell(workspaceId, shellId);
@@ -739,6 +731,7 @@ public class DefaultWorkspaceService extends BaseEntityService<Workspace>
semaphore.release();
workspaceContexts.remove(token);
}
+ return null;
});
} finally {
Workspace.pop();
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 f658939d6c..4d1c1c86db 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
@@ -16,7 +16,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ExecutionException;
@@ -25,8 +24,10 @@ import java.util.concurrent.ExecutorService;
import javax.validation.Valid;
import javax.validation.constraints.NotEmpty;
+import net.bytebuddy.implementation.bytecode.Throw;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.SystemUtils;
+import org.jspecify.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -329,8 +330,7 @@ public class DockerProvisioner extends WorkspaceProvisioner implements DockerAwa
return portMappings;
}
- private void setCommonDockerRunOptions(Commandline docker, String containerName,
- String runAs, TaskLogger logger) {
+ private void setCommonDockerRunOptions(Commandline docker, String containerName, String runAs) {
docker.args("run", "--rm", "--name=" + containerName);
if (isAlwaysPullImage())
docker.addArgs("--pull=always");
@@ -341,8 +341,6 @@ public class DockerProvisioner extends WorkspaceProvisioner implements DockerAwa
docker.addArgs("--cpus", getCpuLimit());
if (getMemoryLimit() != null)
docker.addArgs("--memory", getMemoryLimit());
-
- docker.processKiller(newDockerKiller(docker, containerName, logger));
}
@Override
@@ -362,11 +360,6 @@ public class DockerProvisioner extends WorkspaceProvisioner implements DockerAwa
changeOwner(newDocker(), osIds, workspaceDir, osIds, logger);
}
- if (!Bootstrap.isInDocker()) {
- var dockerExecutableFile = new File(workspaceDir, "docker-executable");
- FileUtils.writeFile(dockerExecutableFile, AgentUtils.getDockerExecutable(getDockerExecutable()));
- }
-
var provisionerRegistryLogins = getRegistryLoginFacades(context.getToken());
var registryLogins = context.getSpec().getRegistryLogins().stream()
.map(it -> new RegistryLoginFacade(it.getRegistryUrl(), it.getUserName(), it.getPassword()))
@@ -460,7 +453,8 @@ public class DockerProvisioner extends WorkspaceProvisioner implements DockerAwa
+ "-" + context.getWorkspaceNumber() + "-user-data-init";
deleteContainerIfExist(docker, containerName, logger);
- setCommonDockerRunOptions(docker, containerName, runAs, logger);
+ setCommonDockerRunOptions(docker, containerName, runAs);
+ docker.processKiller(newDockerKiller(newDocker(), containerName, logger));
var initEntrypointArgs = new StringBuilder("set -e");
for (var entry : emptyUserDataMounts.entrySet()) {
@@ -490,7 +484,8 @@ public class DockerProvisioner extends WorkspaceProvisioner implements DockerAwa
callWithRegistryLogins(docker, allRegistryLogins, () -> {
deleteContainerIfExist(docker, containerName, logger);
- setCommonDockerRunOptions(docker, containerName, runAs, logger);
+ setCommonDockerRunOptions(docker, containerName, runAs);
+ docker.processKiller(newDockerKiller(newDocker(), containerName, logger));
if (!context.getSpec().getContainerPorts().isEmpty()) {
for (int containerPort : context.getSpec().getContainerPorts())
@@ -598,24 +593,16 @@ public class DockerProvisioner extends WorkspaceProvisioner implements DockerAwa
throw new RuntimeException(e);
} finally {
if (SystemUtils.IS_OS_LINUX && !osIds.equals("0:0")) {
- var dirs = new HashSet<File>();
- cacheProvisioner.getAllocations().stream()
- .map(it->it.getPathMap().values())
- .flatMap(Collection::stream)
- .forEach(dirs::add);
- userDataPathMap.values().forEach(dirs::add);
- changeOwner(docker, osIds, dirs, osIds, logger);
- }
- try {
- cacheProvisioner.uploadCaches();
- } catch (Throwable t) {
- DockerProvisioner.logger.error("Error uploading caches", t);
- }
- try {
- userDataProvisioner.store(userDataCheckDate, userDataPathMap);
- } catch (Throwable t) {
- DockerProvisioner.logger.error("Error storing user data", t);
+ changeOwner(newDocker(), osIds, workspaceDir, osIds, new TaskLogger() {
+ @Override
+ public void log(String message, @Nullable String sessionId) {
+ DockerProvisioner.logger.info(message);
+ }
+
+ });
}
+ userDataProvisioner.store(userDataCheckDate, userDataPathMap);
+ cacheProvisioner.uploadCaches();
}
}