(accumulo) 01/01: Merge branch 'main' into elasticity

[kturner]

This is an automated email from the ASF dual-hosted git repository.

kturner pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit cb097aee5f36fb91f04c09db084595ef624cd2c8
Merge: 0386506c1d b912506d43
Author: Keith Turner <ktur...@apache.org>
AuthorDate: Fri Apr 5 15:19:05 2024 -0400

    Merge branch 'main' into elasticity

 .../org/apache/accumulo/tserver/AssignmentHandler.java   |  6 +-----
 .../java/org/apache/accumulo/tserver/TabletServer.java   | 16 ++++++++--------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --cc 
server/tserver/src/main/java/org/apache/accumulo/tserver/AssignmentHandler.java
index cef355cbf1,552d9f40a9..ec56611a03
--- 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/AssignmentHandler.java
+++ 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/AssignmentHandler.java
@@@ -131,13 -156,12 +131,11 @@@ class AssignmentHandler implements Runn
      Tablet tablet = null;
      boolean successful = false;
  
-     try {
-       server.acquireRecoveryMemory(extent);
- 
+     try (var recoveryMemory = server.acquireRecoveryMemory(tabletMetadata)) {
        TabletResourceManager trm = 
server.resourceManager.createTabletResourceManager(extent,
            server.getTableConfiguration(extent));
 -      TabletData data = new TabletData(tabletMetadata);
  
 -      tablet = new Tablet(server, extent, trm, data);
 +      tablet = new Tablet(server, extent, trm, tabletMetadata);
        // If a minor compaction starts after a tablet opens, this indicates a 
log recovery
        // occurred. This recovered data must be minor compacted.
        // There are three reasons to wait for this minor compaction to finish 
before placing the
diff --cc 
server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index 63fcbd4c5b,678b1294c5..026c904ca2
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@@ -87,7 -91,8 +87,8 @@@ import org.apache.accumulo.core.manager
  import org.apache.accumulo.core.manager.thrift.TabletServerStatus;
  import org.apache.accumulo.core.metadata.AccumuloTable;
  import org.apache.accumulo.core.metadata.TServerInstance;
 +import org.apache.accumulo.core.metadata.schema.Ample.TabletsMutator;
+ import org.apache.accumulo.core.metadata.schema.TabletMetadata;
 -import org.apache.accumulo.core.metadata.schema.TabletsMetadata;
  import org.apache.accumulo.core.metrics.MetricsUtil;
  import org.apache.accumulo.core.rpc.ThriftUtil;
  import org.apache.accumulo.core.rpc.clients.ThriftClientTypes;