This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit a4af4f0155dc0d3db17ae3cbb0ea9a3d8159c13d
Merge: d766696152 dd7b749102
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Thu Feb 22 17:42:09 2024 +0000
Merge branch 'main' into elasticity
.../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 8436a18737,34b362fa2e..162196a84b
---
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
@@@ -34,9 -33,13 +34,13 @@@ import java.util.concurrent.TimeUnit
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.AccumuloException;
+ import org.apache.accumulo.core.client.AccumuloSecurityException;
+ import org.apache.accumulo.core.client.NamespaceNotFoundException;
+ import org.apache.accumulo.core.client.TableNotFoundException;
+ import org.apache.accumulo.core.conf.ConfigCheckUtil;
-import org.apache.accumulo.core.dataImpl.KeyExtent;
-import org.apache.accumulo.core.fate.ReadOnlyTStore;
+import org.apache.accumulo.core.fate.ReadOnlyFateStore;
import org.apache.accumulo.core.fate.ZooStore;
+import org.apache.accumulo.core.metadata.schema.Ample;
import org.apache.accumulo.core.util.threads.ThreadPools;
import org.apache.accumulo.core.volume.Volume;
import org.apache.accumulo.manager.EventCoordinator;
@@@ -79,10 -82,19 +83,19 @@@ public class UpgradeCoordinator
*/
UPGRADED_ROOT {
@Override
- public boolean isParentLevelUpgraded(KeyExtent extent) {
- return extent.isMeta();
+ public boolean isParentLevelUpgraded(Ample.DataLevel level) {
+ return level == Ample.DataLevel.METADATA || level ==
Ample.DataLevel.ROOT;
}
},
+ /**
+ * This signifies that zookeeper and the root and metadata tables have
been upgraded so far.
+ */
+ UPGRADED_METADATA {
+ @Override
- public boolean isParentLevelUpgraded(KeyExtent extent) {
- return extent.isMeta();
++ public boolean isParentLevelUpgraded(Ample.DataLevel level) {
++ return level == Ample.DataLevel.METADATA || level ==
Ample.DataLevel.ROOT;
+ }
+ },
/**
* This signifies that everything (zookeeper, root table, metadata table)
is upgraded.
*/
