Skip to content

The Unified and Autonomous Development Platform

Improved upgrade program to make it ready for docker

Robin Shene43753be12d9
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 e5c58b4d88..0a579f10fb 100644
--- a/server-core/src/main/java/io/onedev/server/CoreModule.java
+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java
@@ -161,7 +161,6 @@ import io.onedev.server.maintenance.BackupDatabase;
import io.onedev.server.maintenance.CheckDataVersion;
import io.onedev.server.maintenance.CleanDatabase;
import io.onedev.server.maintenance.DataManager;
-import io.onedev.server.maintenance.DatabaseDialect;
import io.onedev.server.maintenance.DefaultDataManager;
import io.onedev.server.maintenance.ResetAdminPassword;
import io.onedev.server.maintenance.RestoreDatabase;
@@ -646,8 +645,6 @@ public class CoreModule extends AbstractPluginModule {
bind(PersistManager.class).to(Upgrade.class);
else if (CleanDatabase.COMMAND.equals(Bootstrap.command.getName()))
bind(PersistManager.class).to(CleanDatabase.class);
- else if (DatabaseDialect.COMMAND.equals(Bootstrap.command.getName()))
- bind(PersistManager.class).to(DatabaseDialect.class);
else if (ResetAdminPassword.COMMAND.equals(Bootstrap.command.getName()))
bind(PersistManager.class).to(ResetAdminPassword.class);
else
diff --git a/server-core/src/main/java/io/onedev/server/git/command/GitCommand.java b/server-core/src/main/java/io/onedev/server/git/command/GitCommand.java
index 689988717b..5870ee9445 100644
--- a/server-core/src/main/java/io/onedev/server/git/command/GitCommand.java
+++ b/server-core/src/main/java/io/onedev/server/git/command/GitCommand.java
@@ -20,7 +20,7 @@ public abstract class GitCommand<V> {
private static final Logger logger = LoggerFactory.getLogger(GitCommand.class);
- private static final String MIN_VERSION = "1.8.0";
+ private static final String MIN_VERSION = "2.15.0";
protected final File gitDir;
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 14355d238b..7154f6c988 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
@@ -25,7 +25,7 @@ import io.onedev.server.util.validation.EntityValidator;
@Singleton
public class ApplyDatabaseConstraints extends DefaultPersistManager {
- public static final String COMMAND = "apply_db_constraints";
+ public static final String COMMAND = "apply-db-constraints";
private static final Logger logger = LoggerFactory.getLogger(ApplyDatabaseConstraints.class);
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 50e4b664b2..d5d892b6dd 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
@@ -25,7 +25,7 @@ import io.onedev.server.util.validation.EntityValidator;
@Singleton
public class BackupDatabase extends DefaultPersistManager {
- public static final String COMMAND = "backup";
+ public static final String COMMAND = "backup-db";
private static final Logger logger = LoggerFactory.getLogger(BackupDatabase.class);
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 1218d6c99c..23c83a2c08 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
@@ -20,7 +20,7 @@ import io.onedev.server.util.validation.EntityValidator;
@Singleton
public class CheckDataVersion extends DefaultPersistManager {
- public static final String COMMAND = "check_data_version";
+ public static final String COMMAND = "check-data-version";
private static final Logger logger = LoggerFactory.getLogger(CheckDataVersion.class);
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 4fa66c6d40..443db8ed96 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
@@ -21,7 +21,7 @@ import io.onedev.server.util.validation.EntityValidator;
@Singleton
public class CleanDatabase extends DefaultPersistManager {
- public static final String COMMAND = "clean";
+ public static final String COMMAND = "clean-db";
private static final Logger logger = LoggerFactory.getLogger(CleanDatabase.class);
diff --git a/server-core/src/main/java/io/onedev/server/maintenance/DatabaseDialect.java b/server-core/src/main/java/io/onedev/server/maintenance/DatabaseDialect.java
deleted file mode 100644
index 164c29d214..0000000000
--- a/server-core/src/main/java/io/onedev/server/maintenance/DatabaseDialect.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package io.onedev.server.maintenance;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.hibernate.Interceptor;
-import org.hibernate.SessionFactory;
-import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
-
-import io.onedev.server.persistence.DefaultPersistManager;
-import io.onedev.server.persistence.HibernateProperties;
-import io.onedev.server.persistence.IdManager;
-import io.onedev.server.persistence.TransactionManager;
-import io.onedev.server.persistence.dao.Dao;
-import io.onedev.server.util.validation.EntityValidator;
-
-@Singleton
-public class DatabaseDialect extends DefaultPersistManager {
-
- public static final String COMMAND = "db_dialect";
-
- @Inject
- public DatabaseDialect(PhysicalNamingStrategy physicalNamingStrategy,
- HibernateProperties properties, Interceptor interceptor,
- IdManager idManager, Dao dao, EntityValidator validator,
- TransactionManager transactionManager) {
- super(physicalNamingStrategy, properties, interceptor, idManager, dao, validator, transactionManager);
- }
-
- @Override
- public void start() {
- // Use system.out in case logger is suppressed by user as this output is important to
- // upgrade procedure
- System.out.println("Database dialect: " + getDialect());
- System.exit(0);
- }
-
- @Override
- public SessionFactory getSessionFactory() {
- throw new UnsupportedOperationException();
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java
index 139baf6d08..53b8701744 100644
--- a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java
+++ b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java
@@ -52,8 +52,6 @@ import io.onedev.server.persistence.annotation.Transactional;
@Singleton
public class DefaultDataManager implements DataManager, Serializable {
- private static final String BACKUP_DATETIME_FORMAT = "yyyy-MM-dd_HH-mm-ss";
-
private final UserManager userManager;
private final SettingManager settingManager;
@@ -211,15 +209,11 @@ public class DefaultDataManager implements DataManager, Serializable {
public void execute() {
File tempDir = FileUtils.createTempDir("backup");
try {
- File backupDir = new File(backupSetting.getFolder());
- if (!backupDir.isAbsolute())
- backupDir = new File(Bootstrap.installDir, backupSetting.getFolder());
- if (!backupDir.exists()) {
- throw new RuntimeException("Backup directory does not exist: " + backupDir.getAbsolutePath());
- }
+ File backupDir = new File(Bootstrap.getSiteDir(), Upgrade.DB_BACKUP_DIR);
+ FileUtils.createDir(backupDir);
persistManager.exportData(tempDir);
File backupFile = new File(backupDir,
- DateTimeFormat.forPattern(BACKUP_DATETIME_FORMAT).print(new DateTime()) + ".zip");
+ DateTimeFormat.forPattern(Upgrade.BACKUP_DATETIME_FORMAT).print(new DateTime()) + ".zip");
ZipUtils.zip(tempDir, backupFile);
} catch (Exception e) {
notifyBackupError(e);
diff --git a/server-core/src/main/java/io/onedev/server/maintenance/ResetAdminPassword.java b/server-core/src/main/java/io/onedev/server/maintenance/ResetAdminPassword.java
index 8df2b5a9ff..c40c94e829 100644
--- a/server-core/src/main/java/io/onedev/server/maintenance/ResetAdminPassword.java
+++ b/server-core/src/main/java/io/onedev/server/maintenance/ResetAdminPassword.java
@@ -23,7 +23,7 @@ import io.onedev.server.util.validation.EntityValidator;
@Singleton
public class ResetAdminPassword extends DefaultPersistManager {
- public static final String COMMAND = "reset_admin_password";
+ public static final String COMMAND = "reset-admin-password";
private static final Logger logger = LoggerFactory.getLogger(ResetAdminPassword.class);
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 70fafc902f..22aaf83fd8 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
@@ -27,7 +27,7 @@ public class RestoreDatabase extends DefaultPersistManager {
private static final Logger logger = LoggerFactory.getLogger(RestoreDatabase.class);
- public static final String COMMAND = "restore";
+ public static final String COMMAND = "restore-db";
@Inject
public RestoreDatabase(PhysicalNamingStrategy physicalNamingStrategy,
@@ -111,7 +111,7 @@ public class RestoreDatabase extends DefaultPersistManager {
} 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"));
+ + "and then run {} to reapply database constraints", Command.getScript("apply-db-constraints"));
System.exit(1);
}
}
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 395d6bac47..82465ba157 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,12 +1,10 @@
package io.onedev.server.maintenance;
import java.io.File;
-import java.io.FileFilter;
import java.io.IOException;
import java.nio.charset.Charset;
import java.util.List;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.atomic.AtomicInteger;
import javax.inject.Inject;
import javax.inject.Singleton;
@@ -43,9 +41,9 @@ public class Upgrade extends DefaultPersistManager {
private static final Logger logger = LoggerFactory.getLogger(Upgrade.class);
- private static final String BACKUP_DATETIME_FORMAT = "yyyy-MM-dd_HH-mm-ss";
+ public static final String BACKUP_DATETIME_FORMAT = "yyyy-MM-dd_HH-mm-ss";
- private final String appName;
+ public static final String DB_BACKUP_DIR = "db-backup";
@Inject
public Upgrade(PhysicalNamingStrategy physicalNamingStrategy,
@@ -53,7 +51,6 @@ public class Upgrade extends DefaultPersistManager {
IdManager idManager, Dao dao, EntityValidator validator, PluginManager pluginManager,
TransactionManager transactionManager) {
super(physicalNamingStrategy, properties, interceptor, idManager, dao, validator, transactionManager);
- appName = pluginManager.getProduct().getName();
}
protected Commandline buildCommandline(File upgradeDir, String command, String...commandArgs) {
@@ -100,8 +97,8 @@ public class Upgrade extends DefaultPersistManager {
@Override
public void start() {
if (Bootstrap.command.getArgs().length == 0) {
- logger.error("Missing upgrade target parameter. Usage: {} <installation directory of old {} version>",
- Bootstrap.command.getScript(), appName);
+ logger.error("Missing upgrade target parameter. Usage: {} <OneDev installation directory>",
+ Bootstrap.command.getScript());
System.exit(1);
}
File upgradeDir = new File(Bootstrap.command.getArgs()[0]);
@@ -113,185 +110,115 @@ public class Upgrade extends DefaultPersistManager {
System.exit(1);
}
- logger.info("Upgrading {}...", upgradeDir.getAbsolutePath());
-
- if (!new File(upgradeDir, "boot/bootstrap.keys").exists()) {
- logger.error("Invalid {} installation directory: {}, make sure you are specifying the top level "
- + "installation directory (it contains sub directories such as \"bin\", \"boot\", \"conf\", etc)",
- appName, upgradeDir.getAbsolutePath());
- System.exit(1);
- }
-
- if (Bootstrap.isServerRunning(upgradeDir)) {
- logger.error("Please stop server running at \"{}\" before upgrading", upgradeDir.getAbsolutePath());
- System.exit(1);
- }
- if (Bootstrap.isServerRunning(Bootstrap.installDir)) {
- logger.error("Please stop server running at \"{}\" before upgrading", Bootstrap.installDir.getAbsolutePath());
- System.exit(1);
- }
-
- for (File file: new File(upgradeDir, "lib").listFiles()) {
- if (file.getName().contains("mariadb") || file.getName().contains("mysql")
- || file.getName().contains("ojdbc") || file.getName().contains("postgresql")
- || file.getName().contains("sqljdbc")) {
- try {
- File destDir = new File(upgradeDir, "site/lib");
- FileUtils.createDir(destDir);
- FileUtils.copyFileToDirectory(file, destDir);
- FileUtils.deleteFile(file);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
+ if (upgradeDir.list().length != 0) {
+ if (!new File(upgradeDir, "boot/bootstrap.keys").exists()) {
+ logger.error("Invalid OneDev installation directory: {}, make sure you are specifying the top level "
+ + "installation directory (it contains sub directories such as \"bin\", \"boot\", \"conf\", etc)",
+ upgradeDir.getAbsolutePath());
+ System.exit(1);
}
- }
-
- AtomicReference<String> oldDataVersion = new AtomicReference<>(null);
- int ret = buildCommandline(upgradeDir, "check_data_version").execute(new LineConsumer() {
-
- @Override
- public void consume(String line) {
- String prefix = "Data version: ";
- if (line.startsWith(prefix)) {
- oldDataVersion.set(line.substring(prefix.length()));
- logger.info("Old data version: " + oldDataVersion.get());
- } else {
- logger.info(prefixUpgradeTargetLog(line));
- }
+ String oldProgramVersion;
+ String newProgramVersion;
+ try {
+ oldProgramVersion = FileUtils.readFileToString(new File(upgradeDir, "version.txt"));
+ newProgramVersion = FileUtils.readFileToString(new File(Bootstrap.installDir, "version.txt"));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ if (oldProgramVersion.equals(newProgramVersion)) {
+ logger.info("Program files are up to date");
+ System.exit(0);
}
-
- }, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.error(prefixUpgradeTargetLog(line));
- }}
-
- ).getReturnCode();
-
- if (ret != 0) {
- logger.error("Unable to upgrade specified installation due to above error");
- System.exit(1);
- }
- AtomicBoolean usingEmbeddedDB = new AtomicBoolean(false);
- ret = buildCommandline(upgradeDir, "db_dialect").execute(new LineConsumer() {
+ logger.info("Upgrading {}...", upgradeDir.getAbsolutePath());
- @Override
- public void consume(String line) {
- String prefix = "Database dialect: ";
- String dialect;
- if (line.startsWith(prefix)) {
- dialect = line.substring(prefix.length());
- logger.info("Database dialect: " + dialect);
- if (dialect.toLowerCase().contains("hsql"))
- usingEmbeddedDB.set(true);
- } else {
- logger.info(prefixUpgradeTargetLog(line));
- }
+ if (Bootstrap.isServerRunning(upgradeDir)) {
+ logger.error("Please stop server running at \"{}\" before upgrading", upgradeDir.getAbsolutePath());
+ System.exit(1);
+ }
+ if (Bootstrap.isServerRunning(Bootstrap.installDir)) {
+ logger.error("Please stop server running at \"{}\" before upgrading", Bootstrap.installDir.getAbsolutePath());
+ System.exit(1);
}
-
- }, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.error(prefixUpgradeTargetLog(line));
- }}
-
- ).getReturnCode();
-
- if (ret != 0) {
- logger.error("Unable to upgrade specified installation due to above error");
- System.exit(1);
- }
-
- File upgradeBackup = new File(Bootstrap.installDir, getBackupName(upgradeDir.getName()));
- FileUtils.createDir(upgradeBackup);
- File dbBackup = null;
-
- if (usingEmbeddedDB.get()) {
- logger.info("Backing up old installation directory as {}...", upgradeBackup.getAbsolutePath());
- try {
- int baseLen = upgradeDir.getAbsolutePath().length() + 1;
- FileUtils.copyDirectory(upgradeDir, upgradeBackup, new FileFilter() {
- @Override
- public boolean accept(File pathname) {
- String relative = pathname.getAbsolutePath().substring(baseLen);
- return !relative.equals("temp") && !relative.equals("cache");
+ for (File file: new File(upgradeDir, "lib").listFiles()) {
+ if (file.getName().contains("mariadb") || file.getName().contains("mysql")
+ || file.getName().contains("ojdbc") || file.getName().contains("postgresql")
+ || file.getName().contains("sqljdbc")) {
+ try {
+ File destDir = new File(upgradeDir, "site/lib");
+ FileUtils.createDir(destDir);
+ FileUtils.copyFileToDirectory(file, destDir);
+ FileUtils.deleteFile(file);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
}
-
- });
- } catch (IOException e) {
- throw new RuntimeException(e);
+ }
}
- restoreExecutables(upgradeBackup);
+
+ AtomicInteger oldDataVersion = new AtomicInteger(0);
+
+ int ret = buildCommandline(upgradeDir, "check-data-version").execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ String prefix = "Data version: ";
+ if (line.startsWith(prefix)) {
+ oldDataVersion.set(Integer.parseInt(line.substring(prefix.length())));
+ logger.info("Old data version: " + oldDataVersion.get());
+ } else {
+ logger.info(prefixUpgradeTargetLog(line));
+ }
+ }
+
+ }, new LineConsumer() {
- if (!MigrationHelper.getVersion(DatabaseMigrator.class).equals(oldDataVersion.get())) {
- dbBackup = new File(upgradeDir, getBackupName("dbbackup") + ".zip");
- logger.info("Backing up database as {}...", dbBackup.getAbsolutePath());
- backupDB(upgradeDir, dbBackup);
+ @Override
+ public void consume(String line) {
+ logger.error(prefixUpgradeTargetLog(line));
+ }}
+
+ ).getReturnCode();
+
+ if (ret != 0) {
+ logger.error("Unable to upgrade specified installation due to above error");
+ System.exit(1);
}
- } else {
- // for non-embedded database, we should include database backup in the old installation backup directory
- // in case we need that for database restore after a failed upgrade
- if (!MigrationHelper.getVersion(DatabaseMigrator.class).equals(oldDataVersion.get())) {
- dbBackup = new File(upgradeDir, getBackupName("dbbackup") + ".zip");
- logger.info("Backing up database as {}...", dbBackup.getAbsolutePath());
- backupDB(upgradeDir, dbBackup);
+
+ int newDataVersion = Integer.parseInt(MigrationHelper.getVersion(DatabaseMigrator.class));
+
+ if (oldDataVersion.get() > newDataVersion) {
+ logger.error("Unable to upgrade as specified installation is more recent");
+ System.exit(1);
}
- logger.info("Backing up old installation directory as {}...", upgradeBackup.getAbsolutePath());
+ 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 {
- int baseLen = upgradeDir.getAbsolutePath().length() + 1;
- FileUtils.copyDirectory(upgradeDir, upgradeBackup, new FileFilter() {
-
- @Override
- public boolean accept(File pathname) {
- String relative = pathname.getAbsolutePath().substring(baseLen);
- return !relative.equals("temp") && !relative.equals("cache");
- }
-
- });
+ for (File each: upgradeDir.listFiles()) {
+ if (each.isFile())
+ FileUtils.copyFileToDirectory(each, programBackup);
+ else if (!each.getName().equals("temp") && !each.getName().equals("site"))
+ FileUtils.copyDirectoryToDirectory(each, programBackup);
+ }
} catch (IOException e) {
throw new RuntimeException(e);
}
- restoreExecutables(upgradeBackup);
- }
-
- boolean failed;
- try {
- if (dbBackup != null) {
- logger.info("Cleaning database with old program version...");
- ret = buildCommandline(upgradeDir, "clean").execute(new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.info(prefixUpgradeTargetLog(line));
- }
+ restoreExecutables(programBackup);
+
+ File dbBackupFile = null;
+ boolean failed = false;
+ try {
+ if (oldDataVersion.get() != newDataVersion) {
+ dbBackupFile = new File(upgradeDir, "site/" + DB_BACKUP_DIR + "/" + timestamp + ".zip");
+ logger.info("Backing up database as {}...", dbBackupFile.getAbsolutePath());
- }, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.error(prefixUpgradeTargetLog(line));
- }
+ FileUtils.createDir(dbBackupFile.getParentFile());
- }).getReturnCode();
-
- if (ret != 0) {
- logger.error("Failed to upgrade {}", upgradeDir.getAbsolutePath());
- failed = true;
- } else {
- failed = false;
- }
-
- if (!failed) {
- logger.info("Copying new program files into {}...", upgradeDir.getAbsolutePath());
- copyProgramFilesTo(upgradeDir);
-
- logger.info("Restoring database with new program version...");
- ret = buildCommandline(upgradeDir, "restore", dbBackup.getAbsolutePath()).execute(new LineConsumer() {
+ ret = buildCommandline(upgradeDir, "backup-db", dbBackupFile.getAbsolutePath()).execute(new LineConsumer() {
@Override
public void consume(String line) {
@@ -307,99 +234,131 @@ public class Upgrade extends DefaultPersistManager {
}).getReturnCode();
+ if (ret == 0) {
+ logger.info("Cleaning database with old program...");
+ 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) {
+ logger.info("Updating program files...");
+ updateProgramFiles(upgradeDir);
+
+ 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());
failed = true;
+ }
+
+ } else {
+ logger.info("Copying new program files into {}...", upgradeDir.getAbsolutePath());
+ updateProgramFiles(upgradeDir);
+ }
+ } catch (Exception e) {
+ logger.error("Error upgrading " + upgradeDir.getAbsolutePath(), e);
+ failed = true;
+ }
+
+ if (failed) {
+ logger.info("Restoring old program files due to upgrade failure...");
+ 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);
+ }
+ }
+ }
+
+ restoreExecutables(upgradeDir);
+ logger.info("Old program files restored");
+ FileUtils.deleteDir(programBackup);
+ } catch (Exception e) {
+ logger.error("Error restoring old program files", e);
+ logger.warn("Please restore manually from \"{}\"", programBackup.getAbsolutePath());
+ }
+ if (dbBackupFile != null) {
+ logger.warn("The database might be in an inconsistent state due to upgrade failure. In that case, "
+ + "you need to restore the database by first cleaning it, 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 {
- failed = false;
+ logger.info(upgradeDir.getAbsolutePath() + File.separator + "bin" + File.separator + "restore-db.sh " + dbBackupFile.getAbsolutePath());
}
}
+ System.exit(1);
} else {
- logger.info("Copying new program files into {}...", upgradeDir.getAbsolutePath());
- copyProgramFilesTo(upgradeDir);
- failed = false;
- }
- } catch (Exception e) {
- logger.error("Error upgrading " + upgradeDir.getAbsolutePath(), e);
- failed = true;
- }
-
- if (failed) {
- logger.info("Now restoring old installation directory due to upgrade failure...");
- try {
- /* we do not clean upgradeDir here directly as user may open
- * a command prompt inside the various sub directories to
- * cause it unable to be deleted
- */
- for (File child: upgradeDir.listFiles()) {
- if (child.isDirectory())
- FileUtils.cleanDir(child);
- else
- FileUtils.deleteFile(child);
- }
- FileUtils.copyDirectory(upgradeBackup, upgradeDir);
- restoreExecutables(upgradeDir);
- logger.info("Old installation directory is now restored.");
- } catch (Exception e2) {
- logger.error("Error restoring old installation directory", e2);
- logger.warn("Please restore it manually by deleting all contents under directory \"{}\", and then copying over all contents under directory \"{}\"",
- upgradeDir.getAbsolutePath(), upgradeBackup.getAbsolutePath());
- }
- if (!usingEmbeddedDB.get() && dbBackup != null) {
- logger.warn("The database might be in an inconsistent state due to upgrade failure. In that case, "
- + "you need to restore the database by first cleaning it, and then running below command:");
- if (SystemUtils.IS_OS_WINDOWS) {
- logger.info(upgradeDir.getAbsolutePath() + File.separator + "bin" + File.separator + "restore.bat " + dbBackup.getAbsolutePath());
- } else {
- logger.info(upgradeDir.getAbsolutePath() + File.separator + "bin" + File.separator + "restore.sh " + dbBackup.getAbsolutePath());
+ logger.info("Successfully upgraded {}", upgradeDir.getAbsolutePath());
+
+ if (oldDataVersion.get() <= 5) {
+ logger.warn("\n"
+ + "************************* IMPORTANT NOTICE *************************\n"
+ + "* OneDev password hash algorithm has been changed for security *\n"
+ + "* reason. Please reset administrator password with the *\n"
+ + "* reset_admin_password command. Other users' password will be *\n"
+ + "* reset and sent to their mail box automatically when they logs *\n"
+ + "* into OneDev. *\n"
+ + "********************************************************************");
}
- }
- System.exit(1);
+ FileUtils.deleteDir(programBackup);
+ System.exit(0);
+ }
} else {
- logger.info("Successfully upgraded {}", upgradeDir.getAbsolutePath());
+ logger.info("Populating {}...", upgradeDir.getAbsolutePath());
- if (Integer.parseInt(oldDataVersion.get()) <= 5) {
- logger.warn("\n"
- + "************************* IMPORTANT NOTICE *************************\n"
- + "* OneDev password hash algorithm has been changed for security *\n"
- + "* reason. Please reset administrator password with the *\n"
- + "* reset_admin_password command. Other users' password will be *\n"
- + "* reset and sent to their mail box automatically when they logs *\n"
- + "* into OneDev. *\n"
- + "********************************************************************");
- }
- System.exit(0);
- }
- }
-
- private void backupDB(File upgradeDir, File dbBackup) {
- int ret = buildCommandline(upgradeDir, "backup", dbBackup.getAbsolutePath()).execute(new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.info(prefixUpgradeTargetLog(line));
+ if (Bootstrap.isServerRunning(Bootstrap.installDir)) {
+ logger.error("Please stop server running at \"{}\" before populating", Bootstrap.installDir.getAbsolutePath());
+ System.exit(1);
}
-
- }, new LineConsumer() {
- @Override
- public void consume(String line) {
- logger.error(prefixUpgradeTargetLog(line));
+ try {
+ FileUtils.copyDirectory(Bootstrap.installDir, upgradeDir);
+ restoreExecutables(upgradeDir);
+ logger.info("Successfully populated {}", upgradeDir.getAbsolutePath());
+ System.exit(0);
+ } catch (Exception e) {
+ logger.error("Error populating " + upgradeDir.getAbsolutePath(), e);
+ FileUtils.cleanDir(upgradeDir);
+ System.exit(1);
}
-
- }).getReturnCode();
-
- if (ret != 0) {
- logger.error("Unable to upgrade specified installation due to above error");
- System.exit(1);
}
}
-
- private String getBackupName(String name) {
- return name + "~" + DateTimeFormat.forPattern(BACKUP_DATETIME_FORMAT).print(new DateTime());
- }
- protected void copyProgramFilesTo(File upgradeDir) {
+ protected void updateProgramFiles(File upgradeDir) {
cleanAndCopy(new File(Bootstrap.installDir, "3rdparty-licenses"), new File(upgradeDir, "3rdparty-licenses"));
File siteServerScriptFile = new File(upgradeDir, "bin/server.sh");
diff --git a/server-core/src/main/java/io/onedev/server/model/support/setting/BackupSetting.java b/server-core/src/main/java/io/onedev/server/model/support/setting/BackupSetting.java
index 09f6411c56..e1a196a54a 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/setting/BackupSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/setting/BackupSetting.java
@@ -10,7 +10,6 @@ import org.quartz.CronExpression;
import io.onedev.server.util.validation.Validatable;
import io.onedev.server.util.validation.annotation.ClassValidating;
-import io.onedev.server.util.validation.annotation.Directory;
import io.onedev.server.web.editable.annotation.Editable;
@Editable
@@ -21,14 +20,12 @@ public class BackupSetting implements Serializable, Validatable {
private String schedule;
- private String folder;
-
@Editable(order=100, name="Backup Schedule", description=
"Optionally specify a cron expression to schedule database auto-backup. The cron expression format is " +
"<em>&lt;seconds&gt; &lt;minutes&gt; &lt;hours&gt; &lt;day-of-month&gt; &lt;month&gt; &lt;day-of-week&gt;</em>." +
"For example, <em>0 0 1 * * ?</em> means 1:00am every day. For details of the format, refer " +
"to <a href='http://www.quartz-scheduler.org/documentation/quartz-2.x/tutorials/tutorial-lesson-06'>Quartz tutorial</a>." +
- "The backup files will be placed into <em>backup</em> folder under OneDev " +
+ "The backup files will be placed into <em>db-backup</em> folder under OneDev " +
"installation directory. Leave this property empty if you do not want to enable database " +
"auto backup.")
@NotEmpty
@@ -40,19 +37,6 @@ public class BackupSetting implements Serializable, Validatable {
this.schedule = schedule;
}
- @Editable(order=200, name="Backup Directory", description=
- "Specify the directory to which the auto backup files will be stored. Non-absolute path " +
- "will be considered to be relative to installation directory of OneDev.")
- @Directory(absolute=true, outsideOfInstallDir=true, writeable=true)
- @NotEmpty
- public String getFolder() {
- return folder;
- }
-
- public void setFolder(String folder) {
- this.folder = folder;
- }
-
@Override
public boolean isValid(ConstraintValidatorContext context) {
boolean hasErrors = false;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/setting/SystemSetting.java b/server-core/src/main/java/io/onedev/server/model/support/setting/SystemSetting.java
index a5899e7395..780d8c3c12 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/setting/SystemSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/setting/SystemSetting.java
@@ -7,7 +7,6 @@ import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import org.apache.commons.lang3.StringUtils;
-
import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.server.git.config.CurlConfig;
@@ -16,7 +15,6 @@ import io.onedev.server.git.config.SystemCurl;
import io.onedev.server.git.config.SystemGit;
import io.onedev.server.util.validation.Validatable;
import io.onedev.server.util.validation.annotation.ClassValidating;
-import io.onedev.server.util.validation.annotation.Directory;
import io.onedev.server.web.editable.annotation.Editable;
@Editable
@@ -27,8 +25,6 @@ public class SystemSetting implements Serializable, Validatable {
private String serverUrl;
- private String storagePath;
-
private GitConfig gitConfig = new SystemGit();
private CurlConfig curlConfig = new SystemCurl();
@@ -46,17 +42,6 @@ public class SystemSetting implements Serializable, Validatable {
this.serverUrl = serverUrl;
}
- @Editable(name="Storage Directory", order=100, description="Specify directory to store OneDev data such as Git projects.")
- @Directory(absolute=true, outsideOfInstallDir=true, writeable=true)
- @NotEmpty
- public String getStoragePath() {
- return storagePath;
- }
-
- public void setStoragePath(String storagePath) {
- this.storagePath = storagePath;
- }
-
@Editable(order=200, description="OneDev requires git command line to manage repositories. The minimum "
+ "required version is 1.8.0.")
@Valid
diff --git a/server-core/src/main/java/io/onedev/server/storage/DefaultStorageManager.java b/server-core/src/main/java/io/onedev/server/storage/DefaultStorageManager.java
index 1f53fa1625..daa4e46782 100644
--- a/server-core/src/main/java/io/onedev/server/storage/DefaultStorageManager.java
+++ b/server-core/src/main/java/io/onedev/server/storage/DefaultStorageManager.java
@@ -9,9 +9,9 @@ import javax.inject.Singleton;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import io.onedev.commons.launcher.bootstrap.Bootstrap;
import io.onedev.commons.launcher.loader.Listen;
import io.onedev.commons.utils.FileUtils;
-import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.event.entity.EntityRemoved;
import io.onedev.server.event.system.SystemStarting;
import io.onedev.server.model.Project;
@@ -28,27 +28,17 @@ public class DefaultStorageManager implements StorageManager {
private static final String OLD_DELETE_MARK2 = "to_be_deleted_when_turbodev_is_restarted";
- private static final String DELETE_MARK = "to_be_deleted_when_onedev_is_restarted";
+ private static final String DELETE_MARK = "to-be-deleted-when-onedev-is-restarted";
private final TransactionManager transactionManager;
- private final SettingManager configManager;
-
@Inject
- public DefaultStorageManager(TransactionManager transactionManager, SettingManager configManager) {
- this.configManager = configManager;
+ public DefaultStorageManager(TransactionManager transactionManager) {
this.transactionManager = transactionManager;
}
- @Override
- public File getStorageDir() {
- File storageDir = new File(configManager.getSystemSetting().getStoragePath());
- FileUtils.createDir(storageDir);
- return storageDir;
- }
-
private File getProjectsDir() {
- File projectsDir = new File(getStorageDir(), "projects");
+ File projectsDir = new File(Bootstrap.getSiteDir(), "projects");
FileUtils.createDir(projectsDir);
return projectsDir;
}
@@ -142,7 +132,7 @@ public class DefaultStorageManager implements StorageManager {
}
private File getUsersDir() {
- File usersDir = new File(getStorageDir(), "users");
+ File usersDir = new File(Bootstrap.getSiteDir(), "users");
FileUtils.createDir(usersDir);
return usersDir;
}
diff --git a/server-core/src/main/java/io/onedev/server/storage/StorageManager.java b/server-core/src/main/java/io/onedev/server/storage/StorageManager.java
index 25caeb2dae..ca66dc3d60 100644
--- a/server-core/src/main/java/io/onedev/server/storage/StorageManager.java
+++ b/server-core/src/main/java/io/onedev/server/storage/StorageManager.java
@@ -4,8 +4,6 @@ import java.io.File;
public interface StorageManager {
- File getStorageDir();
-
/**
* Get directory to store git repository of specified project
*
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.html
index b623d67908..ddbea32501 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.html
@@ -1,10 +1,6 @@
<wicket:extend>
<div class="page-title">Database Backup</div>
<div class="database-backup">
- <div class="alert alert-info">
- OneDev stores project meta data into database, and <b>its backup/restore will not affect git repositories</b>.
- To backup git repositories, you will need to use some file system backup tool to backup directory
- &quot;<span wicket:id="storageDir"></span>&quot;</div>
<form wicket:id="backupSetting" class="leave-confirm">
<div wicket:id="editor"></div>
<div class="actions">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.java
index cda9c05bd7..6a43808768 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.java
@@ -4,7 +4,6 @@ import java.io.File;
import java.io.IOException;
import org.apache.tika.mime.MimeTypes;
-import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.link.ResourceLink;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -15,7 +14,6 @@ import io.onedev.commons.utils.ZipUtils;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.persistence.PersistManager;
-import io.onedev.server.storage.StorageManager;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.page.admin.AdministrationPage;
@@ -30,8 +28,6 @@ public class DatabaseBackupPage extends AdministrationPage {
protected void onInitialize() {
super.onInitialize();
- add(new Label("storageDir", OneDev.getInstance(StorageManager.class).getStorageDir()));
-
BackupSettingHolder backupSettingHolder = new BackupSettingHolder();
backupSettingHolder.setBackupSetting(OneDev.getInstance(SettingManager.class).getBackupSetting());
Form<?> form = new Form<Void>("backupSetting") {
diff --git a/server-plugin/server-plugin-serverdocker/src/main/java/io/onedev/server/plugin/serverdocker/ServerDockerExecutor.java b/server-plugin/server-plugin-serverdocker/src/main/java/io/onedev/server/plugin/serverdocker/ServerDockerExecutor.java
index 3d039478e5..99eb8b7fa6 100644
--- a/server-plugin/server-plugin-serverdocker/src/main/java/io/onedev/server/plugin/serverdocker/ServerDockerExecutor.java
+++ b/server-plugin/server-plugin-serverdocker/src/main/java/io/onedev/server/plugin/serverdocker/ServerDockerExecutor.java
@@ -158,7 +158,7 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa
}
private File getCacheHome() {
- return new File(System.getProperty("user.home"), "onedev-cache");
+ return new File(Bootstrap.getSiteDir(), "job-cache");
}
@Override