From d48536f1cf5e4b6714122fc0d85a5e77bf731346 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Wed, 16 Mar 2016 11:41:09 +0000
Subject: [PATCH] OPENDJ-2730 Fix upgrade on case insensitive file systems
---
opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java | 41 +++++++++++++++++++----------------------
1 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java
index df06213..f70eea9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java
@@ -56,21 +56,18 @@
private static LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
/** Upgrade supports version from 2.4.5. */
- private static BuildVersion UPGRADESUPPORTSVERSIONFROM = BuildVersion.valueOf("2.4.5.0000");
+ private static BuildVersion UPGRADE_SUPPORTS_VERSION_FROM = BuildVersion.valueOf("2.4.5.0000");
/** The success exit code value. */
static final int EXIT_CODE_SUCCESS = 0;
/** The error exit code value. */
static final int EXIT_CODE_ERROR = 1;
- /**
- * The exit code value that will be used if upgrade requires manual
- * intervention.
- */
- static final int EXIT_CODE_MANUAL_INTERVENTION = 2;
-
/** If the upgrade contains some post upgrade tasks to do. */
- static boolean hasPostUpgradeTask;
+ private static boolean hasPostUpgradeTask;
+
+ /** If the upgrade script should exit with error code (useful for warnings) */
+ private static boolean exitWithErrorCode;
/** Developers should register upgrade tasks below. */
private static final NavigableMap<BuildVersion, List<UpgradeTask>> TASKS = new TreeMap<>();
@@ -863,10 +860,10 @@
}
// The upgrade only supports version >= 2.4.5.
- if (context.getFromVersion().compareTo(UPGRADESUPPORTSVERSIONFROM) < 0)
+ if (context.getFromVersion().compareTo(UPGRADE_SUPPORTS_VERSION_FROM) < 0)
{
final LocalizableMessage message =
- INFO_UPGRADE_VERSION_IS_NOT_SUPPORTED.get(UPGRADESUPPORTSVERSIONFROM, UPGRADESUPPORTSVERSIONFROM);
+ INFO_UPGRADE_VERSION_IS_NOT_SUPPORTED.get(UPGRADE_SUPPORTS_VERSION_FROM, UPGRADE_SUPPORTS_VERSION_FROM);
context.notify(message, NOTICE_CALLBACK);
throw new ClientException(ReturnCode.ERROR_UNEXPECTED, message);
}
@@ -970,25 +967,25 @@
}
}
- /**
- * Returns {@code true} if the current upgrade contains post upgrade tasks.
- *
- * @return {@code true} if the current upgrade contains post upgrade tasks.
- */
- static boolean hasPostUpgradeTask()
+ static void needToRunPostUpgradePhase()
{
- return hasPostUpgradeTask;
+ Upgrade.hasPostUpgradeTask = true;
+ }
+
+ /** This method should be used when the upgrade tool has issued a warning. */
+ static void needToExitWithErrorCode()
+ {
+ Upgrade.exitWithErrorCode = true;
}
/**
- * Sets {@code true} if the current upgrade contains post upgrade tasks.
+ * {@code true} if the upgrade succeeded.
*
- * @param hasPostUpgradeTask
- * {@code true} if the current upgrade contains post upgrade tasks.
+ * @return {@code true} if the upgrade succeeded.
*/
- static void setHasPostUpgradeTask(boolean hasPostUpgradeTask)
+ static boolean isSuccess()
{
- Upgrade.hasPostUpgradeTask = hasPostUpgradeTask;
+ return !exitWithErrorCode;
}
/** Prevent instantiation. */
--
Gitblit v1.10.0