Renamed LocalityGroupConfigurationError to LocalityGroupConfigurationException (#6422)

Related to #3395

Author: dlmarion

core/src/main/java/org/apache/accumulo/core/client/admin/NewTableConfiguration.java

@@ -46,7 +46,7 @@
 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 NewTableConfiguration setProperties(Map<String,String> props) {
 
     try {
       LocalityGroupUtil.checkLocalityGroups(props);
-    } catch (LocalityGroupConfigurationError e) {
+    } catch (LocalityGroupConfigurationException e) {
       throw new IllegalArgumentException(e);
     }
 

core/src/main/java/org/apache/accumulo/core/clientImpl/InstanceOperationsImpl.java

@@ -64,7 +64,7 @@
 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 @@ private void checkLocalityGroups(String propChanged)
     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 "

core/src/main/java/org/apache/accumulo/core/clientImpl/NamespaceOperationsImpl.java

@@ -61,7 +61,7 @@
 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 @@ private void checkLocalityGroups(String namespace, String propChanged)
       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"

core/src/main/java/org/apache/accumulo/core/clientImpl/TableOperationsImpl.java

@@ -138,7 +138,7 @@
 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 @@ void checkLocalityGroups(String tableName, String propChanged)
       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 "

core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java

@@ -76,10 +76,10 @@ public static Set<ByteSequence> families(Collection<Column> columns) {
         .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 static boolean isLocalityGroupProperty(String prop) {
   }
 
   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 static void checkLocalityGroups(Map<String,String> config)
       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 static void checkLocalityGroups(Map<String,String> config)
   }
 
   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 static Map<String,Set<ByteSequence>> getLocalityGroups(AccumuloConfigurat
           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 static Map<String,Set<ByteSequence>> getLocalityGroups(AccumuloConfigurat
     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 static Map<String,Set<ByteSequence>> getLocalityGroups(AccumuloConfigurat
   }
 
   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 static Set<ByteSequence> decodeColumnFamilies(String colFams)
   }
 
   public static ByteSequence decodeColumnFamily(String colFam)
-      throws LocalityGroupConfigurationError {
+      throws LocalityGroupConfigurationException {
     byte[] output = new byte[colFam.length()];
     int pos = 0;
 
@@ -179,7 +179,8 @@ public static ByteSequence decodeColumnFamily(String colFam)
         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 static ByteSequence decodeColumnFamily(String colFam)
             i++;
             break;
           default:
-            throw new LocalityGroupConfigurationError(
+            throw new LocalityGroupConfigurationException(
                 "Expected 'x' or '\' after '\'  in " + colFam);
         }
       } else {

core/src/test/java/org/apache/accumulo/core/util/LocalityGroupUtilTest.java

@@ -31,7 +31,7 @@
 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 void testColumnFamilySet() {
       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));
   }
 

server/base/src/main/java/org/apache/accumulo/server/compaction/FileCompactor.java

@@ -70,7 +70,7 @@
 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 @@ protected Map<String,Set<ByteSequence>> getLocalityGroups(AccumuloConfiguration
       throws IOException {
     try {
       return LocalityGroupUtil.getLocalityGroups(acuTableConf);
-    } catch (LocalityGroupConfigurationError e) {
+    } catch (LocalityGroupConfigurationException e) {
       throw new IOException(e);
     }
   }