Skip to content

The Unified and Autonomous Development Platform

chore: Refactor environment manager

Robin Shen867379770c73
diff --git a/server-core/src/main/java/io/onedev/server/xodus/AbstractEnvironmentManager.java b/server-core/src/main/java/io/onedev/server/xodus/AbstractEnvironmentManager.java
index 4cb488c2b6..d699eb5124 100644
--- a/server-core/src/main/java/io/onedev/server/xodus/AbstractEnvironmentManager.java
+++ b/server-core/src/main/java/io/onedev/server/xodus/AbstractEnvironmentManager.java
@@ -1,8 +1,12 @@
package io.onedev.server.xodus;
import io.onedev.commons.utils.FileUtils;
+import io.onedev.server.event.Listen;
+import io.onedev.server.event.system.SystemStopped;
import jetbrains.exodus.ArrayByteIterable;
import jetbrains.exodus.ByteIterable;
+import jetbrains.exodus.backup.BackupStrategy;
+import jetbrains.exodus.backup.VirtualFileDescriptor;
import jetbrains.exodus.env.*;
import org.eclipse.jgit.lib.ObjectId;
@@ -13,6 +17,8 @@ import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import static java.nio.charset.Charset.defaultCharset;
@@ -24,6 +30,8 @@ public abstract class AbstractEnvironmentManager {
private static final int MEMORY_USAGE_PERCENT = 25;
+ private final Map<String, Environment> envs = new ConcurrentHashMap<>();
+
protected void checkVersion(File envDir) {
File versionFile = getVersionFile(envDir);
int versionFromFile;
@@ -66,6 +74,7 @@ public abstract class AbstractEnvironmentManager {
config.setEnvCloseForcedly(true);
config.setLogAllowRamDisk(true);
config.setLogAllowRemote(true);
+
config.setLogAllowRemovable(true);
config.setMemoryUsagePercentage(MEMORY_USAGE_PERCENT);
config.setLogFileSize(getLogFileSize());
@@ -73,12 +82,7 @@ public abstract class AbstractEnvironmentManager {
}
protected Store getStore(Environment env, String storeName) {
- return env.computeInTransaction(new TransactionalComputable<Store>() {
- @Override
- public Store compute(Transaction txn) {
- return env.openStore(storeName, StoreConfig.WITHOUT_DUPLICATES, txn);
- }
- });
+ return env.computeInTransaction(txn -> env.openStore(storeName, StoreConfig.WITHOUT_DUPLICATES, txn));
}
@Nullable
@@ -211,4 +215,52 @@ public abstract class AbstractEnvironmentManager {
}
}
+ protected abstract File getEnvDir(String envKey);
+
+ protected Environment getEnv(String envKey) {
+ Environment env = envs.get(envKey);
+ if (env == null) synchronized (envs) {
+ env = envs.get(envKey);
+ if (env == null) {
+ env = newEnv(getEnvDir(envKey));
+ envs.put(envKey, env);
+ }
+ }
+ return env;
+ }
+
+ protected void removeEnv(String envKey) {
+ synchronized (envs) {
+ Environment env = envs.remove(envKey);
+ if (env != null)
+ env.close();
+ }
+ }
+
+ @Listen
+ public void on(SystemStopped event) {
+ synchronized (envs) {
+ for (Environment env: envs.values())
+ env.close();
+ envs.clear();
+ }
+ }
+
+ public void export(String envKey, File targetDir) {
+ BackupStrategy backupStrategy = getEnv(envKey).getBackupStrategy();
+ try {
+ backupStrategy.beforeBackup();
+ try {
+ for (VirtualFileDescriptor descriptor : backupStrategy.getContents()) {
+ FileUtils.copyFileToDirectory(((BackupStrategy.FileDescriptor) descriptor).getFile(), targetDir);
+ }
+ } finally {
+ backupStrategy.afterBackup();
+ }
+ writeVersion(targetDir);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/xodus/AbstractMultiEnvironmentManager.java b/server-core/src/main/java/io/onedev/server/xodus/AbstractMultiEnvironmentManager.java
deleted file mode 100644
index 732fa2f0d1..0000000000
--- a/server-core/src/main/java/io/onedev/server/xodus/AbstractMultiEnvironmentManager.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package io.onedev.server.xodus;
-
-import io.onedev.commons.utils.FileUtils;
-import io.onedev.server.event.Listen;
-import io.onedev.server.event.system.SystemStopped;
-import jetbrains.exodus.backup.BackupStrategy;
-import jetbrains.exodus.backup.VirtualFileDescriptor;
-import jetbrains.exodus.env.Environment;
-
-import java.io.File;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-public abstract class AbstractMultiEnvironmentManager extends AbstractEnvironmentManager {
-
- private final Map<String, Environment> envs = new ConcurrentHashMap<>();
-
- protected abstract File getEnvDir(String envKey);
-
- protected Environment getEnv(String envKey) {
- Environment env = envs.get(envKey);
- if (env == null) synchronized (envs) {
- env = envs.get(envKey);
- if (env == null) {
- env = newEnv(getEnvDir(envKey));
- envs.put(envKey, env);
- }
- }
- return env;
- }
-
- protected void removeEnv(String envKey) {
- synchronized (envs) {
- Environment env = envs.remove(envKey);
- if (env != null)
- env.close();
- }
- }
-
- @Listen
- public void on(SystemStopped event) {
- synchronized (envs) {
- for (Environment env: envs.values())
- env.close();
- envs.clear();
- }
- }
-
- public void export(String envKey, File targetDir) {
- BackupStrategy backupStrategy = getEnv(envKey).getBackupStrategy();
- try {
- backupStrategy.beforeBackup();
- try {
- for (VirtualFileDescriptor descriptor : backupStrategy.getContents()) {
- FileUtils.copyFileToDirectory(((BackupStrategy.FileDescriptor) descriptor).getFile(), targetDir);
- }
- } finally {
- backupStrategy.afterBackup();
- }
- writeVersion(targetDir);
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/xodus/AbstractSingleEnvironmentManager.java b/server-core/src/main/java/io/onedev/server/xodus/AbstractSingleEnvironmentManager.java
deleted file mode 100644
index c2553a84d8..0000000000
--- a/server-core/src/main/java/io/onedev/server/xodus/AbstractSingleEnvironmentManager.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package io.onedev.server.xodus;
-
-import java.io.File;
-
-import io.onedev.server.event.Listen;
-import io.onedev.server.event.system.SystemStopping;
-import jetbrains.exodus.env.Environment;
-
-public abstract class AbstractSingleEnvironmentManager extends AbstractEnvironmentManager {
-
- private Environment env;
-
- protected synchronized Environment getEnv() {
- if (env == null)
- env = newEnv(getEnvDir());
- return env;
- }
-
- @Listen
- public synchronized void on(SystemStopping event) {
- if (env != null)
- env.close();
- }
-
- protected abstract File getEnvDir();
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/xodus/DefaultCommitInfoManager.java b/server-core/src/main/java/io/onedev/server/xodus/DefaultCommitInfoManager.java
index acff900cf9..ac6d87e8de 100644
--- a/server-core/src/main/java/io/onedev/server/xodus/DefaultCommitInfoManager.java
+++ b/server-core/src/main/java/io/onedev/server/xodus/DefaultCommitInfoManager.java
@@ -72,7 +72,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Consumer;
@Singleton
-public class DefaultCommitInfoManager extends AbstractMultiEnvironmentManager
+public class DefaultCommitInfoManager extends AbstractEnvironmentManager
implements CommitInfoManager, Serializable {
private static final long serialVersionUID = 1L;
diff --git a/server-core/src/main/java/io/onedev/server/xodus/DefaultIssueInfoManager.java b/server-core/src/main/java/io/onedev/server/xodus/DefaultIssueInfoManager.java
index 1c0dc43a3b..8e8a2a5dc0 100644
--- a/server-core/src/main/java/io/onedev/server/xodus/DefaultIssueInfoManager.java
+++ b/server-core/src/main/java/io/onedev/server/xodus/DefaultIssueInfoManager.java
@@ -43,7 +43,7 @@ import static io.onedev.server.util.DateUtils.toLocalDate;
import static java.lang.Long.valueOf;
@Singleton
-public class DefaultIssueInfoManager extends AbstractMultiEnvironmentManager
+public class DefaultIssueInfoManager extends AbstractEnvironmentManager
implements IssueInfoManager, Serializable {
private static final int INFO_VERSION = 4;
diff --git a/server-core/src/main/java/io/onedev/server/xodus/DefaultPullRequestInfoManager.java b/server-core/src/main/java/io/onedev/server/xodus/DefaultPullRequestInfoManager.java
index fd41a057a8..c27f9696f2 100644
--- a/server-core/src/main/java/io/onedev/server/xodus/DefaultPullRequestInfoManager.java
+++ b/server-core/src/main/java/io/onedev/server/xodus/DefaultPullRequestInfoManager.java
@@ -38,7 +38,7 @@ import java.util.List;
import static java.lang.Long.valueOf;
@Singleton
-public class DefaultPullRequestInfoManager extends AbstractMultiEnvironmentManager
+public class DefaultPullRequestInfoManager extends AbstractEnvironmentManager
implements PullRequestInfoManager, Serializable {
private static final int INFO_VERSION = 7;
diff --git a/server-core/src/main/java/io/onedev/server/xodus/DefaultVisitInfoManager.java b/server-core/src/main/java/io/onedev/server/xodus/DefaultVisitInfoManager.java
index a66c385504..95b5626984 100644
--- a/server-core/src/main/java/io/onedev/server/xodus/DefaultVisitInfoManager.java
+++ b/server-core/src/main/java/io/onedev/server/xodus/DefaultVisitInfoManager.java
@@ -42,7 +42,7 @@ import static java.lang.Long.valueOf;
*
*/
@Singleton
-public class DefaultVisitInfoManager extends AbstractMultiEnvironmentManager
+public class DefaultVisitInfoManager extends AbstractEnvironmentManager
implements VisitInfoManager, Serializable {
private static final Logger logger = LoggerFactory.getLogger(DefaultVisitInfoManager.class);