This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch elasticity in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 03caeb01ff135c36cbc10b701d1aef7dd2e6dba4 Merge: 4385344c9b 6eae7831fb Author: Christopher Tubbs <[email protected]> AuthorDate: Thu Jul 25 00:46:30 2024 -0400 Merge branch 'main' into elasticity .../main/java/org/apache/accumulo/core/conf/Property.java | 15 ++++----------- .../java/org/apache/accumulo/server/rpc/TServerUtils.java | 9 ++------- .../org/apache/accumulo/server/rpc/TServerUtilsTest.java | 3 +-- .../java/org/apache/accumulo/compactor/Compactor.java | 6 +----- .../org/apache/accumulo/gc/SimpleGarbageCollector.java | 2 +- .../main/java/org/apache/accumulo/manager/Manager.java | 3 +-- .../main/java/org/apache/accumulo/tserver/ScanServer.java | 5 +---- .../java/org/apache/accumulo/tserver/TabletServer.java | 8 +++----- .../accumulo/test/functional/ThriftMaxFrameSizeIT.java | 3 +-- 9 files changed, 15 insertions(+), 39 deletions(-) diff --cc core/src/main/java/org/apache/accumulo/core/conf/Property.java index 560a2f2f76,647603b26f..ce425a8940 --- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java +++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java @@@ -1136,11 -1184,8 +1132,8 @@@ public enum Property COMPACTOR_THREADCHECK("compactor.threadcheck.time", "1s", PropertyType.TIMEDURATION, "The time between adjustments of the server thread pool.", "2.1.0"), @Experimental - COMPACTOR_MAX_MESSAGE_SIZE("compactor.message.size.max", "10M", PropertyType.BYTES, - "The maximum size of a message that can be sent to a tablet server.", "2.1.0"), - @Experimental - COMPACTOR_QUEUE_NAME("compactor.queue", "", PropertyType.STRING, - "The queue for which this Compactor will perform compactions.", "3.0.0"), + COMPACTOR_GROUP_NAME("compactor.group", Constants.DEFAULT_RESOURCE_GROUP_NAME, + PropertyType.STRING, "Resource group name for this Compactor.", "3.0.0"), // CompactionCoordinator properties @Experimental COMPACTION_COORDINATOR_PREFIX("compaction.coordinator.", null, PropertyType.PREFIX, diff --cc server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java index 9e34947cf3,1af688515c..bf54437d73 --- a/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java +++ b/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java @@@ -332,12 -318,9 +332,9 @@@ public class Compactor extends Abstract */ protected ServerAddress startCompactorClientService() throws UnknownHostException { - ClientServiceHandler clientHandler = - new ClientServiceHandler(getContext(), new TransactionWatcher(getContext())); - var processor = ThriftProcessorTypes.getCompactorTProcessor(clientHandler, this, getContext()); + ClientServiceHandler clientHandler = new ClientServiceHandler(getContext()); + var processor = ThriftProcessorTypes.getCompactorTProcessor(clientHandler, + getCompactorThriftHandlerInterface(), getContext()); - Property maxMessageSizeProperty = - (getConfiguration().get(Property.COMPACTOR_MAX_MESSAGE_SIZE) != null - ? Property.COMPACTOR_MAX_MESSAGE_SIZE : Property.GENERAL_MAX_MESSAGE_SIZE); ServerAddress sp = TServerUtils.startServer(getContext(), getHostname(), Property.COMPACTOR_CLIENTPORT, processor, this.getClass().getSimpleName(), "Thrift Client Server", Property.COMPACTOR_PORTSEARCH, Property.COMPACTOR_MINTHREADS, diff --cc test/src/main/java/org/apache/accumulo/test/functional/ThriftMaxFrameSizeIT.java index d8ae2d2022,faf15ce6d6..773a18b84f --- a/test/src/main/java/org/apache/accumulo/test/functional/ThriftMaxFrameSizeIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ThriftMaxFrameSizeIT.java @@@ -89,11 -89,10 +89,10 @@@ public class ThriftMaxFrameSizeIT @Override public void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) { - cfg.setNumTservers(1); + cfg.getClusterServerConfiguration().setNumDefaultTabletServers(1); cfg.setProperty(Property.GENERAL_RPC_SERVER_TYPE, serverType.name()); String maxFrameSizeStr = Integer.toString(CONFIGURED_MAX_FRAME_SIZE); - cfg.setProperty(Property.GENERAL_MAX_MESSAGE_SIZE, maxFrameSizeStr); - cfg.setProperty(Property.TSERV_MAX_MESSAGE_SIZE, maxFrameSizeStr); + cfg.setProperty(Property.RPC_MAX_MESSAGE_SIZE, maxFrameSizeStr); if (serverType == ThriftServerType.SSL) { configureForSsl(cfg, getSslDir(createTestDir(this.getClass().getName() + "_" + this.testName())));
