This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 05fe0713f778e15be08c1ae16ddd8136970bc446
Merge: 816095d2d8 19a4ebc030
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Wed Jan 8 15:10:49 2025 +0000
Merge branch '3.1'
.../main/java/org/apache/accumulo/core/conf/Property.java | 8 ++++----
.../blockfile/cache/impl/BlockCacheManagerFactory.java | 4 ++--
.../core/file/blockfile/cache/BlockCacheFactoryTest.java | 4 ++--
.../core/file/blockfile/cache/TestLruBlockCache.java | 14 +++++++-------
.../apache/accumulo/core/file/rfile/AbstractRFileTest.java | 2 +-
.../org/apache/accumulo/core/file/rfile/RFileTest.java | 2 +-
6 files changed, 17 insertions(+), 17 deletions(-)
diff --cc core/src/main/java/org/apache/accumulo/core/conf/Property.java
index 1882b2a3d8,92ce7812bb..80d8cd92b8
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@@ -554,9 -517,11 +557,6 @@@ public enum Property
"Time to wait for clients to continue scans before closing a session.",
"1.3.5"),
TSERV_DEFAULT_BLOCKSIZE("tserver.default.blocksize", "1M",
PropertyType.BYTES,
"Specifies a default blocksize for the tserver caches.", "1.3.5"),
- @Deprecated(since = "2.1.4")
- @ReplacedBy(property = Property.GENERAL_CACHE_MANAGER_IMPL)
-- TSERV_CACHE_MANAGER_IMPL("tserver.cache.manager.class",
TinyLfuBlockCacheManager.class.getName(),
-- PropertyType.STRING, "Specifies the class name of the block cache
factory implementation.",
-- "2.0.0"),
TSERV_DATACACHE_SIZE("tserver.cache.data.size", "10%", PropertyType.MEMORY,
"Specifies the size of the cache for RFile data blocks.", "1.3.5"),
TSERV_INDEXCACHE_SIZE("tserver.cache.index.size", "25%",
PropertyType.MEMORY,
@@@ -1453,12 -1539,10 +1453,12 @@@
// max message options
RPC_MAX_MESSAGE_SIZE,
+ // compaction coordiantor properties
+ MANAGER_COMPACTION_SERVICE_PRIORITY_QUEUE_INITIAL_SIZE,
+
// block cache options
- TSERV_CACHE_MANAGER_IMPL, TSERV_DATACACHE_SIZE, TSERV_INDEXCACHE_SIZE,
- GENERAL_CACHE_MANAGER_IMPL, TSERV_CACHE_MANAGER_IMPL,
TSERV_DATACACHE_SIZE,
- TSERV_INDEXCACHE_SIZE, TSERV_SUMMARYCACHE_SIZE, SSERV_DATACACHE_SIZE,
SSERV_INDEXCACHE_SIZE,
- SSERV_SUMMARYCACHE_SIZE,
++ GENERAL_CACHE_MANAGER_IMPL, TSERV_DATACACHE_SIZE, TSERV_INDEXCACHE_SIZE,
+ TSERV_SUMMARYCACHE_SIZE, SSERV_DATACACHE_SIZE, SSERV_INDEXCACHE_SIZE,
SSERV_SUMMARYCACHE_SIZE,
// blocksize options
TSERV_DEFAULT_BLOCKSIZE, SSERV_DEFAULT_BLOCKSIZE,
diff --cc
core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/impl/BlockCacheManagerFactory.java
index 655b7b3ad6,d0b34164e5..7475ab8a69
---
a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/impl/BlockCacheManagerFactory.java
+++
b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/impl/BlockCacheManagerFactory.java
@@@ -39,7 -39,10 +39,7 @@@ public class BlockCacheManagerFactory
*/
public static synchronized BlockCacheManager
getInstance(AccumuloConfiguration conf)
throws ReflectiveOperationException {
- String impl = conf.get(Property.TSERV_CACHE_MANAGER_IMPL);
- @SuppressWarnings("deprecation")
- var cacheManagerProp =
- conf.resolve(Property.GENERAL_CACHE_MANAGER_IMPL,
Property.TSERV_CACHE_MANAGER_IMPL);
- String impl = conf.get(cacheManagerProp);
++ String impl = conf.get(Property.GENERAL_CACHE_MANAGER_IMPL);
Class<? extends BlockCacheManager> clazz =
ClassLoaderUtil.loadClass(impl, BlockCacheManager.class);
LOG.info("Created new block cache manager of type: {}",
clazz.getSimpleName());
@@@ -55,7 -58,10 +55,7 @@@
*/
public static synchronized BlockCacheManager
getClientInstance(AccumuloConfiguration conf)
throws ReflectiveOperationException {
- String impl = conf.get(Property.TSERV_CACHE_MANAGER_IMPL);
- @SuppressWarnings("deprecation")
- var cacheManagerProp =
- conf.resolve(Property.GENERAL_CACHE_MANAGER_IMPL,
Property.TSERV_CACHE_MANAGER_IMPL);
- String impl = conf.get(cacheManagerProp);
++ String impl = conf.get(Property.GENERAL_CACHE_MANAGER_IMPL);
Class<? extends BlockCacheManager> clazz =
Class.forName(impl).asSubclass(BlockCacheManager.class);
LOG.info("Created new block cache factory of type: {}",
clazz.getSimpleName());
