This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit dd7b749102ad1718c1c0dc5cc46e0126c1a10023
Merge: e3d6204305 af50af77ce
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Thu Feb 22 17:28:33 2024 +0000
Merge branch '2.1'
.../manager/upgrade/UpgradeCoordinator.java | 37 +++++++++++++++++++++-
1 file changed, 36 insertions(+), 1 deletion(-)
diff --cc
server/manager/src/main/java/org/apache/accumulo/manager/upgrade/UpgradeCoordinator.java
index f5fd84c0e1,d62e824e05..34b362fa2e
---
a/server/manager/src/main/java/org/apache/accumulo/manager/upgrade/UpgradeCoordinator.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/upgrade/UpgradeCoordinator.java
@@@ -190,25 -198,19 +203,28 @@@ public class UpgradeCoordinator
.submit(() -> {
try {
for (int v = currentVersion; v < AccumuloDataVersion.get();
v++) {
- log.info("Upgrading Root from data version {}", v);
+ log.info("Upgrading Root - current version {} as step towards
target version {}", v,
+ AccumuloDataVersion.get());
+ var upgrader = upgraders.get(v);
+ Objects.requireNonNull(upgrader,
+ "upgrade root: failed to find root upgrader for version "
+ currentVersion);
upgraders.get(v).upgradeRoot(context);
}
-
setStatus(UpgradeStatus.UPGRADED_ROOT, eventCoordinator);
for (int v = currentVersion; v < AccumuloDataVersion.get();
v++) {
- log.info("Upgrading Metadata from data version {}", v);
+ log.info(
+ "Upgrading Metadata - current version {} as step towards
target version {}", v,
+ AccumuloDataVersion.get());
+ var upgrader = upgraders.get(v);
+ Objects.requireNonNull(upgrader,
+ "upgrade metadata: failed to find upgrader for version "
+ currentVersion);
upgraders.get(v).upgradeMetadata(context);
}
+ setStatus(UpgradeStatus.UPGRADED_METADATA, eventCoordinator);
+
+ log.info("Validating configuration properties.");
+ validateProperties(context);
log.info("Updating persistent data version.");
updateAccumuloVersion(context.getServerDirs(),
context.getVolumeManager(),
