Skip to content

The Unified and Autonomous Development Platform

Fix issue #433 - Upgrade failure to 5.1.0 or higher if using external database

Robin Shen425fc557ea34
diff --git a/server-core/src/main/java/io/onedev/server/maintenance/ApplyDatabaseConstraints.java b/server-core/src/main/java/io/onedev/server/maintenance/ApplyDatabaseConstraints.java
index 50d9b014ff..fee3d179a0 100644
--- a/server-core/src/main/java/io/onedev/server/maintenance/ApplyDatabaseConstraints.java
+++ b/server-core/src/main/java/io/onedev/server/maintenance/ApplyDatabaseConstraints.java
@@ -66,7 +66,7 @@ public class ApplyDatabaseConstraints extends DefaultPersistManager {
dropConstraints(metadata);
applyConstraints(metadata);
- if (getDialect().toLowerCase().contains("hsql")) {
+ if (isHSQLDialect(getDialect())) {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
diff --git a/server-core/src/main/java/io/onedev/server/maintenance/BackupDatabase.java b/server-core/src/main/java/io/onedev/server/maintenance/BackupDatabase.java
index 7c4441a58a..5c93b01a32 100644
--- a/server-core/src/main/java/io/onedev/server/maintenance/BackupDatabase.java
+++ b/server-core/src/main/java/io/onedev/server/maintenance/BackupDatabase.java
@@ -51,7 +51,7 @@ public class BackupDatabase extends DefaultPersistManager {
System.exit(1);
}
- if (Bootstrap.isServerRunning(Bootstrap.installDir) && getDialect().toLowerCase().contains("hsql")) {
+ if (Bootstrap.isServerRunning(Bootstrap.installDir) && isHSQLDialect(getDialect())) {
logger.error("Please stop server before backing up database");
System.exit(1);
}
diff --git a/server-core/src/main/java/io/onedev/server/maintenance/CheckDataVersion.java b/server-core/src/main/java/io/onedev/server/maintenance/CheckDataVersion.java
index f476f2af44..0cb531fe8d 100644
--- a/server-core/src/main/java/io/onedev/server/maintenance/CheckDataVersion.java
+++ b/server-core/src/main/java/io/onedev/server/maintenance/CheckDataVersion.java
@@ -34,7 +34,7 @@ public class CheckDataVersion extends DefaultPersistManager {
@Override
public void start() {
- if (Bootstrap.isServerRunning(Bootstrap.installDir) && getDialect().toLowerCase().contains("hsql")) {
+ if (Bootstrap.isServerRunning(Bootstrap.installDir) && isHSQLDialect(getDialect())) {
logger.error("Please stop server before checking data version");
System.exit(1);
}
diff --git a/server-core/src/main/java/io/onedev/server/maintenance/CleanDatabase.java b/server-core/src/main/java/io/onedev/server/maintenance/CleanDatabase.java
index d039ba6783..de90ed68e8 100644
--- a/server-core/src/main/java/io/onedev/server/maintenance/CleanDatabase.java
+++ b/server-core/src/main/java/io/onedev/server/maintenance/CleanDatabase.java
@@ -44,7 +44,7 @@ public class CleanDatabase extends DefaultPersistManager {
Metadata metadata = buildMetadata();
cleanDatabase(metadata);
- if (getDialect().toLowerCase().contains("hsql")) {
+ if (isHSQLDialect(getDialect())) {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
diff --git a/server-core/src/main/java/io/onedev/server/maintenance/RestoreDatabase.java b/server-core/src/main/java/io/onedev/server/maintenance/RestoreDatabase.java
index 49b4fcd0d8..f8f442575b 100644
--- a/server-core/src/main/java/io/onedev/server/maintenance/RestoreDatabase.java
+++ b/server-core/src/main/java/io/onedev/server/maintenance/RestoreDatabase.java
@@ -75,7 +75,7 @@ public class RestoreDatabase extends DefaultPersistManager {
sessionFactory.close();
- if (getDialect().toLowerCase().contains("hsql")) {
+ if (isHSQLDialect(getDialect())) {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
diff --git a/server-core/src/main/java/io/onedev/server/maintenance/Upgrade.java b/server-core/src/main/java/io/onedev/server/maintenance/Upgrade.java
index dd6e4a59e9..3497e0a460 100644
--- a/server-core/src/main/java/io/onedev/server/maintenance/Upgrade.java
+++ b/server-core/src/main/java/io/onedev/server/maintenance/Upgrade.java
@@ -1,5 +1,7 @@
package io.onedev.server.maintenance;
+import static org.hibernate.cfg.AvailableSettings.DIALECT;
+
import java.io.File;
import java.io.IOException;
import java.nio.charset.Charset;
@@ -125,6 +127,15 @@ public class Upgrade extends DefaultPersistManager {
return ">>> " + line;
}
+ private String getDialect(File installDir) {
+ String dialect = System.getenv(DIALECT.replace('.', '_'));
+ if (dialect == null) {
+ File file = new File(installDir, "conf/hibernate.properties");
+ dialect = FileUtils.loadProperties(file).getProperty(DIALECT);
+ }
+ return dialect;
+ }
+
@Override
public void start() {
if (Bootstrap.command.getArgs().length == 0) {
@@ -271,7 +282,7 @@ public class Upgrade extends DefaultPersistManager {
}).getReturnCode();
if (ret == 0) {
- if (getDialect().toLowerCase().contains("hsql")) {
+ if (isHSQLDialect(getDialect(upgradeDir))) {
FileUtils.deleteDir(new File(upgradeDir, "sampledb"), 3);
} else {
logger.info("Cleaning database with old program...");
diff --git a/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java b/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java
index 24baca042e..7491738d24 100644
--- a/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java
+++ b/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java
@@ -107,6 +107,10 @@ public class DefaultPersistManager implements PersistManager {
return properties.getDialect();
}
+ protected boolean isHSQLDialect(String dialect) {
+ return dialect.trim().equals("org.hibernate.dialect.HSQLDialect");
+ }
+
protected void execute(List<String> sqls, boolean failOnError) {
try ( Connection conn = getConnection();
Statement stmt = conn.createStatement();) {
@@ -155,8 +159,7 @@ public class DefaultPersistManager implements PersistManager {
@Override
public void start() {
- String dialect = getDialect().toLowerCase();
- if (dialect.contains("hsql"))
+ if (isHSQLDialect(getDialect()))
execute(Lists.newArrayList("SET DATABASE TRANSACTION CONTROL MVCC"), true);
String dbDataVersion = checkDataVersion(true);
@@ -607,7 +610,7 @@ public class DefaultPersistManager implements PersistManager {
return true;
} else {
String dialect = getDialect().toLowerCase();
- return !dialect.contains("mysql") && !dialect.contains("hsql");
+ return !dialect.contains("mysql") && !isHSQLDialect(dialect);
}
}
diff --git a/server-product/docker/entrypoint.sh b/server-product/docker/entrypoint.sh
index da34359ba2..1368e36f10 100755
--- a/server-product/docker/entrypoint.sh
+++ b/server-product/docker/entrypoint.sh
@@ -1,5 +1,7 @@
#!/bin/bash
+set -e
+
_sigterm() {
kill -TERM "$child"
wait "$child"