[accumulo] branch main updated: Rename new property for better sorting (#2604)

[mmiller]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 26cb8ef487 Rename new property for better sorting (#2604)
26cb8ef487 is described below

commit 26cb8ef487c1a42dc39f89f011a1667938204c98
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Mon Apr 4 08:38:04 2022 -0400

    Rename new property for better sorting (#2604)
---
 core/src/main/java/org/apache/accumulo/core/conf/Property.java     | 7 ++++---
 .../main/java/org/apache/accumulo/tserver/ThriftClientHandler.java | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/org/apache/accumulo/core/conf/Property.java 
b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
index e822ea7b0c..9ca2fdc87a 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@ -395,9 +395,6 @@ public enum Property {
       "Properties in this category affect the behavior of the tablet servers", 
"1.3.5"),
   TSERV_CLIENT_TIMEOUT("tserver.client.timeout", "3s", 
PropertyType.TIMEDURATION,
       "Time to wait for clients to continue scans before closing a session.", 
"1.3.5"),
-  TSERV_MAX_SCAN_RESULT_TIMEOUT("tserver.max.scan.result.timeout", "1s", 
PropertyType.TIMEDURATION,
-      "Max time for the thrift client handler to wait for scan results before 
timing out.",
-      "2.1.0"),
   TSERV_DEFAULT_BLOCKSIZE("tserver.default.blocksize", "1M", 
PropertyType.BYTES,
       "Specifies a default blocksize for the tserver caches", "1.3.5"),
   TSERV_CACHE_MANAGER_IMPL("tserver.cache.manager.class",
@@ -540,6 +537,10 @@ public enum Property {
       "2.0.0"),
   TSERV_SCAN_EXECUTORS_META_THREADS("tserver.scan.executors.meta.threads", 
"8", PropertyType.COUNT,
       "The number of threads for the metadata table scan executor.", "2.0.0"),
+  TSERV_SCAN_RESULTS_MAX_TIMEOUT("tserver.scan.results.max.timeout", "1s",
+      PropertyType.TIMEDURATION,
+      "Max time for the thrift client handler to wait for scan results before 
timing out.",
+      "2.1.0"),
   TSERV_MIGRATE_MAXCONCURRENT("tserver.migrations.concurrent.max", "1", 
PropertyType.COUNT,
       "The maximum number of concurrent tablet migrations for a tablet 
server", "1.3.5"),
   TSERV_MAJC_DELAY("tserver.compaction.major.delay", "30s", 
PropertyType.TIMEDURATION,
diff --git 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/ThriftClientHandler.java
 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/ThriftClientHandler.java
index 5264991ffd..9802e0c99c 100644
--- 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/ThriftClientHandler.java
+++ 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/ThriftClientHandler.java
@@ -175,7 +175,7 @@ public class ThriftClientHandler extends 
ClientServiceHandler implements TabletC
     super(server.getContext(), new TransactionWatcher(server.getContext()));
     this.server = server;
     MAX_TIME_TO_WAIT_FOR_SCAN_RESULT_MILLIS = 
server.getContext().getConfiguration()
-        .getTimeInMillis(Property.TSERV_MAX_SCAN_RESULT_TIMEOUT);
+        .getTimeInMillis(Property.TSERV_SCAN_RESULTS_MAX_TIMEOUT);
     log.debug("{} created", ThriftClientHandler.class.getName());
   }