This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 59707d6002b37defbbf29c536ab1af054627102c
Merge: 3409d958bb 11824cf7a5
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Thu Sep 14 17:13:03 2023 -0400
Merge branch '2.1'
.../accumulo/core/conf/AccumuloConfiguration.java | 4 +
.../org/apache/accumulo/core/conf/Property.java | 5 +
.../apache/accumulo/server/rpc/TServerUtils.java | 63 +++--
.../AccumuloConfigurationIsPropertySetTest.java | 302 +++++++++++++++++++++
.../apache/accumulo/gc/SimpleGarbageCollector.java | 3 +-
.../accumulo/test/functional/ZombieTServer.java | 10 +-
.../accumulo/test/performance/NullTserver.java | 3 +-
7 files changed, 360 insertions(+), 30 deletions(-)
diff --cc
core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
index f1131894b5,636b18db68..8a6e48ba86
---
a/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
+++
b/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
@@@ -424,8 -430,49 +424,12 @@@ public abstract class AccumuloConfigura
}
}
+ /**
+ * @param prop Property to check
+ * @return true if the given property has explicitly been set by a user,
false otherwise
+ */
public abstract boolean isPropertySet(Property prop);
- // deprecation property warning could get spammy in tserver so only warn
once
- boolean depPropWarned = false;
-
- @SuppressWarnings("deprecation")
- Integer getDeprecatedScanThreads(String name, boolean isScanServer) {
-
- Property prop;
- Property deprecatedProp;
-
- if (name.equals(SimpleScanDispatcher.DEFAULT_SCAN_EXECUTOR_NAME)) {
- prop = isScanServer ? Property.SSERV_SCAN_EXECUTORS_DEFAULT_THREADS
- : Property.TSERV_SCAN_EXECUTORS_DEFAULT_THREADS;
- deprecatedProp = Property.TSERV_READ_AHEAD_MAXCONCURRENT;
- } else if (name.equals("meta")) {
- prop = isScanServer ? Property.SSERV_SCAN_EXECUTORS_META_THREADS
- : Property.TSERV_SCAN_EXECUTORS_META_THREADS;
- deprecatedProp = Property.TSERV_METADATA_READ_AHEAD_MAXCONCURRENT;
- } else {
- return null;
- }
-
- if (!isPropertySet(prop) && isPropertySet(deprecatedProp)) {
- if (!depPropWarned) {
- depPropWarned = true;
- log.warn("Property {} is deprecated, use {} instead.",
deprecatedProp.getKey(),
- prop.getKey());
- }
- return Integer.valueOf(get(deprecatedProp));
- } else if (isPropertySet(prop) && isPropertySet(deprecatedProp) &&
!depPropWarned) {
- depPropWarned = true;
- log.warn("Deprecated property {} ignored because {} is set",
deprecatedProp.getKey(),
- prop.getKey());
- }
-
- return null;
- }
-
private static class RefCount<T> {
T obj;
long count;
diff --cc
test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
index 2a8d023685,61c3c24e7c..2a8abcfffb
--- a/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
@@@ -26,21 -27,24 +26,22 @@@ import java.util.UUID
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.clientImpl.thrift.ClientService;
+import org.apache.accumulo.core.clientImpl.thrift.TInfo;
+ import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.conf.SiteConfiguration;
-import org.apache.accumulo.core.fate.zookeeper.ServiceLock;
-import org.apache.accumulo.core.fate.zookeeper.ServiceLock.LockLossReason;
-import org.apache.accumulo.core.fate.zookeeper.ServiceLock.LockWatcher;
import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
import org.apache.accumulo.core.fate.zookeeper.ZooUtil.NodeExistsPolicy;
-import org.apache.accumulo.core.master.thrift.TabletServerStatus;
+import org.apache.accumulo.core.lock.ServiceLock;
+import org.apache.accumulo.core.lock.ServiceLock.LockLossReason;
+import org.apache.accumulo.core.lock.ServiceLock.LockWatcher;
+import org.apache.accumulo.core.lock.ServiceLockData;
+import org.apache.accumulo.core.lock.ServiceLockData.ThriftService;
+import org.apache.accumulo.core.manager.thrift.TabletServerStatus;
import org.apache.accumulo.core.rpc.clients.ThriftClientTypes;
import org.apache.accumulo.core.securityImpl.thrift.TCredentials;
-import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
-import org.apache.accumulo.core.tabletserver.thrift.TabletScanClientService;
+import org.apache.accumulo.core.tabletscan.thrift.TabletScanClientService;
+import org.apache.accumulo.core.tabletserver.thrift.TabletServerClientService;
import org.apache.accumulo.core.trace.TraceUtil;
-import org.apache.accumulo.core.trace.thrift.TInfo;
-import org.apache.accumulo.core.util.HostAndPort;
-import org.apache.accumulo.core.util.ServerServices;
-import org.apache.accumulo.core.util.ServerServices.Service;
import org.apache.accumulo.core.util.threads.ThreadPools;
import org.apache.accumulo.server.ServerContext;
import org.apache.accumulo.server.client.ClientServiceHandler;
@@@ -117,16 -114,18 +118,17 @@@ public class ZombieTServer
ThriftProcessorTypes.CLIENT.getTProcessor(ClientService.Processor.class,
ClientService.Iface.class, csh, context));
muxProcessor.registerProcessor(ThriftClientTypes.TABLET_SERVER.getServiceName(),
-
ThriftProcessorTypes.TABLET_SERVER.getTProcessor(TabletClientService.Processor.class,
- TabletClientService.Iface.class, tch, context));
-
muxProcessor.registerProcessor(ThriftProcessorTypes.TABLET_SERVER_SCAN.getServiceName(),
- ThriftProcessorTypes.TABLET_SERVER_SCAN.getTProcessor(
- TabletScanClientService.Processor.class,
TabletScanClientService.Iface.class, tch,
- context));
+
ThriftProcessorTypes.TABLET_SERVER.getTProcessor(TabletServerClientService.Processor.class,
+ TabletServerClientService.Iface.class, tch, context));
+
muxProcessor.registerProcessor(ThriftProcessorTypes.TABLET_SCAN.getServiceName(),
+
ThriftProcessorTypes.TABLET_SCAN.getTProcessor(TabletScanClientService.Processor.class,
+ TabletScanClientService.Iface.class, tch, context));
- ServerAddress serverPort =
- TServerUtils.startTServer(context.getConfiguration(),
ThriftServerType.CUSTOM_HS_HA,
- muxProcessor, "ZombieTServer", "walking dead", 2,
ThreadPools.DEFAULT_TIMEOUT_MILLISECS,
- 1000, 10 * 1024 * 1024, null, null, -1,
HostAndPort.fromParts("0.0.0.0", port));
+ ServerAddress serverPort =
TServerUtils.startTServer(context.getConfiguration(),
+ ThriftServerType.CUSTOM_HS_HA, muxProcessor, "ZombieTServer",
"walking dead", 2,
+ ThreadPools.DEFAULT_TIMEOUT_MILLISECS, 1000, 10 * 1024 * 1024, null,
null, -1,
+ context.getConfiguration().getCount(Property.RPC_BACKLOG),
+ HostAndPort.fromParts("0.0.0.0", port));
String addressString = serverPort.address.toString();
var zLockPath =
