This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 4d5ec236ea Remove json prettyPrint from RootGcCandidates (#2681)
add 1601dde98f Remove isPropertySet option for caching
add 0e681c6eb3 Improve getting parent from AccumuloConfiguration
add 1cc056c37f Include classloader context in log message
add 4c0ad3c24e Minor enhancements to ZK utilities
add 47de895084 Single node prop store (#2569)
new 2d93f430c8 Merge branch 'single-node-props'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../accumulo/core/conf/AccumuloConfiguration.java | 23 +-
.../accumulo/core/conf/ConfigurationCopy.java | 2 +-
.../core/conf/ConfigurationTypeHelper.java | 2 +-
.../accumulo/core/conf/DefaultConfiguration.java | 2 +-
.../org/apache/accumulo/core/conf/Property.java | 2 +-
.../accumulo/core/conf/SiteConfiguration.java | 9 +-
.../accumulo/core/metrics/MetricsProducer.java | 43 ++
.../accumulo/core/util/ConfigurationImpl.java | 2 +-
.../util/compaction/CompactionServicesConfig.java | 11 +-
.../apache/accumulo/fate/zookeeper/ZooReader.java | 15 +
.../accumulo/fate/zookeeper/ZooReaderWriter.java | 56 +-
.../apache/accumulo/fate/zookeeper/ZooUtil.java | 38 ++
.../core/conf/AccumuloConfigurationTest.java | 2 +-
.../apache/accumulo/core/conf/PropertyTest.java | 9 +
server/base/pom.xml | 8 +
.../org/apache/accumulo/server/ServerContext.java | 34 +-
.../server/conf/NamespaceConfiguration.java | 128 ++--
.../server/conf/RuntimeFixedProperties.java | 106 ++++
.../server/conf/ServerConfigurationFactory.java | 24 +-
.../accumulo/server/conf/SystemConfiguration.java | 66 ++
.../accumulo/server/conf/TableConfiguration.java | 119 +---
.../server/conf/ZooBasedConfiguration.java | 164 +++++
.../server/conf/ZooCachePropertyAccessor.java | 172 ------
.../accumulo/server/conf/ZooConfiguration.java | 150 -----
.../server/conf/codec/VersionedPropCodec.java | 92 ++-
.../server/conf/codec/VersionedPropGzipCodec.java | 2 +-
.../server/conf/codec/VersionedProperties.java | 32 +-
.../server/conf/store/NamespacePropKey.java | 65 ++
.../accumulo/server/conf/store/PropCache.java | 24 +-
.../accumulo/server/conf/store/PropCacheKey.java | 141 +++++
.../server/conf/store/PropChangeListener.java | 29 +-
.../accumulo/server/conf/store/PropStore.java | 117 ++++
.../accumulo/server/conf/store/SystemPropKey.java | 56 ++
.../accumulo/server/conf/store/TablePropKey.java | 59 ++
.../conf/store/impl/PropCacheCaffeineImpl.java | 142 +++++
.../server/conf/store/impl/PropStoreEventTask.java | 110 ++++
.../server/conf/store/impl/PropStoreMetrics.java | 92 +++
.../server/conf/store/impl/PropStoreWatcher.java | 252 ++++++++
.../server/conf/store/impl/ReadyMonitor.java | 143 +++++
.../server/conf/store/impl/ZooPropLoader.java | 157 +++++
.../server/conf/store/impl/ZooPropStore.java | 390 ++++++++++++
.../server/conf/util/ConfigPropertyUpgrader.java | 138 +++++
.../server/conf/util/ConfigTransformer.java | 395 ++++++++++++
.../accumulo/server/conf/util/PropSnapshot.java | 141 +++++
.../accumulo/server/conf/util/TransformToken.java | 209 +++++++
.../server/init/FileSystemInitializer.java | 35 +-
.../apache/accumulo/server/init/Initialize.java | 24 +-
.../accumulo/server/init/ZooKeeperInitializer.java | 82 ++-
.../accumulo/server/tables/TableManager.java | 59 +-
.../accumulo/server/util/NamespacePropUtil.java | 51 +-
.../org/apache/accumulo/server/util/PropUtil.java | 27 +-
.../accumulo/server/util/SystemPropUtil.java | 45 +-
.../apache/accumulo/server/util/TablePropUtil.java | 55 +-
.../apache/accumulo/server/MockServerContext.java | 13 +
.../server/conf/NamespaceConfigurationTest.java | 149 +++--
.../server/conf/RuntimeFixedPropertiesTest.java | 87 +++
.../conf/ServerConfigurationFactoryTest.java | 114 ++--
.../server/conf/SystemConfigurationTest.java | 141 +++++
.../server/conf/TableConfigurationTest.java | 276 +++++++--
.../server/conf/ZooBasedConfigurationTest.java | 347 +++++++++++
.../server/conf/ZooCachePropertyAccessorTest.java | 188 ------
.../server/conf/codec/VersionedPropCodecTest.java | 8 +-
.../conf/codec/VersionedPropEncryptCodec.java | 2 +-
.../conf/codec/VersionedPropEncryptCodecTest.java | 28 +-
.../conf/codec/VersionedPropGzipCodecTest.java | 28 +-
.../server/conf/codec/VersionedPropertiesTest.java | 39 +-
.../server/conf/store/PropCacheKeyTest.java | 125 ++++
.../conf/store/impl/PropCacheCaffeineImplTest.java | 223 +++++++
.../server/conf/store/impl/PropStoreEventTest.java | 318 ++++++++++
.../server/conf/store/impl/ReadyMonitorTest.java | 180 ++++++
.../server/conf/store/impl/ZooPropLoaderTest.java | 665 +++++++++++++++++++++
.../server/conf/store/impl/ZooPropStoreTest.java | 403 +++++++++++++
.../server/conf/util/PropSnapshotTest.java | 133 +++++
.../BaseHostRegexTableLoadBalancerTest.java | 39 +-
.../server/security/UserImpersonationTest.java | 5 +
.../manager/ManagerClientServiceHandler.java | 39 +-
.../manager/tableOps/create/PopulateZookeeper.java | 17 +-
.../create/PopulateZookeeperWithNamespace.java | 15 +-
.../tableImport/ImportPopulateZookeeper.java | 17 +-
.../accumulo/manager/upgrade/Upgrader9to10.java | 80 +--
.../tserver/TabletServerResourceManager.java | 1 -
.../accumulo/tserver/tablet/CompactableImpl.java | 2 +-
.../accumulo/tserver/tablet/CompactableUtils.java | 2 +-
test/pom.xml | 4 +
.../accumulo/test/TableConfigurationUpdateIT.java | 8 +-
.../accumulo/test/conf/PropStoreConfigIT.java | 67 +++
.../test/conf/store/PropCacheCaffeineImplZkIT.java | 180 ++++++
.../test/conf/store/PropStoreZooKeeperIT.java | 416 +++++++++++++
.../accumulo/test/conf/store/ZooBasedConfigIT.java | 394 ++++++++++++
.../test/conf/util/ConfigTransformerIT.java | 181 ++++++
.../accumulo/test/conf/util/LegacyPropData.java | 390 ++++++++++++
.../accumulo/test/conf/util/TransformTokenIT.java | 161 +++++
.../test/functional/WatchTheWatchCountIT.java | 5 +-
.../apache/accumulo/test/metrics/MetricsIT.java | 4 +-
.../apache/accumulo/test/shell/ShellServerIT.java | 20 +-
.../apache/accumulo/test/start/KeywordStartIT.java | 2 +
.../test/upgrade/ConfigPropertyUpgraderIT.java | 154 +++++
.../upgrade/DeprecatedPropertyUpgrade9to10IT.java | 67 ---
98 files changed, 8643 insertions(+), 1445 deletions(-)
create mode 100644
server/base/src/main/java/org/apache/accumulo/server/conf/RuntimeFixedProperties.java
create mode 100644
server/base/src/main/java/org/apache/accumulo/server/conf/SystemConfiguration.java
create mode 100644
server/base/src/main/java/org/apache/accumulo/server/conf/ZooBasedConfiguration.java
delete mode 100644
server/base/src/main/java/org/apache/accumulo/server/conf/ZooCachePropertyAccessor.java
delete mode 100644
server/base/src/main/java/org/apache/accumulo/server/conf/ZooConfiguration.java
create mode 100644
server/base/src/main/java/org/apache/accumulo/server/conf/store/NamespacePropKey.java
copy core/src/main/thrift/trace.thrift =>
server/base/src/main/java/org/apache/accumulo/server/conf/store/PropCache.java
(65%)
create mode 100644
server/base/src/main/java/org/apache/accumulo/server/conf/store/PropCacheKey.java
copy core/src/main/java/org/apache/accumulo/core/spi/common/Stats.java =>
server/base/src/main/java/org/apache/accumulo/server/conf/store/PropChangeListener.java
(55%)
create mode 100644
server/base/src/main/java/org/apache/accumulo/server/conf/store/PropStore.java
create mode 100644
server/base/src/main/java/org/apache/accumulo/server/conf/store/SystemPropKey.java
create mode 100644
server/base/src/main/java/org/apache/accumulo/server/conf/store/TablePropKey.java
create mode 100644
server/base/src/main/java/org/apache/accumulo/server/conf/store/impl/PropCacheCaffeineImpl.java
create mode 100644
server/base/src/main/java/org/apache/accumulo/server/conf/store/impl/PropStoreEventTask.java
create mode 100644
server/base/src/main/java/org/apache/accumulo/server/conf/store/impl/PropStoreMetrics.java
create mode 100644
server/base/src/main/java/org/apache/accumulo/server/conf/store/impl/PropStoreWatcher.java
create mode 100644
server/base/src/main/java/org/apache/accumulo/server/conf/store/impl/ReadyMonitor.java
create mode 100644
server/base/src/main/java/org/apache/accumulo/server/conf/store/impl/ZooPropLoader.java
create mode 100644
server/base/src/main/java/org/apache/accumulo/server/conf/store/impl/ZooPropStore.java
create mode 100644
server/base/src/main/java/org/apache/accumulo/server/conf/util/ConfigPropertyUpgrader.java
create mode 100644
server/base/src/main/java/org/apache/accumulo/server/conf/util/ConfigTransformer.java
create mode 100644
server/base/src/main/java/org/apache/accumulo/server/conf/util/PropSnapshot.java
create mode 100644
server/base/src/main/java/org/apache/accumulo/server/conf/util/TransformToken.java
copy
core/src/main/java/org/apache/accumulo/core/spi/compaction/CompactionServiceId.java
=> server/base/src/main/java/org/apache/accumulo/server/util/PropUtil.java
(63%)
create mode 100644
server/base/src/test/java/org/apache/accumulo/server/conf/RuntimeFixedPropertiesTest.java
create mode 100644
server/base/src/test/java/org/apache/accumulo/server/conf/SystemConfigurationTest.java
create mode 100644
server/base/src/test/java/org/apache/accumulo/server/conf/ZooBasedConfigurationTest.java
delete mode 100644
server/base/src/test/java/org/apache/accumulo/server/conf/ZooCachePropertyAccessorTest.java
create mode 100644
server/base/src/test/java/org/apache/accumulo/server/conf/store/PropCacheKeyTest.java
create mode 100644
server/base/src/test/java/org/apache/accumulo/server/conf/store/impl/PropCacheCaffeineImplTest.java
create mode 100644
server/base/src/test/java/org/apache/accumulo/server/conf/store/impl/PropStoreEventTest.java
create mode 100644
server/base/src/test/java/org/apache/accumulo/server/conf/store/impl/ReadyMonitorTest.java
create mode 100644
server/base/src/test/java/org/apache/accumulo/server/conf/store/impl/ZooPropLoaderTest.java
create mode 100644
server/base/src/test/java/org/apache/accumulo/server/conf/store/impl/ZooPropStoreTest.java
create mode 100644
server/base/src/test/java/org/apache/accumulo/server/conf/util/PropSnapshotTest.java
create mode 100644
test/src/main/java/org/apache/accumulo/test/conf/PropStoreConfigIT.java
create mode 100644
test/src/main/java/org/apache/accumulo/test/conf/store/PropCacheCaffeineImplZkIT.java
create mode 100644
test/src/main/java/org/apache/accumulo/test/conf/store/PropStoreZooKeeperIT.java
create mode 100644
test/src/main/java/org/apache/accumulo/test/conf/store/ZooBasedConfigIT.java
create mode 100644
test/src/main/java/org/apache/accumulo/test/conf/util/ConfigTransformerIT.java
create mode 100644
test/src/main/java/org/apache/accumulo/test/conf/util/LegacyPropData.java
create mode 100644
test/src/main/java/org/apache/accumulo/test/conf/util/TransformTokenIT.java
create mode 100644
test/src/main/java/org/apache/accumulo/test/upgrade/ConfigPropertyUpgraderIT.java
delete mode 100644
test/src/main/java/org/apache/accumulo/test/upgrade/DeprecatedPropertyUpgrade9to10IT.java
