Skip to content

The Unified and Autonomous Development Platform

chore: Add necessary comments

Robin Shen5e7e6ec51901
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 3ff2375776..b2f828fe71 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
@@ -482,6 +482,12 @@ public class DefaultWorkspaceService extends BaseEntityService<Workspace>
for (var taskFuture: workspaceTaskFutures.values())
taskFuture.cancel(true);
+ /*
+ * Wait till all workspaces running on this server are stopped and finished uploading user data
+ * and caches. For workspaces initiated from current server, they will be cancelled above; for
+ * workspaces initiated from other servers, they will be cancelled via NodeStopping event sent
+ * to other servers
+ */
while (!workspaceContexts.isEmpty()) {
try {
Thread.sleep(1000);
diff --git a/server-ee b/server-ee
index a0b9addf48..2a4187ece8 160000
--- a/server-ee
+++ b/server-ee
@@ -1 +1 @@
-Subproject commit a0b9addf48cf41ff5c23a415c2ef1ed88f6eed57
+Subproject commit 2a4187ece8b3d640a03ea71481b70a69b43fab3f