This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a commit to branch 2.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/2.1 by this push:
new 7c7463b2b9 Renamed LocalityGroupConfigurationError to
LocalityGroupConfigurationException (#6422)
7c7463b2b9 is described below
commit 7c7463b2b986529273047fe234d2008cb48a4d6e
Author: Dave Marion <[email protected]>
AuthorDate: Wed Jun 10 13:30:21 2026 -0400
Renamed LocalityGroupConfigurationError to
LocalityGroupConfigurationException (#6422)
Related to #3395
---
.../core/client/admin/NewTableConfiguration.java | 4 ++--
.../core/clientImpl/InstanceOperationsImpl.java | 4 ++--
.../core/clientImpl/NamespaceOperationsImpl.java | 4 ++--
.../core/clientImpl/TableOperationsImpl.java | 4 ++--
.../accumulo/core/util/LocalityGroupUtil.java | 25 +++++++++++-----------
.../accumulo/core/util/LocalityGroupUtilTest.java | 6 +++---
.../accumulo/server/compaction/FileCompactor.java | 4 ++--
7 files changed, 26 insertions(+), 25 deletions(-)
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/admin/NewTableConfiguration.java
b/core/src/main/java/org/apache/accumulo/core/client/admin/NewTableConfiguration.java
index c35aca8c0f..0d779f1c06 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/admin/NewTableConfiguration.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/admin/NewTableConfiguration.java
@@ -46,7 +46,7 @@ import
org.apache.accumulo.core.iteratorsImpl.IteratorConfigUtil;
import org.apache.accumulo.core.sample.impl.SamplerConfigurationImpl;
import org.apache.accumulo.core.summary.SummarizerConfigurationUtil;
import org.apache.accumulo.core.util.LocalityGroupUtil;
-import
org.apache.accumulo.core.util.LocalityGroupUtil.LocalityGroupConfigurationError;
+import
org.apache.accumulo.core.util.LocalityGroupUtil.LocalityGroupConfigurationException;
import org.apache.hadoop.io.Text;
import com.google.common.base.Preconditions;
@@ -171,7 +171,7 @@ public class NewTableConfiguration {
try {
LocalityGroupUtil.checkLocalityGroups(props);
- } catch (LocalityGroupConfigurationError e) {
+ } catch (LocalityGroupConfigurationException e) {
throw new IllegalArgumentException(e);
}
diff --git
a/core/src/main/java/org/apache/accumulo/core/clientImpl/InstanceOperationsImpl.java
b/core/src/main/java/org/apache/accumulo/core/clientImpl/InstanceOperationsImpl.java
index ef316defd9..c11b6f3c21 100644
---
a/core/src/main/java/org/apache/accumulo/core/clientImpl/InstanceOperationsImpl.java
+++
b/core/src/main/java/org/apache/accumulo/core/clientImpl/InstanceOperationsImpl.java
@@ -64,7 +64,7 @@ import org.apache.accumulo.core.trace.TraceUtil;
import org.apache.accumulo.core.util.AddressUtil;
import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.core.util.LocalityGroupUtil;
-import
org.apache.accumulo.core.util.LocalityGroupUtil.LocalityGroupConfigurationError;
+import
org.apache.accumulo.core.util.LocalityGroupUtil.LocalityGroupConfigurationException;
import org.apache.accumulo.core.util.Retry;
import org.apache.accumulo.core.util.compaction.ExternalCompactionUtil;
import org.apache.thrift.TException;
@@ -183,7 +183,7 @@ public class InstanceOperationsImpl implements
InstanceOperations {
if (LocalityGroupUtil.isLocalityGroupProperty(propChanged)) {
try {
LocalityGroupUtil.checkLocalityGroups(getSystemConfiguration());
- } catch (LocalityGroupConfigurationError | RuntimeException e) {
+ } catch (LocalityGroupConfigurationException | RuntimeException e) {
LoggerFactory.getLogger(this.getClass()).warn("Changing '" +
propChanged
+ "' resulted in bad locality group config. This may be a
transient situation since "
+ "the config spreads over multiple properties. Setting properties
in a different "
diff --git
a/core/src/main/java/org/apache/accumulo/core/clientImpl/NamespaceOperationsImpl.java
b/core/src/main/java/org/apache/accumulo/core/clientImpl/NamespaceOperationsImpl.java
index 392ba64bad..d58c6772b2 100644
---
a/core/src/main/java/org/apache/accumulo/core/clientImpl/NamespaceOperationsImpl.java
+++
b/core/src/main/java/org/apache/accumulo/core/clientImpl/NamespaceOperationsImpl.java
@@ -61,7 +61,7 @@ import org.apache.accumulo.core.manager.thrift.FateOperation;
import org.apache.accumulo.core.rpc.clients.ThriftClientTypes;
import org.apache.accumulo.core.trace.TraceUtil;
import org.apache.accumulo.core.util.LocalityGroupUtil;
-import
org.apache.accumulo.core.util.LocalityGroupUtil.LocalityGroupConfigurationError;
+import
org.apache.accumulo.core.util.LocalityGroupUtil.LocalityGroupConfigurationException;
import org.apache.accumulo.core.util.Retry;
import org.apache.accumulo.core.util.Timer;
import org.slf4j.Logger;
@@ -404,7 +404,7 @@ public class NamespaceOperationsImpl extends
NamespaceOperationsHelper {
Map<String,String> allProps = getConfiguration(namespace);
try {
LocalityGroupUtil.checkLocalityGroups(allProps);
- } catch (LocalityGroupConfigurationError | RuntimeException e) {
+ } catch (LocalityGroupConfigurationException | RuntimeException e) {
LoggerFactory.getLogger(this.getClass()).warn("Changing '" +
propChanged
+ "' for namespace '" + namespace
+ "'resulted in bad locality group config. This may be a transient
situation since the"
diff --git
a/core/src/main/java/org/apache/accumulo/core/clientImpl/TableOperationsImpl.java
b/core/src/main/java/org/apache/accumulo/core/clientImpl/TableOperationsImpl.java
index 38732fddf7..669a09570b 100644
---
a/core/src/main/java/org/apache/accumulo/core/clientImpl/TableOperationsImpl.java
+++
b/core/src/main/java/org/apache/accumulo/core/clientImpl/TableOperationsImpl.java
@@ -138,7 +138,7 @@ import
org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
import org.apache.accumulo.core.trace.TraceUtil;
import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.core.util.LocalityGroupUtil;
-import
org.apache.accumulo.core.util.LocalityGroupUtil.LocalityGroupConfigurationError;
+import
org.apache.accumulo.core.util.LocalityGroupUtil.LocalityGroupConfigurationException;
import org.apache.accumulo.core.util.MapCounter;
import org.apache.accumulo.core.util.Pair;
import org.apache.accumulo.core.util.Retry;
@@ -1107,7 +1107,7 @@ public class TableOperationsImpl extends
TableOperationsHelper {
Map<String,String> allProps = getConfiguration(tableName);
try {
LocalityGroupUtil.checkLocalityGroups(allProps);
- } catch (LocalityGroupConfigurationError | RuntimeException e) {
+ } catch (LocalityGroupConfigurationException | RuntimeException e) {
LoggerFactory.getLogger(this.getClass()).warn("Changing '" +
propChanged + "' for table '"
+ tableName
+ "' resulted in bad locality group config. This may be a
transient situation since "
diff --git
a/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java
b/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java
index 60bb1ef2e8..4fdb0b6003 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java
@@ -76,10 +76,10 @@ public class LocalityGroupUtil {
.collect(toUnmodifiableSet());
}
- public static class LocalityGroupConfigurationError extends
AccumuloException {
+ public static class LocalityGroupConfigurationException extends
AccumuloException {
private static final long serialVersionUID = 855450342044719186L;
- LocalityGroupConfigurationError(String why) {
+ LocalityGroupConfigurationException(String why) {
super(why);
}
}
@@ -90,7 +90,7 @@ public class LocalityGroupUtil {
}
public static void checkLocalityGroups(Map<String,String> config)
- throws LocalityGroupConfigurationError {
+ throws LocalityGroupConfigurationException {
ConfigurationCopy cc = new ConfigurationCopy(config);
if (cc.get(Property.TABLE_LOCALITY_GROUPS) != null) {
getLocalityGroups(cc);
@@ -101,7 +101,7 @@ public class LocalityGroupUtil {
getLocalityGroupsIgnoringErrors(AccumuloConfiguration acuconf, TableId
tableId) {
try {
return getLocalityGroups(acuconf);
- } catch (LocalityGroupConfigurationError | RuntimeException e) {
+ } catch (LocalityGroupConfigurationException | RuntimeException e) {
log.warn("Failed to get locality group config for tableId:" + tableId
+ ", proceeding without locality groups.", e);
}
@@ -110,7 +110,7 @@ public class LocalityGroupUtil {
}
public static Map<String,Set<ByteSequence>>
getLocalityGroups(AccumuloConfiguration acuconf)
- throws LocalityGroupConfigurationError {
+ throws LocalityGroupConfigurationException {
Map<String,Set<ByteSequence>> result = new HashMap<>();
String[] groups = acuconf.get(Property.TABLE_LOCALITY_GROUPS).split(",");
for (String group : groups) {
@@ -132,8 +132,8 @@ public class LocalityGroupUtil {
Set<ByteSequence> colFamsSet = decodeColumnFamilies(value);
if (!Collections.disjoint(all, colFamsSet)) {
colFamsSet.retainAll(all);
- throw new LocalityGroupConfigurationError("Column families " +
colFamsSet + " in group "
- + group + " is already used by another locality group");
+ throw new LocalityGroupConfigurationException("Column families " +
colFamsSet
+ + " in group " + group + " is already used by another locality
group");
}
all.addAll(colFamsSet);
@@ -145,7 +145,7 @@ public class LocalityGroupUtil {
Set<Entry<String,Set<ByteSequence>>> es = result.entrySet();
for (Entry<String,Set<ByteSequence>> entry : es) {
if (entry.getValue().isEmpty()) {
- throw new LocalityGroupConfigurationError(
+ throw new LocalityGroupConfigurationException(
"Locality group " + entry.getKey() + " specified but not
declared");
}
}
@@ -155,7 +155,7 @@ public class LocalityGroupUtil {
}
public static Set<ByteSequence> decodeColumnFamilies(String colFams)
- throws LocalityGroupConfigurationError {
+ throws LocalityGroupConfigurationException {
HashSet<ByteSequence> colFamsSet = new HashSet<>();
for (String family : colFams.split(",")) {
@@ -167,7 +167,7 @@ public class LocalityGroupUtil {
}
public static ByteSequence decodeColumnFamily(String colFam)
- throws LocalityGroupConfigurationError {
+ throws LocalityGroupConfigurationException {
byte[] output = new byte[colFam.length()];
int pos = 0;
@@ -179,7 +179,8 @@ public class LocalityGroupUtil {
i++;
if (i >= colFam.length()) {
- throw new LocalityGroupConfigurationError("Expected 'x' or '\' after
'\' in " + colFam);
+ throw new LocalityGroupConfigurationException(
+ "Expected 'x' or '\' after '\' in " + colFam);
}
char nc = colFam.charAt(i);
@@ -195,7 +196,7 @@ public class LocalityGroupUtil {
i++;
break;
default:
- throw new LocalityGroupConfigurationError(
+ throw new LocalityGroupConfigurationException(
"Expected 'x' or '\' after '\' in " + colFam);
}
} else {
diff --git
a/core/src/test/java/org/apache/accumulo/core/util/LocalityGroupUtilTest.java
b/core/src/test/java/org/apache/accumulo/core/util/LocalityGroupUtilTest.java
index 5203f1b697..13b0c3ad77 100644
---
a/core/src/test/java/org/apache/accumulo/core/util/LocalityGroupUtilTest.java
+++
b/core/src/test/java/org/apache/accumulo/core/util/LocalityGroupUtilTest.java
@@ -31,7 +31,7 @@ import java.util.Set;
import org.apache.accumulo.core.conf.ConfigurationCopy;
import org.apache.accumulo.core.data.ArrayByteSequence;
import org.apache.accumulo.core.data.ByteSequence;
-import
org.apache.accumulo.core.util.LocalityGroupUtil.LocalityGroupConfigurationError;
+import
org.apache.accumulo.core.util.LocalityGroupUtil.LocalityGroupConfigurationException;
import org.apache.hadoop.io.Text;
import org.junit.jupiter.api.Test;
@@ -49,13 +49,13 @@ public class LocalityGroupUtilTest {
assertNotNull(groups.get("lg1"));
assertEquals(2, groups.get("lg1").size());
assertTrue(groups.get("lg1").contains(new ArrayByteSequence("cf1")));
- } catch (LocalityGroupConfigurationError err) {
+ } catch (LocalityGroupConfigurationException err) {
fail();
}
conf.set("table.group.lg2", "cf1");
conf.set("table.groups.enabled", "lg1,lg2");
- assertThrows(LocalityGroupConfigurationError.class,
+ assertThrows(LocalityGroupConfigurationException.class,
() -> LocalityGroupUtil.getLocalityGroups(conf));
}
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/compaction/FileCompactor.java
b/server/base/src/main/java/org/apache/accumulo/server/compaction/FileCompactor.java
index e058db5ac8..1045d13680 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/compaction/FileCompactor.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/compaction/FileCompactor.java
@@ -70,7 +70,7 @@ import org.apache.accumulo.core.spi.crypto.CryptoService;
import org.apache.accumulo.core.tabletserver.thrift.TCompactionReason;
import org.apache.accumulo.core.trace.TraceUtil;
import org.apache.accumulo.core.util.LocalityGroupUtil;
-import
org.apache.accumulo.core.util.LocalityGroupUtil.LocalityGroupConfigurationError;
+import
org.apache.accumulo.core.util.LocalityGroupUtil.LocalityGroupConfigurationException;
import org.apache.accumulo.core.util.ratelimit.RateLimiter;
import org.apache.accumulo.server.ServerContext;
import org.apache.accumulo.server.fs.VolumeManager;
@@ -302,7 +302,7 @@ public class FileCompactor implements
Callable<CompactionStats> {
throws IOException {
try {
return LocalityGroupUtil.getLocalityGroups(acuTableConf);
- } catch (LocalityGroupConfigurationError e) {
+ } catch (LocalityGroupConfigurationException e) {
throw new IOException(e);
}
}
