You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ed...@apache.org on 2023/02/08 20:20:47 UTC
[accumulo] branch main updated (9d9e17868e -> 2574557cce)
This is an automated email from the ASF dual-hosted git repository.
edcoleman pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 9d9e17868e Merge branch '2.1'
add 43e0243890 Enforce sort order of data version for upgraders (#3191)
new 2574557cce Merge remote-tracking branch 'upstream/2.1'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/accumulo/manager/upgrade/UpgradeCoordinator.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
[accumulo] 01/01: Merge remote-tracking branch 'upstream/2.1'
Posted by ed...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
edcoleman pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 2574557ccef86f7303e6482175c72c349c9498e0
Merge: 9d9e17868e 43e0243890
Author: Ed Coleman <ed...@apache.org>
AuthorDate: Wed Feb 8 20:20:01 2023 +0000
Merge remote-tracking branch 'upstream/2.1'
.../apache/accumulo/manager/upgrade/UpgradeCoordinator.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --cc server/manager/src/main/java/org/apache/accumulo/manager/upgrade/UpgradeCoordinator.java
index fc4f4b6c9a,d6494356ec..505c2831ea
--- 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
@@@ -19,8 -19,9 +19,10 @@@
package org.apache.accumulo.manager.upgrade;
import java.io.IOException;
+ import java.util.Collections;
import java.util.Map;
+import java.util.Objects;
+ import java.util.TreeMap;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Future;
import java.util.concurrent.SynchronousQueue;
@@@ -103,14 -104,15 +105,14 @@@ public class UpgradeCoordinator
public abstract boolean isParentLevelUpgraded(KeyExtent extent);
}
- private static Logger log = LoggerFactory.getLogger(UpgradeCoordinator.class);
+ private static final Logger log = LoggerFactory.getLogger(UpgradeCoordinator.class);
private int currentVersion;
-
- // unmodifiable map of "current version" -> upgrader to next version.
- // Sorted so upgrades execute in order from the oldest supported data version to current
- private Map<Integer,Upgrader> upgraders =
+ // 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 =
+ Collections.unmodifiableMap(new TreeMap<>(Map.of(AccumuloDataVersion.SHORTEN_RFILE_KEYS,
- new Upgrader8to9(), AccumuloDataVersion.CRYPTO_CHANGES, new Upgrader9to10())));
++ new Upgrader8to9(), AccumuloDataVersion.CRYPTO_CHANGES, new Upgrader9to10(),
++ AccumuloDataVersion.ROOT_TABLET_META_CHANGES, new Upgrader10to11())));
private volatile UpgradeStatus status;