Skip to content

The Unified and Autonomous Development Platform

Some bug fixes and improvements

Robin Shen69baf8349db4
diff --git a/pom.xml b/pom.xml
index 561d77bc70..14399fd7e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -614,8 +614,8 @@
</repository>
</repositories>
<properties>
- <commons.version>2.7.13</commons.version>
- <agent.version>1.8.6</agent.version>
+ <commons.version>2.7.14</commons.version>
+ <agent.version>1.8.7</agent.version>
<slf4j.version>1.7.36</slf4j.version>
<logback.version>1.2.11</logback.version>
<antlr.version>4.7.2</antlr.version>
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.java
index 3d44f954bd..c4bdcfd7d8 100644
--- a/server-core/src/main/java/io/onedev/server/CoreModule.java
+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java
@@ -689,7 +689,7 @@ public class CoreModule extends AbstractPluginModule {
return CleanDatabase.class;
else if (ResetAdminPassword.COMMAND.equals(Bootstrap.command.getName()))
return ResetAdminPassword.class;
- else
+ else
throw new RuntimeException("Unrecognized command: " + Bootstrap.command.getName());
} else {
return OneDev.class;
diff --git a/server-core/src/main/java/io/onedev/server/OneDev.java b/server-core/src/main/java/io/onedev/server/OneDev.java
index fddb6c0e3a..a9ad3b591e 100644
--- a/server-core/src/main/java/io/onedev/server/OneDev.java
+++ b/server-core/src/main/java/io/onedev/server/OneDev.java
@@ -41,21 +41,20 @@ import javax.ws.rs.client.Invocation;
import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.Response;
import java.io.*;
+import java.lang.reflect.Method;
import java.net.ServerSocket;
import java.nio.charset.StandardCharsets;
import java.sql.SQLException;
import java.util.Date;
-import java.util.Properties;
import java.util.Set;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.atomic.AtomicReference;
-import static io.onedev.commons.utils.FileUtils.loadProperties;
import static io.onedev.k8shelper.KubernetesHelper.BEARER;
import static io.onedev.server.persistence.PersistenceUtils.callWithTransaction;
import static javax.ws.rs.core.HttpHeaders.AUTHORIZATION;
-public class OneDev extends AbstractPlugin implements Serializable {
+public class OneDev extends AbstractPlugin implements Serializable, Runnable {
private static final Logger logger = LoggerFactory.getLogger(OneDev.class);
@@ -83,6 +82,10 @@ public class OneDev extends AbstractPlugin implements Serializable {
private volatile InitStage initStage;
+ private Class<?> wrapperManagerClass;
+
+ private volatile Thread thread;
+
// Some are injected via provider as instantiation might encounter problem during upgrade
@Inject
public OneDev(Provider<JettyLauncher> jettyLauncherProvider, TaskScheduler taskScheduler,
@@ -100,19 +103,36 @@ public class OneDev extends AbstractPlugin implements Serializable {
this.clusterManager = clusterManager;
this.idManager = idManager;
this.sessionFactoryManager = sessionFactoryManager;
+
+ try {
+ wrapperManagerClass = Class.forName("org.tanukisoftware.wrapper.WrapperManager");
+ } catch (ClassNotFoundException e) {
+ }
+ thread = new Thread(this);
initStage = new InitStage("Server is Starting...");
}
@Override
public void start() {
+ var maintenanceFile = getMaintenanceFile(Bootstrap.installDir);
+ while (maintenanceFile.exists()) {
+ logger.info("Maintenance in progress, waiting...");
+ try {
+ Thread.sleep(5000);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
SecurityUtils.bindAsSystem();
System.setProperty("hsqldb.reconfig_logging", "false");
System.setProperty("hsqldb.method_class_names", "java.lang.Math");
-
- sessionFactoryManager.start();
+ clusterManager.start();
+ sessionFactoryManager.start();
+
try (var conn = persistenceManager.openConnection()) {
callWithTransaction(conn, () -> {
persistenceManager.populateDatabase(conn);
@@ -122,13 +142,8 @@ public class OneDev extends AbstractPlugin implements Serializable {
throw new RuntimeException(e);
};
- clusterManager.start();
idManager.init();
- // restart session factory to pick up Hazelcast 2nd level cache
- sessionFactoryManager.stop();
- sessionFactoryManager.start();
-
sessionManager.run(() -> listenerRegistry.post(new SystemStarting()));
jettyLauncherProvider.get().start();
@@ -184,11 +199,13 @@ public class OneDev extends AbstractPlugin implements Serializable {
initStage = null;
listenerRegistry.post(new SystemStarted());
clusterManager.postStart();
+ thread.start();
logger.info("Server is ready at " + guessServerUrl() + ".");
}
@Override
public void preStop() {
+ thread = null;
clusterManager.preStop();
SecurityUtils.bindAsSystem();
try {
@@ -207,9 +224,8 @@ public class OneDev extends AbstractPlugin implements Serializable {
jettyLauncherProvider.get().stop();
sessionManager.run(() -> listenerRegistry.post(new SystemStopped()));
- // stop cluster manager first as it depends on metadata of session factory
- clusterManager.stop();
sessionFactoryManager.stop();
+ clusterManager.stop();
executorService.shutdown();
} catch (ServerNotReadyException ignore) {
}
@@ -319,9 +335,8 @@ public class OneDev extends AbstractPlugin implements Serializable {
}
public static boolean isServerRunning(File installDir) {
- Properties props = loadProperties(new File(installDir, "conf/server.properties"));
- int sshPort = Integer.parseInt(props.get("ssh_port").toString());
- try (ServerSocket ignored = new ServerSocket(sshPort)) {
+ var serverConfig = new ServerConfig(installDir);
+ try (ServerSocket ignored = new ServerSocket(serverConfig.getClusterPort())) {
return false;
} catch (IOException e) {
if (e.getMessage() != null && e.getMessage().contains("Address already in use"))
@@ -335,4 +350,50 @@ public class OneDev extends AbstractPlugin implements Serializable {
return new File(Bootstrap.getSiteDir(), "assets");
}
+ public static File getMaintenanceFile(File installDir) {
+ return new File(installDir, "maintenance");
+ }
+
+ private void restart() {
+ if (wrapperManagerClass != null) {
+ try {
+ Method method = wrapperManagerClass.getDeclaredMethod("restartAndReturn");
+ method.invoke(null, new Object[0]);
+ } catch (Exception e) {
+ logger.error("Error restarting server", e);
+ }
+ } else {
+ logger.warn("Restart request ignored as there is no wrapper manager available");
+ }
+ }
+
+ @Override
+ public void run() {
+ var localServer = clusterManager.getLocalServerAddress();
+ var maintenanceFile = getMaintenanceFile(Bootstrap.installDir);
+ while (thread != null) {
+ if (maintenanceFile.exists()) {
+ logger.info("Maintenance requested, trying to stop all servers...");
+ clusterManager.submitToAllServers(() -> {
+ if (!localServer.equals(clusterManager.getLocalServerAddress()))
+ restart();
+ return null;
+ });
+ while (thread != null && clusterManager.getServerAddresses().size() != 1) {
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException ignored) {
+ }
+ }
+ restart();
+ break;
+ } else {
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException ignored) {
+ }
+ }
+ }
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/ServerConfig.java b/server-core/src/main/java/io/onedev/server/ServerConfig.java
index 9b44c62f87..a1f7e2d9ba 100644
--- a/server-core/src/main/java/io/onedev/server/ServerConfig.java
+++ b/server-core/src/main/java/io/onedev/server/ServerConfig.java
@@ -1,25 +1,130 @@
package io.onedev.server;
-public interface ServerConfig {
-
- /**
- * Get http port configured for the server.
- * <p>
- * @return
- * http port of the server, or <i>0</i> if http port is not defined
- */
- int getHttpPort();
-
- /**
- * Get ssh port configured for the server.
- * <p>
- * @return
- * ssh port of the server
- */
- int getSshPort();
-
- String getClusterIp();
-
- int getClusterPort();
+import com.google.common.base.Splitter;
+import io.onedev.server.persistence.HibernateConfig;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.util.List;
+import java.util.Properties;
+
+import static io.onedev.commons.utils.FileUtils.loadProperties;
+
+public class ServerConfig {
+ private static final Logger logger = LoggerFactory.getLogger(ServerConfig.class);
+
+ private static final String PROP_HTTP_PORT = "http_port";
+
+ private static final String PROP_SSH_PORT = "ssh_port";
+
+ private static final String PROP_CLUSTER_IP = "cluster_ip";
+
+ private static final String PROP_CLUSTER_PORT = "cluster_port";
+
+ private final int httpPort;
+
+ private final int sshPort;
+
+ private final String clusterIp;
+
+ private final int clusterPort;
+
+ public ServerConfig(File installDir) {
+ File file = new File(installDir, "conf/server.properties");
+ Properties props = loadProperties(file);
+
+ String httpPortStr = System.getenv(PROP_HTTP_PORT);
+ if (StringUtils.isBlank(httpPortStr))
+ httpPortStr = props.getProperty(PROP_HTTP_PORT);
+ if (StringUtils.isNotBlank(httpPortStr)) {
+ httpPort = Integer.parseInt(httpPortStr.trim());
+ } else {
+ logger.warn(PROP_HTTP_PORT + " not specified, default to 6610");
+ httpPort = 6610;
+ }
+
+ String sshPortStr = System.getenv(PROP_SSH_PORT);
+ if (StringUtils.isBlank(sshPortStr))
+ sshPortStr = props.getProperty(PROP_SSH_PORT);
+ if (StringUtils.isNotBlank(sshPortStr)) {
+ sshPort = Integer.parseInt(sshPortStr.trim());
+ } else {
+ logger.warn(PROP_SSH_PORT + " not specified, default to 6611");
+ sshPort = 6611;
+ }
+
+ String clusterIp = System.getenv(PROP_CLUSTER_IP);
+ if (StringUtils.isBlank(clusterIp))
+ clusterIp = props.getProperty(PROP_CLUSTER_IP);
+
+ if (StringUtils.isBlank(clusterIp)) {
+ HibernateConfig hibernateConfig = new HibernateConfig(installDir);
+ String dbUrl = StringUtils.substringAfter(hibernateConfig.getUrl(), ":");
+ if (dbUrl.startsWith("hsqldb")) {
+ clusterIp = "127.0.0.1";
+ } else {
+ String dbHost;
+ int dbPort;
+ if (dbUrl.startsWith("oracle")) {
+ List<String> fields = Splitter.on(":").splitToList(dbUrl);
+ dbHost = StringUtils.stripStart(fields.get(2), "@");
+ String dbPortString = fields.get(3);
+ if (dbPortString.contains("/"))
+ dbPort = Integer.parseInt(StringUtils.substringBefore(dbPortString, "/"));
+ else
+ dbPort = Integer.parseInt(dbPortString);
+ } else {
+ String tempStr = StringUtils.substringAfter(dbUrl, "//");
+ dbHost = StringUtils.substringBefore(tempStr, ":");
+ tempStr = StringUtils.substringAfter(tempStr, ":");
+ if (dbUrl.startsWith("sqlserver")) {
+ dbPort = Integer.parseInt(StringUtils.substringBefore(tempStr, ";"));
+ } else {
+ tempStr = StringUtils.substringBefore(tempStr, "/");
+ // Fix issue https://code.onedev.io/onedev/server/~issues/1086
+ tempStr = StringUtils.substringBefore(tempStr, ",");
+ dbPort = Integer.parseInt(tempStr);
+ }
+ }
+
+ try (Socket socket = new Socket()) {
+ socket.connect(new InetSocketAddress(dbHost, dbPort));
+ clusterIp = socket.getLocalAddress().getHostAddress();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+ this.clusterIp = clusterIp;
+
+ String clusterPortStr = System.getenv(PROP_CLUSTER_PORT);
+ if (StringUtils.isBlank(clusterPortStr))
+ clusterPortStr = props.getProperty(PROP_CLUSTER_PORT);
+ if (StringUtils.isBlank(clusterPortStr))
+ clusterPort = 5710;
+ else
+ clusterPort = Integer.parseInt(clusterPortStr.trim());
+ }
+
+ public int getHttpPort() {
+ return httpPort;
+ }
+
+ public int getSshPort() {
+ return sshPort;
+ }
+
+ public String getClusterIp() {
+ return clusterIp;
+ }
+
+ public int getClusterPort() {
+ return clusterPort;
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/cluster/ClusterManager.java b/server-core/src/main/java/io/onedev/server/cluster/ClusterManager.java
index 7424f73e97..14dd0f0fe8 100644
--- a/server-core/src/main/java/io/onedev/server/cluster/ClusterManager.java
+++ b/server-core/src/main/java/io/onedev/server/cluster/ClusterManager.java
@@ -27,6 +27,7 @@ public interface ClusterManager {
boolean isLeaderServer();
+ @Nullable
HazelcastInstance getHazelcastInstance();
void init(IAtomicLong data, Callable<Long> initializer);
diff --git a/server-core/src/main/java/io/onedev/server/cluster/DefaultClusterManager.java b/server-core/src/main/java/io/onedev/server/cluster/DefaultClusterManager.java
index 227aa0add6..804404de08 100644
--- a/server-core/src/main/java/io/onedev/server/cluster/DefaultClusterManager.java
+++ b/server-core/src/main/java/io/onedev/server/cluster/DefaultClusterManager.java
@@ -1,6 +1,5 @@
package io.onedev.server.cluster;
-import com.google.common.hash.Hashing;
import com.hazelcast.cluster.Member;
import com.hazelcast.cluster.MembershipEvent;
import com.hazelcast.cluster.MembershipListener;
@@ -17,7 +16,6 @@ import io.onedev.server.ServerConfig;
import io.onedev.server.event.ListenerRegistry;
import io.onedev.server.event.cluster.ConnectionLost;
import io.onedev.server.event.cluster.ConnectionRestored;
-import io.onedev.server.model.ClusterServer;
import io.onedev.server.persistence.HibernateConfig;
import io.onedev.server.persistence.PersistenceManager;
import io.onedev.server.replica.ProjectReplica;
@@ -25,7 +23,6 @@ import org.eclipse.jetty.server.session.SessionData;
import javax.inject.Inject;
import javax.inject.Singleton;
-import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
@@ -34,12 +31,9 @@ import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
-import static io.onedev.server.model.AbstractEntity.PROP_ID;
-import static io.onedev.server.model.ClusterServer.PROP_ADDRESS;
-import static io.onedev.server.persistence.PersistenceUtils.callWithDatabaseLock;
+import static io.onedev.server.persistence.PersistenceUtils.*;
import static io.onedev.server.replica.ProjectReplica.Type.PRIMARY;
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static java.util.Collections.max;
+import static java.lang.String.format;
import static java.util.stream.Collectors.toList;
@Singleton
@@ -47,6 +41,10 @@ public class DefaultClusterManager implements ClusterManager {
private static final String EXECUTOR_SERVICE_NAME = "default";
+ private static final String TABLE_SERVER = "o_ClusterServer";
+
+ private static final String COLUMN_ADDRESS = "o_address";
+
private final ServerConfig serverConfig;
private final HibernateConfig hibernateConfig;
@@ -63,8 +61,6 @@ public class DefaultClusterManager implements ClusterManager {
private volatile HazelcastInstance hazelcastInstance;
- private final String credential;
-
@Inject
public DefaultClusterManager(ServerConfig serverConfig, PersistenceManager persistenceManager,
ListenerRegistry listenerRegistry, HibernateConfig hibernateConfig) {
@@ -72,10 +68,6 @@ public class DefaultClusterManager implements ClusterManager {
this.persistenceManager = persistenceManager;
this.listenerRegistry = listenerRegistry;
this.hibernateConfig = hibernateConfig;
- var dbPassword = hibernateConfig.getPassword();
- if (dbPassword == null)
- dbPassword = "";
- credential = Hashing.sha256().hashString(dbPassword, UTF_8).toString();
}
@Override
@@ -83,59 +75,48 @@ public class DefaultClusterManager implements ClusterManager {
return serverConfig.getClusterIp() + ":" + serverConfig.getClusterPort();
}
- private void saveServer(Connection conn, Long id, String server) {
- try (Statement stmt = conn.createStatement()) {
- stmt.executeUpdate(String.format(
- "insert into %s values(%d, '%s')",
- persistenceManager.getTableName(ClusterServer.class), id, server));
- } catch (SQLException e) {
- throw new RuntimeException(e);
- }
- }
-
@Override
public void start() {
var localServer = getLocalServerAddress();
Collection<String> servers;
try (var conn = persistenceManager.openConnection()) {
- var callable = new Callable<Collection<String>>() {
-
- @Override
- public Collection<String> call() {
- var servers = new HashMap<Long, String>();
- try (Statement stmt = conn.createStatement()) {
- String query = String.format("select %s, %s from %s",
- persistenceManager.getColumnName(PROP_ID),
- persistenceManager.getColumnName(PROP_ADDRESS),
- persistenceManager.getTableName(ClusterServer.class),
- persistenceManager.getColumnName(PROP_ID));
- try (ResultSet resultset = stmt.executeQuery(query)) {
- while (resultset.next())
- servers.put(resultset.getLong(1), resultset.getString(2));
- }
+ servers = callWithLock(conn, () -> {
+ var innerServers = new HashSet<String>();
+ if (!tableExists(conn, TABLE_SERVER)) {
+ try (var stmt = conn.createStatement()) {
+ stmt.execute(format("create table %s (%s varchar(255))", TABLE_SERVER, COLUMN_ADDRESS));
} catch (SQLException e) {
throw new RuntimeException(e);
}
-
- if (!servers.containsValue(localServer)) {
- Long nextId = servers.isEmpty() ? 1L : max(servers.keySet()) + 1L;
- saveServer(conn, nextId, localServer);
- servers.put(nextId, localServer);
+ }
+ try (Statement stmt = conn.createStatement()) {
+ String query = format("select %s from %s", COLUMN_ADDRESS, TABLE_SERVER);
+ try (ResultSet resultset = stmt.executeQuery(query)) {
+ while (resultset.next())
+ innerServers.add(resultset.getString(1));
}
+ } catch (SQLException e) {
+ throw new RuntimeException(e);
+ }
- return servers.values();
+ if (!innerServers.contains(localServer)) {
+ try (Statement stmt = conn.createStatement()) {
+ stmt.executeUpdate(format(
+ "insert into %s values('%s')",
+ TABLE_SERVER, localServer));
+ } catch (SQLException e) {
+ throw new RuntimeException(e);
+ }
+ innerServers.add(localServer);
}
- };
- if (hibernateConfig.isHSQLDialect())
- servers = callable.call();
- else
- servers = callWithDatabaseLock(conn, callable);
+ return innerServers;
+ });
} catch (SQLException e) {
throw new RuntimeException(e);
};
Config config = new Config();
- config.setClusterName(credential);
+ config.setClusterName(hibernateConfig.getClusterCredential());
config.setInstanceName(localServer);
config.setProperty("hazelcast.shutdownhook.enabled", "false");
config.getExecutorConfig(EXECUTOR_SERVICE_NAME).setPoolSize(Integer.MAX_VALUE);
@@ -210,15 +191,16 @@ public class DefaultClusterManager implements ClusterManager {
}
try (var conn = persistenceManager.openConnection()) {
- try (Statement stmt = conn.createStatement()) {
- stmt.executeUpdate(String.format(
- "delete from %s where %s='%s'",
- persistenceManager.getTableName(ClusterServer.class),
- persistenceManager.getColumnName(PROP_ADDRESS),
- localServer));
- } catch (SQLException e) {
- throw new RuntimeException(e);
- }
+ callWithTransaction(conn, () -> {
+ try (Statement stmt = conn.createStatement()) {
+ stmt.executeUpdate(String.format(
+ "delete from %s where %s='%s'",
+ TABLE_SERVER, COLUMN_ADDRESS, localServer));
+ } catch (SQLException e) {
+ throw new RuntimeException(e);
+ }
+ return true;
+ });
} catch (SQLException e) {
throw new RuntimeException(e);
}
@@ -378,7 +360,7 @@ public class DefaultClusterManager implements ClusterManager {
@Override
public String getCredential() {
- return credential;
+ return hibernateConfig.getClusterCredential();
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/commandhandler/ApplyDatabaseConstraints.java b/server-core/src/main/java/io/onedev/server/commandhandler/ApplyDatabaseConstraints.java
index 9c979eebe6..ca80c49901 100644
--- a/server-core/src/main/java/io/onedev/server/commandhandler/ApplyDatabaseConstraints.java
+++ b/server-core/src/main/java/io/onedev/server/commandhandler/ApplyDatabaseConstraints.java
@@ -1,11 +1,8 @@
package io.onedev.server.commandhandler;
-import io.onedev.commons.bootstrap.Bootstrap;
-import io.onedev.commons.loader.AbstractPlugin;
-import io.onedev.server.OneDev;
+import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.persistence.HibernateConfig;
import io.onedev.server.persistence.PersistenceManager;
-import io.onedev.server.persistence.PersistenceUtils;
import io.onedev.server.persistence.SessionFactoryManager;
import io.onedev.server.security.SecurityUtils;
import org.slf4j.Logger;
@@ -16,12 +13,11 @@ import javax.inject.Singleton;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
-import java.sql.SQLException;
import static io.onedev.server.persistence.PersistenceUtils.callWithTransaction;
@Singleton
-public class ApplyDatabaseConstraints extends AbstractPlugin {
+public class ApplyDatabaseConstraints extends CommandHandler {
public static final String COMMAND = "apply-db-constraints";
@@ -35,7 +31,8 @@ public class ApplyDatabaseConstraints extends AbstractPlugin {
@Inject
public ApplyDatabaseConstraints(SessionFactoryManager sessionFactoryManager, PersistenceManager persistenceManager,
- HibernateConfig hibernateConfig) {
+ HibernateConfig hibernateConfig) {
+ super(hibernateConfig);
this.sessionFactoryManager = sessionFactoryManager;
this.persistenceManager = persistenceManager;
this.hibernateConfig = hibernateConfig;
@@ -45,52 +42,50 @@ public class ApplyDatabaseConstraints extends AbstractPlugin {
public void start() {
SecurityUtils.bindAsSystem();
- if (OneDev.isServerRunning(Bootstrap.installDir)) {
- logger.error("Please stop server before applying db constraints");
- System.exit(1);
- }
+ try {
+ if (doMaintenance(() -> {
+ sessionFactoryManager.start();
+ try (var conn = persistenceManager.openConnection()) {
+ return callWithTransaction(conn, () -> {
+ persistenceManager.checkDataVersion(conn, false);
- sessionFactoryManager.start();
-
- try (var conn = persistenceManager.openConnection()) {
- callWithTransaction(conn, () -> {
- persistenceManager.checkDataVersion(conn, false);
+ logger.warn("This script is mainly used to apply database constraints after fixing database integrity issues (may happen during restore/upgrade)");
- logger.warn("This script is mainly used to apply database constraints after fixing database integrity issues (may happen during restore/upgrade)");
+ BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
+ while (true) {
+ logger.warn("Press 'y' to run the script, or 'n' to stop");
+ String input;
+ try {
+ input = reader.readLine();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ if (input.equalsIgnoreCase("y"))
+ break;
+ else if (input.equalsIgnoreCase("n"))
+ return false;
+ }
- BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
- while (true) {
- logger.warn("Press 'y' to run the script, or 'n' to stop");
- String input;
+ persistenceManager.dropConstraints(conn);
+ persistenceManager.applyConstraints(conn);
+ return true;
+ });
+ }
+ })) {
+ if (hibernateConfig.isHSQLDialect()) {
try {
- input = reader.readLine();
- } catch (IOException e) {
- throw new RuntimeException(e);
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
}
- if (input.equalsIgnoreCase("y"))
- break;
- else if (input.equalsIgnoreCase("n"))
- System.exit(0);
}
- persistenceManager.dropConstraints(conn);
- persistenceManager.applyConstraints(conn);
- return null;
- });
- } catch (SQLException e) {
- throw new RuntimeException(e);
- }
-
- if (hibernateConfig.isHSQLDialect()) {
- try {
- Thread.sleep(1000);
- } catch (InterruptedException e) {
+ logger.info("Database constraints is applied successfully");
}
+ System.exit(0);
+ } catch (ExplicitException e) {
+ logger.error(e.getMessage());
+ System.exit(1);
}
-
- logger.info("Database constraints is applied successfully");
-
- System.exit(0);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/commandhandler/BackupDatabase.java b/server-core/src/main/java/io/onedev/server/commandhandler/BackupDatabase.java
index e3c15063c3..de1933c63c 100644
--- a/server-core/src/main/java/io/onedev/server/commandhandler/BackupDatabase.java
+++ b/server-core/src/main/java/io/onedev/server/commandhandler/BackupDatabase.java
@@ -1,10 +1,9 @@
package io.onedev.server.commandhandler;
import io.onedev.commons.bootstrap.Bootstrap;
-import io.onedev.commons.loader.AbstractPlugin;
import io.onedev.commons.utils.ExceptionUtils;
+import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.FileUtils;
-import io.onedev.server.OneDev;
import io.onedev.server.persistence.HibernateConfig;
import io.onedev.server.persistence.PersistenceManager;
import io.onedev.server.persistence.SessionFactoryManager;
@@ -20,7 +19,7 @@ import java.sql.SQLException;
import static io.onedev.server.persistence.PersistenceUtils.callWithTransaction;
@Singleton
-public class BackupDatabase extends AbstractPlugin {
+public class BackupDatabase extends CommandHandler {
public static final String COMMAND = "backup-db";
@@ -32,9 +31,12 @@ public class BackupDatabase extends AbstractPlugin {
private final HibernateConfig hibernateConfig;
+ private File backupFile;
+
@Inject
- public BackupDatabase(PersistenceManager persistenceManager, SessionFactoryManager sessionFactoryManager,
- HibernateConfig hibernateConfig) {
+ public BackupDatabase(PersistenceManager persistenceManager, SessionFactoryManager sessionFactoryManager,
+ HibernateConfig hibernateConfig) {
+ super(hibernateConfig);
this.persistenceManager = persistenceManager;
this.sessionFactoryManager = sessionFactoryManager;
this.hibernateConfig = hibernateConfig;
@@ -48,7 +50,7 @@ public class BackupDatabase extends AbstractPlugin {
logger.error("Missing backup file parameter. Usage: {} <path to database backup file>", Bootstrap.command.getScript());
System.exit(1);
}
- File backupFile = new File(Bootstrap.command.getArgs()[0]);
+ backupFile = new File(Bootstrap.command.getArgs()[0]);
if (!backupFile.isAbsolute() && System.getenv("WRAPPER_INIT_DIR") != null)
backupFile = new File(System.getenv("WRAPPER_INIT_DIR"), backupFile.getPath());
@@ -57,39 +59,40 @@ public class BackupDatabase extends AbstractPlugin {
logger.error("Backup file already exists: {}", backupFile.getAbsolutePath());
System.exit(1);
}
-
- if (OneDev.isServerRunning(Bootstrap.installDir) && hibernateConfig.isHSQLDialect()) {
- logger.error("Please stop server before backing up database");
- System.exit(1);
- }
- sessionFactoryManager.start();
+ try {
+ doMaintenance(() -> {
+ sessionFactoryManager.start();
+
+ try (var conn = persistenceManager.openConnection()) {
+ callWithTransaction(conn, () -> {
+ persistenceManager.checkDataVersion(conn, false);
+ return null;
+ });
+ } catch (SQLException e) {
+ throw new RuntimeException(e);
+ }
+
+ logger.info("Backing up database to {}...", backupFile.getAbsolutePath());
+
+ File tempDir = FileUtils.createTempDir("backup");
+ try {
+ persistenceManager.exportData(tempDir);
+ FileUtils.zip(tempDir, backupFile, null);
+ } catch (Exception e) {
+ throw ExceptionUtils.unchecked(e);
+ } finally {
+ FileUtils.deleteDir(tempDir);
+ }
- try (var conn = persistenceManager.openConnection()) {
- callWithTransaction(conn, () -> {
- persistenceManager.checkDataVersion(conn, false);
- return null;
+ logger.info("Database is successfully backed up to {}", backupFile.getAbsolutePath());
+ return null;
});
- } catch (SQLException e) {
- throw new RuntimeException(e);
- }
- ;
-
- logger.info("Backing up database to {}...", backupFile.getAbsolutePath());
-
- File tempDir = FileUtils.createTempDir("backup");
- try {
- persistenceManager.exportData(tempDir);
- FileUtils.zip(tempDir, backupFile, null);
- } catch (Exception e) {
- throw ExceptionUtils.unchecked(e);
- } finally {
- FileUtils.deleteDir(tempDir);
+ System.exit(0);
+ } catch (ExplicitException e) {
+ logger.error(e.getMessage());
+ System.exit(1);
}
-
- logger.info("Database is successfully backed up to {}", backupFile.getAbsolutePath());
-
- System.exit(0);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/commandhandler/CheckDataVersion.java b/server-core/src/main/java/io/onedev/server/commandhandler/CheckDataVersion.java
index 64ed2adf1c..372f2409b2 100644
--- a/server-core/src/main/java/io/onedev/server/commandhandler/CheckDataVersion.java
+++ b/server-core/src/main/java/io/onedev/server/commandhandler/CheckDataVersion.java
@@ -1,7 +1,7 @@
package io.onedev.server.commandhandler;
import io.onedev.commons.bootstrap.Bootstrap;
-import io.onedev.commons.loader.AbstractPlugin;
+import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
import io.onedev.server.persistence.HibernateConfig;
import io.onedev.server.persistence.PersistenceManager;
@@ -17,7 +17,7 @@ import java.sql.SQLException;
import static io.onedev.server.persistence.PersistenceUtils.callWithTransaction;
@Singleton
-public class CheckDataVersion extends AbstractPlugin {
+public class CheckDataVersion extends CommandHandler {
public static final String COMMAND = "check-data-version";
@@ -31,7 +31,8 @@ public class CheckDataVersion extends AbstractPlugin {
@Inject
public CheckDataVersion(SessionFactoryManager sessionFactoryManager, PersistenceManager persistenceManager,
- HibernateConfig hibernateConfig) {
+ HibernateConfig hibernateConfig) {
+ super(hibernateConfig);
this.sessionFactoryManager = sessionFactoryManager;
this.persistenceManager = persistenceManager;
this.hibernateConfig = hibernateConfig;
@@ -40,24 +41,27 @@ public class CheckDataVersion extends AbstractPlugin {
@Override
public void start() {
SecurityUtils.bindAsSystem();
-
- if (OneDev.isServerRunning(Bootstrap.installDir) && hibernateConfig.isHSQLDialect()) {
- logger.error("Please stop server before checking data version");
+
+ try {
+ doMaintenance(() -> {
+ sessionFactoryManager.start();
+
+ // Use system.out in case logger is suppressed by user as this output is important to
+ // upgrade procedure
+ String dataVersion;
+ try (var conn = persistenceManager.openConnection()) {
+ dataVersion = callWithTransaction(conn, () -> persistenceManager.checkDataVersion(conn, false));
+ } catch (SQLException e) {
+ throw new RuntimeException(e);
+ }
+ System.out.println("Data version: " + dataVersion);
+ return null;
+ });
+ System.exit(0);
+ } catch (ExplicitException e) {
+ logger.error(e.getMessage());
System.exit(1);
}
-
- sessionFactoryManager.start();
-
- // Use system.out in case logger is suppressed by user as this output is important to
- // upgrade procedure
- String dataVersion;
- try (var conn = persistenceManager.openConnection()) {
- dataVersion = callWithTransaction(conn, () -> persistenceManager.checkDataVersion(conn, false));
- } catch (SQLException e) {
- throw new RuntimeException(e);
- }
- System.out.println("Data version: " + dataVersion);
- System.exit(0);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/commandhandler/CleanDatabase.java b/server-core/src/main/java/io/onedev/server/commandhandler/CleanDatabase.java
index b6161237e8..b784758995 100644
--- a/server-core/src/main/java/io/onedev/server/commandhandler/CleanDatabase.java
+++ b/server-core/src/main/java/io/onedev/server/commandhandler/CleanDatabase.java
@@ -1,24 +1,19 @@
package io.onedev.server.commandhandler;
-import java.sql.Connection;
-import java.sql.SQLException;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import io.onedev.commons.bootstrap.Bootstrap;
-import io.onedev.commons.loader.AbstractPlugin;
-import io.onedev.server.OneDev;
-import io.onedev.server.persistence.PersistenceManager;
+import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.persistence.HibernateConfig;
+import io.onedev.server.persistence.PersistenceManager;
import io.onedev.server.persistence.SessionFactoryManager;
import io.onedev.server.security.SecurityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import java.sql.SQLException;
@Singleton
-public class CleanDatabase extends AbstractPlugin {
+public class CleanDatabase extends CommandHandler {
public static final String COMMAND = "clean-db";
@@ -32,7 +27,8 @@ public class CleanDatabase extends AbstractPlugin {
@Inject
public CleanDatabase(SessionFactoryManager sessionFactoryManager, PersistenceManager persistenceManager,
- HibernateConfig hibernateConfig) {
+ HibernateConfig hibernateConfig) {
+ super(hibernateConfig);
this.sessionFactoryManager = sessionFactoryManager;
this.persistenceManager = persistenceManager;
this.hibernateConfig = hibernateConfig;
@@ -41,35 +37,38 @@ public class CleanDatabase extends AbstractPlugin {
@Override
public void start() {
SecurityUtils.bindAsSystem();
-
- if (OneDev.isServerRunning(Bootstrap.installDir)) {
- logger.error("Please stop server before cleaning database");
- System.exit(1);
- }
- sessionFactoryManager.start();
-
- // Run this in autocommit mode as some sqls in the clean script may fail
- // when drop non-existent constraints, and we want to ignore them and
- // continue to execute other sql statements without rolling back whole
- // transaction
- try (var conn = persistenceManager.openConnection()) {
- conn.setAutoCommit(true);
- persistenceManager.checkDataVersion(conn, false);
- persistenceManager.cleanDatabase(conn);
- } catch (SQLException e) {
- throw new RuntimeException(e);
- };
+ try {
+ doMaintenance(() -> {
+ sessionFactoryManager.start();
+
+ // Run this in autocommit mode as some sqls in the clean script may fail
+ // when drop non-existent constraints, and we want to ignore them and
+ // continue to execute other sql statements without rolling back whole
+ // transaction
+ try (var conn = persistenceManager.openConnection()) {
+ conn.setAutoCommit(true);
+ persistenceManager.checkDataVersion(conn, false);
+ persistenceManager.cleanDatabase(conn);
+ } catch (SQLException e) {
+ throw new RuntimeException(e);
+ }
- if (hibernateConfig.isHSQLDialect()) {
- try {
- Thread.sleep(1000);
- } catch (InterruptedException e) {
- }
+ if (hibernateConfig.isHSQLDialect()) {
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ }
+ }
+ logger.info("Database is cleaned successfully");
+
+ return null;
+ });
+ System.exit(0);
+ } catch (ExplicitException e) {
+ logger.error(e.getMessage());
+ System.exit(1);
}
- logger.info("Database is cleaned successfully");
-
- System.exit(0);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/commandhandler/CommandHandler.java b/server-core/src/main/java/io/onedev/server/commandhandler/CommandHandler.java
new file mode 100644
index 0000000000..d8f3c80493
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/commandhandler/CommandHandler.java
@@ -0,0 +1,64 @@
+package io.onedev.server.commandhandler;
+
+import io.onedev.commons.bootstrap.Bootstrap;
+import io.onedev.commons.loader.AbstractPlugin;
+import io.onedev.server.OneDev;
+import io.onedev.server.persistence.HibernateConfig;
+import io.onedev.server.util.ExceptionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.concurrent.Callable;
+
+import static io.onedev.server.persistence.PersistenceUtils.callWithLock;
+import static io.onedev.server.persistence.PersistenceUtils.openConnection;
+
+public abstract class CommandHandler extends AbstractPlugin {
+
+ private static final Logger logger = LoggerFactory.getLogger(CommandHandler.class);
+
+ private final HibernateConfig hibernateConfig;
+
+ public CommandHandler(HibernateConfig hibernateConfig) {
+ this.hibernateConfig = hibernateConfig;
+ }
+
+ protected <T> T doMaintenance(Callable<T> callable) {
+ try {
+ var maintenanceFile = OneDev.getMaintenanceFile(Bootstrap.installDir);
+ if (maintenanceFile.exists()) {
+ waitForServerStop();
+ return callable.call();
+ } else if (!hibernateConfig.isHSQLDialect()) {
+ try (var conn = openConnection(hibernateConfig, Thread.currentThread().getContextClassLoader())) {
+ return callWithLock(conn, () -> {
+ maintenanceFile.createNewFile();
+ try {
+ waitForServerStop();
+ return callable.call();
+ } finally {
+ maintenanceFile.delete();
+ }
+ });
+ }
+ } else {
+ maintenanceFile.createNewFile();
+ try {
+ waitForServerStop();
+ return callable.call();
+ } finally {
+ maintenanceFile.delete();
+ }
+ }
+ } catch (Exception e) {
+ throw ExceptionUtils.unchecked(e);
+ }
+ }
+
+ private void waitForServerStop() throws InterruptedException {
+ logger.info("Waiting for server to stop...");
+ while (OneDev.isServerRunning(Bootstrap.installDir)) {
+ Thread.sleep(1000);
+ }
+ }
+}
diff --git a/server-core/src/main/java/io/onedev/server/commandhandler/ResetAdminPassword.java b/server-core/src/main/java/io/onedev/server/commandhandler/ResetAdminPassword.java
index 2ec8d002ea..a66978ce4e 100644
--- a/server-core/src/main/java/io/onedev/server/commandhandler/ResetAdminPassword.java
+++ b/server-core/src/main/java/io/onedev/server/commandhandler/ResetAdminPassword.java
@@ -1,14 +1,12 @@
package io.onedev.server.commandhandler;
import io.onedev.commons.bootstrap.Bootstrap;
-import io.onedev.commons.loader.AbstractPlugin;
-import io.onedev.server.OneDev;
+import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.User;
+import io.onedev.server.persistence.HibernateConfig;
import io.onedev.server.persistence.PersistenceManager;
-import io.onedev.server.persistence.PersistenceUtils;
import io.onedev.server.persistence.SessionFactoryManager;
-import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.security.SecurityUtils;
import org.apache.shiro.authc.credential.PasswordService;
import org.slf4j.Logger;
@@ -21,7 +19,7 @@ import java.sql.SQLException;
import static io.onedev.server.persistence.PersistenceUtils.callWithTransaction;
@Singleton
-public class ResetAdminPassword extends AbstractPlugin {
+public class ResetAdminPassword extends CommandHandler {
public static final String COMMAND = "reset-admin-password";
@@ -36,9 +34,10 @@ public class ResetAdminPassword extends AbstractPlugin {
private final PasswordService passwordService;
@Inject
- public ResetAdminPassword(PersistenceManager persistenceManager, SessionFactoryManager sessionFactoryManager,
- UserManager userManager, PasswordService passwordService,
- TransactionManager transactionManager) {
+ public ResetAdminPassword(HibernateConfig hibernateConfig, PersistenceManager persistenceManager,
+ SessionFactoryManager sessionFactoryManager, UserManager userManager,
+ PasswordService passwordService) {
+ super(hibernateConfig);
this.persistenceManager = persistenceManager;
this.sessionFactoryManager = sessionFactoryManager;
this.userManager = userManager;
@@ -53,42 +52,44 @@ public class ResetAdminPassword extends AbstractPlugin {
logger.error("Missing password parameter. Usage: {} <new password>", Bootstrap.command.getScript());
System.exit(1);
}
- if (OneDev.isServerRunning(Bootstrap.installDir)) {
- logger.error("Please stop server before resetting admin password");
- System.exit(1);
- }
- sessionFactoryManager.start();
-
- try (var conn = persistenceManager.openConnection()) {
- callWithTransaction(conn, () -> {
- persistenceManager.checkDataVersion(conn, false);
- return null;
- });
- } catch (SQLException e) {
- throw new RuntimeException(e);
- };
-
- User root = userManager.get(User.ROOT_ID);
- if (root == null) {
- logger.error("Server not set up yet");
- System.exit(1);
- }
- String password = Bootstrap.command.getArgs()[0];
- root.setSsoConnector(null);
- root.setTwoFactorAuthentication(null);
- root.setPassword(passwordService.encryptPassword(password));
- userManager.update(root, null);
-
- // wait for a short period to have embedded db flushing data
try {
- Thread.sleep(1000);
- } catch (InterruptedException e) {
- throw new RuntimeException(e);
+ doMaintenance(() -> {
+ sessionFactoryManager.start();
+
+ try (var conn = persistenceManager.openConnection()) {
+ callWithTransaction(conn, () -> {
+ persistenceManager.checkDataVersion(conn, false);
+ return null;
+ });
+ } catch (SQLException e) {
+ throw new RuntimeException(e);
+ }
+
+ User root = userManager.get(User.ROOT_ID);
+ if (root == null)
+ throw new ExplicitException("Server not set up yet");
+ String password = Bootstrap.command.getArgs()[0];
+ root.setSsoConnector(null);
+ root.setTwoFactorAuthentication(null);
+ root.setPassword(passwordService.encryptPassword(password));
+ userManager.update(root, null);
+
+ // wait for a short period to have embedded db flushing data
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+
+ logger.info("Password of user '" + root.getName() + "' has been reset to: " + password);
+ return null;
+ });
+ System.exit(0);
+ } catch (ExplicitException e) {
+ logger.error(e.getMessage());
+ System.exit(1);
}
-
- logger.info("Password of user '" + root.getName() + "' has been reset to: " + password);
- System.exit(0);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/commandhandler/RestoreDatabase.java b/server-core/src/main/java/io/onedev/server/commandhandler/RestoreDatabase.java
index b63c46fd59..fbb892ea0e 100644
--- a/server-core/src/main/java/io/onedev/server/commandhandler/RestoreDatabase.java
+++ b/server-core/src/main/java/io/onedev/server/commandhandler/RestoreDatabase.java
@@ -2,12 +2,10 @@ package io.onedev.server.commandhandler;
import io.onedev.commons.bootstrap.Bootstrap;
import io.onedev.commons.bootstrap.Command;
-import io.onedev.commons.loader.AbstractPlugin;
+import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.FileUtils;
-import io.onedev.server.OneDev;
import io.onedev.server.persistence.HibernateConfig;
import io.onedev.server.persistence.PersistenceManager;
-import io.onedev.server.persistence.PersistenceUtils;
import io.onedev.server.persistence.SessionFactoryManager;
import io.onedev.server.security.SecurityUtils;
import org.slf4j.Logger;
@@ -21,7 +19,7 @@ import java.sql.SQLException;
import static io.onedev.server.persistence.PersistenceUtils.callWithTransaction;
@Singleton
-public class RestoreDatabase extends AbstractPlugin {
+public class RestoreDatabase extends CommandHandler {
private static final Logger logger = LoggerFactory.getLogger(RestoreDatabase.class);
@@ -33,9 +31,12 @@ public class RestoreDatabase extends AbstractPlugin {
private final HibernateConfig hibernateConfig;
+ private File backupFile;
+
@Inject
- public RestoreDatabase(PersistenceManager persistenceManager, SessionFactoryManager sessionFactoryManager,
+ public RestoreDatabase(PersistenceManager persistenceManager, SessionFactoryManager sessionFactoryManager,
HibernateConfig hibernateConfig) {
+ super(hibernateConfig);
this.persistenceManager = persistenceManager;
this.sessionFactoryManager = sessionFactoryManager;
this.hibernateConfig = hibernateConfig;
@@ -50,7 +51,7 @@ public class RestoreDatabase extends AbstractPlugin {
System.exit(1);
}
- File backupFile = new File(Bootstrap.command.getArgs()[0]);
+ backupFile = new File(Bootstrap.command.getArgs()[0]);
if (!backupFile.isAbsolute() && System.getenv("WRAPPER_INIT_DIR") != null)
backupFile = new File(System.getenv("WRAPPER_INIT_DIR"), backupFile.getPath());
@@ -59,41 +60,45 @@ public class RestoreDatabase extends AbstractPlugin {
System.exit(1);
}
- boolean validateData = true;
+ boolean validateData;
if (Bootstrap.command.getArgs().length >= 2)
validateData = Boolean.parseBoolean(Bootstrap.command.getArgs()[1]);
+ else
+ validateData = true;
logger.info("Restoring database from {}...", backupFile.getAbsolutePath());
-
- if (OneDev.isServerRunning(Bootstrap.installDir)) {
- logger.error("Please stop server before restoring");
- System.exit(1);
- }
- sessionFactoryManager.start();
-
- if (backupFile.isFile()) {
- File dataDir = FileUtils.createTempDir("restore");
- try {
- FileUtils.unzip(backupFile, dataDir);
- doRestore(dataDir, validateData);
- } finally {
- FileUtils.deleteDir(dataDir);
- }
- } else {
- doRestore(backupFile, validateData);
- }
+ try {
+ doMaintenance(() -> {
+ sessionFactoryManager.start();
+
+ if (backupFile.isFile()) {
+ File dataDir = FileUtils.createTempDir("restore");
+ try {
+ FileUtils.unzip(backupFile, dataDir);
+ doRestore(dataDir, validateData);
+ } finally {
+ FileUtils.deleteDir(dataDir);
+ }
+ } else {
+ doRestore(backupFile, validateData);
+ }
- if (hibernateConfig.isHSQLDialect()) {
- try {
- Thread.sleep(1000);
- } catch (InterruptedException e) {
- }
+ if (hibernateConfig.isHSQLDialect()) {
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ }
+ }
+
+ logger.info("Database is successfully restored from {}", backupFile.getAbsolutePath());
+ return null;
+ });
+ System.exit(0);
+ } catch (ExplicitException e) {
+ logger.error(e.getMessage());
+ System.exit(1);
}
-
- logger.info("Database is successfully restored from {}", backupFile.getAbsolutePath());
-
- System.exit(0);
}
private void doRestore(File dataDir, boolean validateData) {
@@ -129,10 +134,11 @@ public class RestoreDatabase extends AbstractPlugin {
try {
persistenceManager.applyConstraints(conn);
} catch (Exception e) {
- logger.error("Failed to apply database constraints", e);
- logger.info("If above error is caused by foreign key constraint violations, you may fix it via your database sql tool, "
- + "and then run {} to reapply database constraints", Command.getScript("apply-db-constraints"));
- System.exit(1);
+ var message = String.format("Failed to apply database constraints. If this error is caused by " +
+ "foreign key constraint violations, you may fix it via your database sql tool, and " +
+ "then run %s to reapply database constraints",
+ Command.getScript("apply-db-constraints"));
+ throw new RuntimeException(message);
}
return null;
});
diff --git a/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java b/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java
index 07bedc5fb5..8075b84860 100644
--- a/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java
+++ b/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java
@@ -3,6 +3,7 @@ package io.onedev.server.commandhandler;
import com.google.common.base.Joiner;
import io.onedev.commons.bootstrap.Bootstrap;
import io.onedev.commons.loader.AbstractPlugin;
+import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.StringUtils;
import io.onedev.commons.utils.command.Commandline;
@@ -12,6 +13,7 @@ import io.onedev.server.migration.DataMigrator;
import io.onedev.server.migration.MigrationHelper;
import io.onedev.server.persistence.HibernateConfig;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.ExceptionUtils;
import org.apache.commons.lang3.SystemUtils;
import org.apache.commons.lang3.math.NumberUtils;
import org.joda.time.DateTime;
@@ -27,7 +29,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
import java.util.concurrent.Callable;
-import java.util.concurrent.atomic.AtomicInteger;
import static io.onedev.server.persistence.PersistenceUtils.*;
import static java.lang.Integer.parseInt;
@@ -212,6 +213,7 @@ public class Upgrade extends AbstractPlugin {
for (File file: upgradeDir.listFiles()) {
if (!file.getName().equals("lost+found")
&& !file.getName().equals("site")
+ && !file.getName().equals("externaldb")
&& !file.getName().equals("conf") // conf/trust-certs might be mounted
&& !file.getName().startsWith(".")) {
isEmpty = false;
@@ -232,7 +234,7 @@ public class Upgrade extends AbstractPlugin {
if (!releaseProps.equals(oldReleaseProps)) {
logger.info("Upgrading {}...", upgradeDir.getAbsolutePath());
- if (OneDev.isServerRunning(upgradeDir) || OneDev.isServerRunning(Bootstrap.installDir)) {
+ if (OneDev.isServerRunning(upgradeDir)) {
logger.error("Please stop server before upgrading");
System.exit(1);
}
@@ -273,87 +275,104 @@ public class Upgrade extends AbstractPlugin {
} catch (IOException e) {
throw new RuntimeException(e);
}
-
- var newAppDataVersion = parseInt(MigrationHelper.getVersion(DataMigrator.class));
- var dataVersion = getDataVersion(upgradeDir);
- var oldAppDataVersion = dataVersion.app;
- var dbDataVersion = dataVersion.db;
- if (dbDataVersion == 0) {
- logger.error("Unable to upgrade specified installation as database is not populated yet");
- System.exit(1);
- }
- if (dbDataVersion == -1) {
- logger.error("Unable to upgrade specified installation due to above error");
- System.exit(1);
- }
- if (dbDataVersion != oldAppDataVersion && dbDataVersion != newAppDataVersion) {
- logger.error("Unable to upgrade specified installation as data version of application and database is not the same");
- System.exit(1);
- }
- if (newAppDataVersion < oldAppDataVersion) {
- logger.error("OneDev program is too old, please use a newer version");
- System.exit(1);
- }
- var callable = new Callable<Integer>() {
-
- @Override
- public Integer call() {
- String timestamp = DateTimeFormat.forPattern(BACKUP_DATETIME_FORMAT).print(new DateTime());
- File programBackup = new File(upgradeDir, "site/program-backup/" + timestamp);
- FileUtils.createDir(programBackup);
-
- logger.info("Backing up old program files as {}...", programBackup.getAbsolutePath());
- try {
- for (File each : upgradeDir.listFiles()) {
- if (each.isFile()) {
- FileUtils.copyFileToDirectory(each, programBackup);
- } else if (!each.getName().equals("temp")
- && !each.getName().equals("site")
- && !each.getName().equals("internaldb")) {
- FileUtils.copyDirectoryToDirectory(each, programBackup);
+ try {
+ var callable = new Callable<Void>() {
+ @Override
+ public Void call() {
+ var newAppDataVersion = parseInt(MigrationHelper.getVersion(DataMigrator.class));
+ var dataVersion = getDataVersion(upgradeDir);
+ var oldAppDataVersion = dataVersion.app;
+ var dbDataVersion = dataVersion.db;
+ if (dbDataVersion == 0)
+ throw new ExplicitException("Unable to upgrade specified installation as database is not populated yet");
+ if (dbDataVersion == -1)
+ throw new ExplicitException("Unable to upgrade specified installation due to above error");
+ if (dbDataVersion != oldAppDataVersion && dbDataVersion != newAppDataVersion)
+ throw new ExplicitException("Unable to upgrade specified installation as data version of application and database is not the same");
+ if (newAppDataVersion < oldAppDataVersion)
+ throw new ExplicitException("OneDev program is too old, please use a newer version");
+
+ String timestamp = DateTimeFormat.forPattern(BACKUP_DATETIME_FORMAT).print(new DateTime());
+ File programBackup = new File(upgradeDir, "site/program-backup/" + timestamp);
+ FileUtils.createDir(programBackup);
+
+ logger.info("Backing up old program files as {}...", programBackup.getAbsolutePath());
+ try {
+ for (File each : upgradeDir.listFiles()) {
+ if (each.isFile()) {
+ FileUtils.copyFileToDirectory(each, programBackup);
+ } else if (!each.getName().equals("temp")
+ && !each.getName().equals("site")
+ && !each.getName().equals("internaldb")) {
+ FileUtils.copyDirectoryToDirectory(each, programBackup);
+ }
}
+ } catch (IOException e) {
+ throw new RuntimeException(e);
}
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- restoreExecutables(programBackup);
+ restoreExecutables(programBackup);
- File dbBackupFile = new File(upgradeDir, "site/" + DB_BACKUP_DIR + "/" + timestamp + ".zip");
- boolean isHSQL = HibernateConfig.isHSQLDialect(getDialect(upgradeDir));
- boolean failed = false;
- boolean dbChanged = false;
- boolean dbCleaned = false;
- try {
- if (dbDataVersion != newAppDataVersion) {
- logger.info("Backing up database as {}...", dbBackupFile.getAbsolutePath());
+ File dbBackupFile = new File(upgradeDir, "site/" + DB_BACKUP_DIR + "/" + timestamp + ".zip");
+ boolean isHSQL = HibernateConfig.isHSQLDialect(getDialect(upgradeDir));
+ boolean failed = false;
+ boolean dbChanged = false;
+ boolean dbCleaned = false;
+ try {
+ if (dbDataVersion != newAppDataVersion) {
+ logger.info("Backing up database as {}...", dbBackupFile.getAbsolutePath());
- FileUtils.createDir(dbBackupFile.getParentFile());
+ FileUtils.createDir(dbBackupFile.getParentFile());
- int ret = buildCommandline(upgradeDir, "backup-db", dbBackupFile.getAbsolutePath()).execute(new LineConsumer() {
+ int ret = buildCommandline(upgradeDir, "backup-db", dbBackupFile.getAbsolutePath()).execute(new LineConsumer() {
- @Override
- public void consume(String line) {
- logger.info(prefixUpgradeTargetLog(line));
- }
+ @Override
+ public void consume(String line) {
+ logger.info(prefixUpgradeTargetLog(line));
+ }
- }, new LineConsumer() {
+ }, new LineConsumer() {
- @Override
- public void consume(String line) {
- logger.error(prefixUpgradeTargetLog(line));
- }
+ @Override
+ public void consume(String line) {
+ logger.error(prefixUpgradeTargetLog(line));
+ }
- }).getReturnCode();
+ }).getReturnCode();
- if (ret == 0) {
- dbChanged = true;
- if (isHSQL) {
- FileUtils.deleteDir(new File(upgradeDir, "internaldb"), 3);
- } else {
- logger.info("Cleaning database with old program...");
+ if (ret == 0) {
+ dbChanged = true;
+ if (isHSQL) {
+ FileUtils.deleteDir(new File(upgradeDir, "internaldb"), 3);
+ } else {
+ logger.info("Cleaning database with old program...");
- ret = buildCommandline(upgradeDir, "clean-db").execute(new LineConsumer() {
+ ret = buildCommandline(upgradeDir, "clean-db").execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.info(prefixUpgradeTargetLog(line));
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.error(prefixUpgradeTargetLog(line));
+ }
+
+ }).getReturnCode();
+ }
+ if (ret == 0)
+ dbCleaned = true;
+ }
+
+ if (ret == 0) {
+ logger.info("Updating program files...");
+ updateProgramFiles(upgradeDir, oldAppDataVersion);
+
+ logger.info("Restoring database with new program...");
+ ret = buildCommandline(upgradeDir, "restore-db", dbBackupFile.getAbsolutePath()).execute(new LineConsumer() {
@Override
public void consume(String line) {
@@ -369,155 +388,143 @@ public class Upgrade extends AbstractPlugin {
}).getReturnCode();
}
- if (ret == 0)
- dbCleaned = true;
- }
-
- if (ret == 0) {
- logger.info("Updating program files...");
- updateProgramFiles(upgradeDir, oldAppDataVersion);
-
- logger.info("Restoring database with new program...");
- ret = buildCommandline(upgradeDir, "restore-db", dbBackupFile.getAbsolutePath()).execute(new LineConsumer() {
- @Override
- public void consume(String line) {
- logger.info(prefixUpgradeTargetLog(line));
- }
-
- }, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.error(prefixUpgradeTargetLog(line));
- }
-
- }).getReturnCode();
- }
-
- if (ret != 0) {
- logger.error("Failed to upgrade {}", upgradeDir.getAbsolutePath());
- dbCleaned = getDataVersion(upgradeDir).db == 0;
- failed = true;
+ if (ret != 0) {
+ logger.error("Failed to upgrade {}", upgradeDir.getAbsolutePath());
+ dbCleaned = getDataVersion(upgradeDir).db == 0;
+ failed = true;
+ } else {
+ dbCleaned = false;
+ }
} else {
- dbCleaned = false;
+ logger.info("Copying new program files into {}...", upgradeDir.getAbsolutePath());
+ updateProgramFiles(upgradeDir, oldAppDataVersion);
}
- } else {
- logger.info("Copying new program files into {}...", upgradeDir.getAbsolutePath());
- updateProgramFiles(upgradeDir, oldAppDataVersion);
+ } catch (Exception e) {
+ logger.error("Error upgrading " + upgradeDir.getAbsolutePath(), e);
+ failed = true;
}
- } catch (Exception e) {
- logger.error("Error upgrading " + upgradeDir.getAbsolutePath(), e);
- failed = true;
- }
- if (failed) {
- if (dbChanged && !dbCleaned) {
- logger.info("Cleaning database with new program...");
- try {
- buildCommandline(upgradeDir, "clean-db").execute(new LineConsumer() {
+ if (failed) {
+ if (dbChanged && !dbCleaned) {
+ logger.info("Cleaning database with new program...");
+ try {
+ buildCommandline(upgradeDir, "clean-db").execute(new LineConsumer() {
- @Override
- public void consume(String line) {
- logger.info(prefixUpgradeTargetLog(line));
- }
+ @Override
+ public void consume(String line) {
+ logger.info(prefixUpgradeTargetLog(line));
+ }
- }, new LineConsumer() {
+ }, new LineConsumer() {
- @Override
- public void consume(String line) {
- logger.error(prefixUpgradeTargetLog(line));
- }
+ @Override
+ public void consume(String line) {
+ logger.error(prefixUpgradeTargetLog(line));
+ }
- }).checkReturnCode();
+ }).checkReturnCode();
- dbCleaned = true;
- } catch (Exception e) {
- logger.error("Error cleaning database", e);
+ dbCleaned = true;
+ } catch (Exception e) {
+ logger.error("Error cleaning database", e);
+ }
}
- }
- boolean programRestored = false;
- logger.info("Restoring old program files...");
- try {
- for (File child : programBackup.listFiles()) {
- if (!child.getName().equals("site")) {
- File target = new File(upgradeDir, child.getName());
- if (target.isDirectory()) {
- FileUtils.cleanDir(target);
- FileUtils.copyDirectory(child, target);
- } else {
- FileUtils.copyFile(child, target);
+ boolean programRestored = false;
+ logger.info("Restoring old program files...");
+ try {
+ for (File child : programBackup.listFiles()) {
+ if (!child.getName().equals("site")) {
+ File target = new File(upgradeDir, child.getName());
+ if (target.isDirectory()) {
+ FileUtils.cleanDir(target);
+ FileUtils.copyDirectory(child, target);
+ } else {
+ FileUtils.copyFile(child, target);
+ }
}
}
- }
- if (oldAppDataVersion <= 102)
- FileUtils.createDir(new File(upgradeDir, "site/assets/root"));
+ if (oldAppDataVersion <= 102)
+ FileUtils.createDir(new File(upgradeDir, "site/assets/root"));
- restoreExecutables(upgradeDir);
- FileUtils.deleteDir(programBackup);
+ restoreExecutables(upgradeDir);
+ FileUtils.deleteDir(programBackup);
- logger.info("Old program files restored");
- programRestored = true;
- } catch (Exception e) {
- logger.error("Error restoring old program files", e);
- logger.warn("Please restore manually from \"{}\"", programBackup.getAbsolutePath());
- }
+ logger.info("Old program files restored");
+ programRestored = true;
+ } catch (Exception e) {
+ logger.error("Error restoring old program files", e);
+ logger.warn("Please restore manually from \"{}\"", programBackup.getAbsolutePath());
+ }
- if (programRestored && dbChanged && dbCleaned) {
- logger.info("Restoring old database...");
- try {
- buildCommandline(upgradeDir, "restore-db", dbBackupFile.getAbsolutePath(), "false").execute(new LineConsumer() {
+ if (programRestored && dbChanged && dbCleaned) {
+ logger.info("Restoring old database...");
+ try {
+ buildCommandline(upgradeDir, "restore-db", dbBackupFile.getAbsolutePath(), "false").execute(new LineConsumer() {
- @Override
- public void consume(String line) {
- logger.info(prefixUpgradeTargetLog(line));
- }
+ @Override
+ public void consume(String line) {
+ logger.info(prefixUpgradeTargetLog(line));
+ }
- }, new LineConsumer() {
+ }, new LineConsumer() {
- @Override
- public void consume(String line) {
- logger.error(prefixUpgradeTargetLog(line));
- }
+ @Override
+ public void consume(String line) {
+ logger.error(prefixUpgradeTargetLog(line));
+ }
- }).checkReturnCode();
+ }).checkReturnCode();
- logger.info("Old database restored");
- dbChanged = false;
- } catch (Exception e) {
- logger.error("Error restoring old database", e);
+ logger.info("Old database restored");
+ dbChanged = false;
+ } catch (Exception e) {
+ logger.error("Error restoring old database", e);
+ }
}
- }
- logger.error("️!! Failed to upgrade {}", upgradeDir.getAbsolutePath());
- if (dbChanged) {
- logger.warn("OneDev is unable to restore old database, please do it manually by first resetting it (delete and create), and then running below command:");
- if (SystemUtils.IS_OS_WINDOWS) {
- logger.info(upgradeDir.getAbsolutePath() + File.separator + "bin" + File.separator + "restore-db.bat " + dbBackupFile.getAbsolutePath());
- } else {
- logger.info(upgradeDir.getAbsolutePath() + File.separator + "bin" + File.separator + "restore-db.sh " + dbBackupFile.getAbsolutePath());
+ StringBuilder errorMessage = new StringBuilder(String.format("!! Failed to upgrade %s", upgradeDir.getAbsolutePath()));
+ if (dbChanged) {
+ errorMessage.append("\nOneDev is unable to restore old database, please do it manually by first resetting it (delete and create), and then running below command:");
+ if (SystemUtils.IS_OS_WINDOWS) {
+ errorMessage.append("\n" + upgradeDir.getAbsolutePath() + File.separator + "bin" + File.separator + "restore-db.bat " + dbBackupFile.getAbsolutePath());
+ } else {
+ errorMessage.append("\n" + upgradeDir.getAbsolutePath() + File.separator + "bin" + File.separator + "restore-db.sh " + dbBackupFile.getAbsolutePath());
+ }
}
+ throw new ExplicitException(errorMessage.toString());
+ } else {
+ logger.info("Successfully upgraded {}", upgradeDir.getAbsolutePath());
+ FileUtils.deleteDir(programBackup);
+ }
+ return null;
+ }
+ };
+
+ var maintenanceFile = OneDev.getMaintenanceFile(upgradeDir);
+ maintenanceFile.createNewFile();
+ try {
+ var hibernateConfig = new HibernateConfig(upgradeDir);
+ if (!hibernateConfig.isHSQLDialect()) {
+ var classLoader = newSiteLibClassLoader(upgradeDir);
+ try (var conn = openConnection(hibernateConfig, classLoader)) {
+ callWithLock(conn, () -> callable.call());
}
- return 1;
} else {
- logger.info("Successfully upgraded {}", upgradeDir.getAbsolutePath());
- FileUtils.deleteDir(programBackup);
- return 0;
+ callable.call();
}
+ } finally {
+ maintenanceFile.delete();
}
- };
- var hibernateConfig = loadHibernateConfig(upgradeDir);
- int exitCode;
- if (hibernateConfig.isHSQLDialect()) {
- exitCode = callable.call();
- } else {
- var classLoader = newSiteLibClassLoader(upgradeDir);
- var conn = openConnection(hibernateConfig, classLoader);
- exitCode = callWithDatabaseLock(conn, callable);
+ System.exit(0);
+ } catch (ExplicitException e) {
+ logger.error(e.getMessage());
+ System.exit(1);
+ } catch (Exception e) {
+ throw ExceptionUtils.unchecked(e);
}
- System.exit(exitCode);
} else {
logger.info("Successfully checked {}", upgradeDir.getAbsolutePath());
System.exit(0);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java
index deda2dec87..8a04988a25 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java
@@ -466,7 +466,8 @@ public class DefaultUserManager extends BaseEntityManager<User> implements UserM
@Transactional
@Listen
public void on(EntityPersisted event) {
- if (event.getEntity() instanceof User) {
+ // Cache will be null when we run reset-admin-password command
+ if (cache != null && event.getEntity() instanceof User) {
var facade = (UserFacade) event.getEntity().getFacade();
transactionManager.runAfterCommit(() -> cache.put(facade.getId(), facade));
}
@@ -475,7 +476,8 @@ public class DefaultUserManager extends BaseEntityManager<User> implements UserM
@Transactional
@Listen
public void on(EntityRemoved event) {
- if (event.getEntity() instanceof User) {
+ // Cache will be null when we run reset-admin-password command
+ if (cache != null && event.getEntity() instanceof User) {
var id = event.getEntity().getId();
transactionManager.runAfterCommit(() -> cache.remove(id));
}
diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
index d71d9ae4a0..241a450b14 100644
--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
@@ -5282,4 +5282,11 @@ public class DataMigrator {
private void migrate119(File dataDir, Stack<Integer> versions) {
}
+ private void migrate120(File dataDir, Stack<Integer> versions) {
+ for (File file : dataDir.listFiles()) {
+ if (file.getName().startsWith("ClusterServers.xml"))
+ FileUtils.deleteFile(file);
+ }
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/ClusterServer.java b/server-core/src/main/java/io/onedev/server/model/ClusterServer.java
deleted file mode 100644
index b3dcbc6420..0000000000
--- a/server-core/src/main/java/io/onedev/server/model/ClusterServer.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package io.onedev.server.model;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-
-@Entity
-public class ClusterServer extends AbstractEntity {
-
- private static final long serialVersionUID = 1L;
-
- public static final String PROP_ADDRESS = "address";
-
- @Column(nullable=false, unique=true)
- private String address;
-
- public String getAddress() {
- return address;
- }
-
- public void setAddress(String address) {
- this.address = address;
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistenceManager.java b/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistenceManager.java
index 6d0d0c98dd..01a5b18d97 100644
--- a/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistenceManager.java
+++ b/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistenceManager.java
@@ -7,6 +7,7 @@ import com.google.common.collect.Sets;
import io.onedev.commons.bootstrap.Bootstrap;
import io.onedev.commons.loader.ManagedSerializedForm;
import io.onedev.commons.utils.ExceptionUtils;
+import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
@@ -180,14 +181,12 @@ public class DefaultPersistenceManager implements PersistenceManager, Serializab
public String checkDataVersion(Connection conn, boolean allowEmptyDB) {
String dbDataVersion = readDbDataVersion(conn);
- if (!allowEmptyDB && dbDataVersion == null) {
- logger.error("Database is not populated yet");
- System.exit(1);
- }
+ if (!allowEmptyDB && dbDataVersion == null)
+ throw new ExplicitException("Database is not populated yet");
String appDataVersion = MigrationHelper.getVersion(DataMigrator.class);
if (dbDataVersion != null && !dbDataVersion.equals(appDataVersion)) {
- logger.error("Data version mismatch (app data version: {}, db data version: {})", appDataVersion, dbDataVersion);
- System.exit(1);
+ throw new ExplicitException(String.format("Data version mismatch (app data version: %s, db data version: %s)",
+ appDataVersion, dbDataVersion));
}
return dbDataVersion;
}
diff --git a/server-core/src/main/java/io/onedev/server/persistence/DefaultSessionFactoryManager.java b/server-core/src/main/java/io/onedev/server/persistence/DefaultSessionFactoryManager.java
index 53b184f368..36ca45f35b 100644
--- a/server-core/src/main/java/io/onedev/server/persistence/DefaultSessionFactoryManager.java
+++ b/server-core/src/main/java/io/onedev/server/persistence/DefaultSessionFactoryManager.java
@@ -48,17 +48,17 @@ public class DefaultSessionFactoryManager implements SessionFactoryManager {
@Override
public void start() {
HazelcastInstance hazelcastInstance = clusterManager.getHazelcastInstance();
- Properties effectiveConfig = new Properties();
- effectiveConfig.putAll(hibernateConfig);
+ Properties hibernateSettings = new Properties();
+ hibernateSettings.putAll(hibernateConfig);
if (hazelcastInstance != null) {
- effectiveConfig.put("hibernate.cache.hazelcast.instance_name", hazelcastInstance.getName());
+ hibernateSettings.put("hibernate.cache.hazelcast.instance_name", hazelcastInstance.getName());
} else {
- effectiveConfig.put("hibernate.cache.use_second_level_cache", "false");
- effectiveConfig.put("hibernate.cache.use_query_cache", "false");
- effectiveConfig.put("hibernate.hikari.maximumPoolSize", "1");
+ hibernateSettings.put("hibernate.cache.use_second_level_cache", "false");
+ hibernateSettings.put("hibernate.cache.use_query_cache", "false");
+ hibernateSettings.put("hibernate.hikari.maximumPoolSize", "1");
}
ServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder()
- .applySettings(effectiveConfig).build();
+ .applySettings(hibernateSettings).build();
MetadataSources metadataSources = new MetadataSources(serviceRegistry);
for (Class<? extends AbstractEntity> each:
ClassUtils.findImplementations(AbstractEntity.class, AbstractEntity.class)) {
@@ -75,8 +75,8 @@ public class DefaultSessionFactoryManager implements SessionFactoryManager {
if (sessionFactory != null) {
sessionFactory.close();
sessionFactory = null;
- metadata = null;
}
+ metadata = null;
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/persistence/HibernateConfig.java b/server-core/src/main/java/io/onedev/server/persistence/HibernateConfig.java
index 603fecb0ad..613cb341cc 100644
--- a/server-core/src/main/java/io/onedev/server/persistence/HibernateConfig.java
+++ b/server-core/src/main/java/io/onedev/server/persistence/HibernateConfig.java
@@ -1,18 +1,42 @@
package io.onedev.server.persistence;
-import java.util.Map;
+import java.io.File;
import java.util.Properties;
+import com.google.common.hash.Hashing;
+import io.onedev.commons.utils.StringUtils;
import org.hibernate.cfg.Environment;
+import static io.onedev.commons.utils.FileUtils.loadProperties;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.hibernate.cfg.AvailableSettings.*;
+
public class HibernateConfig extends Properties {
private static final long serialVersionUID = 1L;
- public HibernateConfig(Properties properties) {
- for (Map.Entry<Object, Object> entry: properties.entrySet())
- put(entry.getKey(), entry.getValue());
+ private static final String[] ENVS = new String[] {
+ DIALECT, DRIVER, URL, USER, PASS, "hibernate.hikari.leakDetectionThreshold",
+ "hibernate.hikari.maxLifetime", "hibernate.hikari.connectionTimeout",
+ "hibernate.hikari.maximumPoolSize", "hibernate.hikari.validationTimeout",
+ "hibernate.show_sql"
+ };
+
+ private volatile String clusterCredential;
+
+ public HibernateConfig(File installDir) {
+ File file = new File(installDir, "conf/hibernate.properties");
+ putAll(loadProperties(file));
put("hibernate.cache.hazelcast.shutdown_on_session_factory_close", "false");
+
+ String url = getProperty(URL);
+ setProperty(URL, StringUtils.replace(url, "${installDir}", installDir.getAbsolutePath()));
+
+ for (String env: ENVS) {
+ String value = System.getenv(env.replace('.', '_'));
+ if (value != null)
+ setProperty(env, value);
+ }
}
public String getDialect() {
@@ -51,4 +75,14 @@ public class HibernateConfig extends Properties {
return isMySQLDialect(getDialect());
}
+ public String getClusterCredential() {
+ if (clusterCredential == null) {
+ var dbPassword = getPassword();
+ if (dbPassword == null)
+ dbPassword = "";
+ clusterCredential = Hashing.sha256().hashString(dbPassword, UTF_8).toString();
+ }
+ return clusterCredential;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/persistence/PersistenceUtils.java b/server-core/src/main/java/io/onedev/server/persistence/PersistenceUtils.java
index b66c75735b..d31687e9a3 100644
--- a/server-core/src/main/java/io/onedev/server/persistence/PersistenceUtils.java
+++ b/server-core/src/main/java/io/onedev/server/persistence/PersistenceUtils.java
@@ -1,9 +1,5 @@
package io.onedev.server.persistence;
-import io.onedev.commons.bootstrap.Bootstrap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import java.io.File;
import java.net.MalformedURLException;
import java.net.URL;
@@ -17,37 +13,10 @@ import java.util.Properties;
import java.util.concurrent.Callable;
import static io.onedev.commons.utils.ExceptionUtils.unchecked;
-import static io.onedev.commons.utils.FileUtils.loadProperties;
import static java.lang.String.format;
-import static org.hibernate.cfg.AvailableSettings.*;
public class PersistenceUtils {
-
- private static final Logger logger = LoggerFactory.getLogger(PersistenceUtils.class);
-
- private static final String[] HIBERNATE_PROPS = new String[] {
- DIALECT, DRIVER, URL, USER, PASS, "hibernate.hikari.leakDetectionThreshold",
- "hibernate.hikari.maxLifetime", "hibernate.hikari.connectionTimeout",
- "hibernate.hikari.maximumPoolSize", "hibernate.hikari.validationTimeout",
- "hibernate.show_sql"
- };
- public static HibernateConfig loadHibernateConfig(File installDir) {
- File file = new File(installDir, "conf/hibernate.properties");
- HibernateConfig hibernateConfig = new HibernateConfig(loadProperties(file));
- String url = hibernateConfig.getProperty(URL);
- hibernateConfig.setProperty(URL,
- io.onedev.commons.utils.StringUtils.replace(url, "${installDir}", installDir.getAbsolutePath()));
-
- for (String prop: HIBERNATE_PROPS) {
- String env = System.getenv(prop.replace('.', '_'));
- if (env != null)
- hibernateConfig.setProperty(prop, env);
- }
-
- return hibernateConfig;
- }
-
public static Connection openConnection(HibernateConfig hibernateConfig, ClassLoader classLoader) {
try {
Driver driver = (Driver) Class.forName(hibernateConfig.getDriver(), true, classLoader).getDeclaredConstructor().newInstance();
@@ -118,16 +87,13 @@ public class PersistenceUtils {
}
}
- public static <T> T callWithDatabaseLock(Connection conn, Callable<T> callable) {
- var lockTableName = "o_DatabaseLock";
+ public static <T> T callWithLock(Connection conn, Callable<T> callable) {
+ var tableName = "o_DatabaseLock";
callWithTransaction(conn, () -> {
- try (var stmt = conn.createStatement()) {
- stmt.executeQuery(format("select * from o_ModelVersion for update"));
- }
- if (!tableExists(conn, lockTableName)) {
+ if (!tableExists(conn, tableName)) {
try (var stmt = conn.createStatement()) {
- stmt.execute(format("create table %s (o_id int)", lockTableName));
- stmt.executeUpdate(format("insert into %s values(1)", lockTableName));
+ stmt.execute(format("create table %s (o_id int)", tableName));
+ stmt.executeUpdate(format("insert into %s values(1)", tableName));
}
}
return null;
@@ -135,7 +101,7 @@ public class PersistenceUtils {
return callWithTransaction(conn, () -> {
while (true) {
try (var stmt = conn.createStatement()) {
- stmt.executeQuery(format("select * from %s for update", lockTableName));
+ stmt.executeQuery(format("select * from %s for update", tableName));
break;
} catch (Exception e) {
Thread.sleep(1000);
diff --git a/server-product/docker/docker-compose.yaml b/server-product/docker/docker-compose.yaml
index e3dab2732c..b4663327d2 100644
--- a/server-product/docker/docker-compose.yaml
+++ b/server-product/docker/docker-compose.yaml
@@ -31,4 +31,4 @@ services:
expose:
- "5432"
volumes:
- - ./onedev/site/postgres:/var/lib/postgresql/data
+ - ./onedev/externaldb:/var/lib/postgresql/data
diff --git a/server-product/docker/entrypoint-server.sh b/server-product/docker/entrypoint-server.sh
index 1dff567abd..488f741410 100755
--- a/server-product/docker/entrypoint-server.sh
+++ b/server-product/docker/entrypoint-server.sh
@@ -11,21 +11,19 @@ _sigterm() {
trap _sigterm SIGTERM
trap _sigterm SIGINT
-MOD_OPTIONS="--add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.desktop/java.awt.font=ALL-UNNAMED --add-modules=java.se --add-exports=java.base/jdk.internal.ref=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED"
+UNAME=`uname -m`
-MEM_OPTIONS=-XX:MaxRAMPercentage=50.0
-if [[ $JAVA_TOOL_OPTIONS == *"-XX:MaxRAMPercentage"* ]] || [[ $JAVA_TOOL_OPTIONS == *"-Xmx"* ]]; then
- unset MEM_OPTIONS
+if [[ $UNAME == "aarch64" ]]; then
+ CPUARCH="arm-64"
+else
+ CPUARCH="x86-64"
fi
-cd /app/bin
-java -cp "../boot/*" ${MEM_OPTIONS} ${MOD_OPTIONS} io.onedev.commons.bootstrap.Bootstrap upgrade /opt/onedev &
+/app/boot/wrapper-linux-$CPUARCH /app/conf/wrapper.conf -- upgrade /opt/onedev &
child=$!
wait "$child"
touch /opt/onedev/IN_DOCKER
-
-cd /opt/onedev/bin
-java -cp "../boot/*" ${MEM_OPTIONS} ${MOD_OPTIONS} io.onedev.commons.bootstrap.Bootstrap &
+/opt/onedev/boot/wrapper-linux-$CPUARCH /opt/onedev/conf/wrapper.conf &
child=$!
wait "$child"
diff --git a/server-product/src/main/java/io/onedev/server/product/DefaultServerConfig.java b/server-product/src/main/java/io/onedev/server/product/DefaultServerConfig.java
deleted file mode 100644
index aac4dca470..0000000000
--- a/server-product/src/main/java/io/onedev/server/product/DefaultServerConfig.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package io.onedev.server.product;
-
-import com.google.common.base.Splitter;
-import io.onedev.server.ServerConfig;
-import io.onedev.server.persistence.HibernateConfig;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.util.List;
-
-@Singleton
-public class DefaultServerConfig implements ServerConfig {
-
- private static final Logger logger = LoggerFactory.getLogger(DefaultServerConfig.class);
-
- private static final String PROP_HTTP_PORT = "http_port";
-
- private static final String PROP_SSH_PORT = "ssh_port";
-
- private static final String PROP_CLUSTER_IP = "cluster_ip";
-
- private static final String PROP_CLUSTER_PORT = "cluster_port";
-
- private int httpPort;
-
- private int sshPort;
-
- private String clusterIp;
-
- private int clusterPort;
-
- @Inject
- public DefaultServerConfig(ServerProperties props, HibernateConfig hibernateConfig) {
- String httpPortStr = System.getenv(PROP_HTTP_PORT);
- if (StringUtils.isBlank(httpPortStr))
- httpPortStr = props.getProperty(PROP_HTTP_PORT);
- if (StringUtils.isNotBlank(httpPortStr)) {
- httpPort = Integer.parseInt(httpPortStr.trim());
- } else {
- logger.warn(PROP_HTTP_PORT + " not specified, default to 6610");
- httpPort = 6610;
- }
-
- String sshPortStr = System.getenv(PROP_SSH_PORT);
- if (StringUtils.isBlank(sshPortStr))
- sshPortStr = props.getProperty(PROP_SSH_PORT);
- if (StringUtils.isNotBlank(sshPortStr)) {
- sshPort = Integer.parseInt(sshPortStr.trim());
- } else {
- logger.warn(PROP_SSH_PORT + " not specified, default to 6611");
- sshPort = 6611;
- }
-
- clusterIp = System.getenv(PROP_CLUSTER_IP);
- if (StringUtils.isBlank(clusterIp))
- clusterIp = props.getProperty(PROP_CLUSTER_IP);
-
- if (StringUtils.isBlank(clusterIp)) {
- String dbUrl = StringUtils.substringAfter(hibernateConfig.getUrl(), ":");
- if (dbUrl.startsWith("hsqldb")) {
- clusterIp = "127.0.0.1";
- } else {
- String dbHost;
- int dbPort;
- if (dbUrl.startsWith("oracle")) {
- List<String> fields = Splitter.on(":").splitToList(dbUrl);
- dbHost = StringUtils.stripStart(fields.get(2), "@");
- String dbPortString = fields.get(3);
- if (dbPortString.contains("/"))
- dbPort = Integer.parseInt(StringUtils.substringBefore(dbPortString, "/"));
- else
- dbPort = Integer.parseInt(dbPortString);
- } else {
- String tempStr = StringUtils.substringAfter(dbUrl, "//");
- dbHost = StringUtils.substringBefore(tempStr, ":");
- tempStr = StringUtils.substringAfter(tempStr, ":");
- if (dbUrl.startsWith("sqlserver")) {
- dbPort = Integer.parseInt(StringUtils.substringBefore(tempStr, ";"));
- } else {
- tempStr = StringUtils.substringBefore(tempStr, "/");
- // Fix issue https://code.onedev.io/onedev/server/~issues/1086
- tempStr = StringUtils.substringBefore(tempStr, ",");
- dbPort = Integer.parseInt(tempStr);
- }
- }
-
- try (Socket socket = new Socket()) {
- socket.connect(new InetSocketAddress(dbHost, dbPort));
- clusterIp = socket.getLocalAddress().getHostAddress();
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
- }
-
- String clusterPortStr = System.getenv(PROP_CLUSTER_PORT);
- if (StringUtils.isBlank(clusterPortStr))
- clusterPortStr = props.getProperty(PROP_CLUSTER_PORT);
- if (StringUtils.isBlank(clusterPortStr))
- clusterPort = 5710;
- else
- clusterPort = Integer.parseInt(clusterPortStr.trim());
- }
-
- @Override
- public int getHttpPort() {
- return httpPort;
- }
-
- @Override
- public int getSshPort() {
- return sshPort;
- }
-
- @Override
- public String getClusterIp() {
- return clusterIp;
- }
-
- @Override
- public int getClusterPort() {
- return clusterPort;
- }
-
-}
diff --git a/server-product/src/main/java/io/onedev/server/product/ProductModule.java b/server-product/src/main/java/io/onedev/server/product/ProductModule.java
index 65aa5c5b2f..cba507d08b 100644
--- a/server-product/src/main/java/io/onedev/server/product/ProductModule.java
+++ b/server-product/src/main/java/io/onedev/server/product/ProductModule.java
@@ -7,14 +7,11 @@ import io.onedev.server.jetty.ServletConfigurator;
import io.onedev.server.persistence.HibernateConfig;
import io.onedev.server.util.ProjectNameReservation;
-import java.io.File;
import java.util.HashSet;
import java.util.Set;
import static io.onedev.commons.bootstrap.Bootstrap.installDir;
-import static io.onedev.commons.utils.FileUtils.loadProperties;
import static io.onedev.server.OneDev.getAssetsDir;
-import static io.onedev.server.persistence.PersistenceUtils.loadHibernateConfig;
public class ProductModule extends AbstractPluginModule {
@@ -22,13 +19,8 @@ public class ProductModule extends AbstractPluginModule {
protected void configure() {
super.configure();
- bind(HibernateConfig.class).toInstance(loadHibernateConfig(installDir));
-
- var file = new File(installDir, "conf/server.properties");
- ServerProperties serverProps = new ServerProperties(loadProperties(file));
- bind(ServerProperties.class).toInstance(serverProps);
-
- bind(ServerConfig.class).to(DefaultServerConfig.class);
+ bind(HibernateConfig.class).toInstance(new HibernateConfig(installDir));
+ bind(ServerConfig.class).toInstance(new ServerConfig(installDir));
contribute(ServerConfigurator.class, ProductConfigurator.class);
contribute(ServletConfigurator.class, ProductServletConfigurator.class);
diff --git a/server-product/src/main/java/io/onedev/server/product/ServerProperties.java b/server-product/src/main/java/io/onedev/server/product/ServerProperties.java
deleted file mode 100644
index cee74f49bd..0000000000
--- a/server-product/src/main/java/io/onedev/server/product/ServerProperties.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package io.onedev.server.product;
-
-import java.util.Map;
-import java.util.Properties;
-
-public class ServerProperties extends Properties {
-
- private static final long serialVersionUID = 1L;
-
- public ServerProperties(Properties properties) {
- for (Map.Entry<Object, Object> entry: properties.entrySet()) {
- put(entry.getKey(), entry.getValue());
- }
- }
-
-}