EdColeman commented on code in PR #3160:
URL: https://github.com/apache/accumulo/pull/3160#discussion_r1098905837
##########
server/manager/src/main/java/org/apache/accumulo/manager/upgrade/UpgradeCoordinator.java:
##########
@@ -107,10 +110,8 @@ public boolean isParentLevelUpgraded(KeyExtent extent) {
private int currentVersion;
// map of "current version" -> upgrader to next version.
- private final Map<Integer,
- Upgrader> upgraders = Map.of(AccumuloDataVersion.SHORTEN_RFILE_KEYS, new
Upgrader8to9(),
- AccumuloDataVersion.CRYPTO_CHANGES, new Upgrader9to10(),
- AccumuloDataVersion.ROOT_TABLET_META_CHANGES, new Upgrader10to11());
+ private final Map<Integer,Upgrader> upgraders =
+ Map.of(ROOT_TABLET_META_CHANGES, new Upgrader10to11());
Review Comment:
Addressed in 7c8ec3ad63. I'll work a patch for 2.1.1 with only the ordering
preserving and hard-coded value removal as a separate PR.
##########
server/manager/src/main/java/org/apache/accumulo/manager/upgrade/UpgradeCoordinator.java:
##########
@@ -142,11 +143,17 @@ public synchronized void upgradeZookeeper(ServerContext
context,
"Not currently in a suitable state to do zookeeper upgrade %s",
status);
try {
- int cv = context.getServerDirs()
- .getAccumuloPersistentVersion(context.getVolumeManager().getFirst());
- ServerContext.ensureDataVersionCompatible(cv);
+ int cv = AccumuloDataVersion.getCurrentVersion(context);
this.currentVersion = cv;
+ int oldestVersion = ROOT_TABLET_META_CHANGES;
Review Comment:
Addressed in 7c8ec3ad63
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
