Replace nonpublic Accumulo SingletonReservation with suggested altern…

…ative (#2527) * Replace SingletonReservation.noop() with SingletonManager.getClientReservation() --------- Co-authored-by: Ivan Bella <ivan@bella.name>
NationalSecurityAgency · Oct 21, 2024 · 9587b6c · 9587b6c
1 parent ddd9be0
commit 9587b6c
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/warehouse/core/src/main/java/datawave/mr/bulk/BulkInputFormat.java b/warehouse/core/src/main/java/datawave/mr/bulk/BulkInputFormat.java
@@ -56,7 +56,7 @@
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.core.security.ColumnVisibility;
 import org.apache.accumulo.core.security.TablePermission;
-import org.apache.accumulo.core.singletons.SingletonReservation;
+import org.apache.accumulo.core.singletons.SingletonManager;
 import org.apache.accumulo.core.util.Pair;
 import org.apache.accumulo.core.util.format.DateFormatSupplier;
 import org.apache.accumulo.core.util.format.DefaultFormatter;
@@ -1091,7 +1091,8 @@ protected static TabletLocator getTabletLocator(Configuration conf) throws Table
         Properties props = Accumulo.newClientProperties().to(conf.get(INSTANCE_NAME), conf.get(ZOOKEEPERS))
                         .as(getUsername(conf), new PasswordToken(getPassword(conf))).build();
         ClientInfo info = ClientInfo.from(props);
-        ClientContext context = new ClientContext(SingletonReservation.noop(), info, ClientConfConverter.toAccumuloConf(info.getProperties()), Threads.UEH);
+        ClientContext context = new ClientContext(SingletonManager.getClientReservation(), info, ClientConfConverter.toAccumuloConf(info.getProperties()),
+                        Threads.UEH);
         return TabletLocator.getLocator(context, context.getTableId(tableName));
     }
 
@@ -1132,8 +1133,8 @@ public List<InputSplit> getSplits(JobContext job) throws IOException {
                     // its possible that the cache could contain complete, but old information about a tables tablets... so clear it
                     tl.invalidateCache();
                     ClientInfo info = ClientInfo.from(cbHelper.newClientProperties());
-                    ClientContext context = new ClientContext(SingletonReservation.noop(), info, ClientConfConverter.toAccumuloConf(info.getProperties()),
-                                    Threads.UEH);
+                    ClientContext context = new ClientContext(SingletonManager.getClientReservation(), info,
+                                    ClientConfConverter.toAccumuloConf(info.getProperties()), Threads.UEH);
                     while (!tl.binRanges(context, ranges, binnedRanges).isEmpty()) {
                         if (!(client instanceof InMemoryAccumuloClient)) {
                             if (tableId == null)