date:20240424

(accumulo) branch main updated (6c1e453f53 -> 94b8d96e5c)

2024-04-24 Thread ctubbsii

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 6c1e453f53 Merge branch '2.1'
 add 8521cb3178 improves efficiency of migration set clean up (#4474)
 add 4839d3bf22 logs when closing tablets are waiting on compactions (#4472)
 add 714fdb7e1a logs when tablet decides there is nothing to do for user 
compaction (#4473)
 add 3c5326c89f Add visibility to grep searches (#4468)
 add 0958a5a456 Add scan server prefix to valid zooProp list (#4487)
 add 6d0b476852 Additional metrics changes (#4459)
 new 94b8d96e5c Merge branch '2.1'

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:
 .../org/apache/accumulo/core/conf/Property.java| 24 +++---
 .../accumulo/core/iterators/user/GrepIterator.java |  2 +-
 .../core/iterators/user/GrepIteratorTest.java  | 18 
 .../java/org/apache/accumulo/manager/Manager.java  | 14 -
 .../accumulo/tserver/tablet/CompactableImpl.java   | 13 ++--
 .../accumulo/shell/commands/GrepCommand.java   |  2 +-
 .../org/apache/accumulo/test/shell/ShellIT.java|  1 +
 7 files changed, 62 insertions(+), 12 deletions(-)

(accumulo) 01/01: Merge branch '2.1'

2024-04-24 Thread ctubbsii

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 94b8d96e5c334ee3c7adbf665b9ddd9e1f46a692
Merge: 6c1e453f53 6d0b476852
Author: Christopher Tubbs 
AuthorDate: Wed Apr 24 17:10:59 2024 -0400

Merge branch '2.1'

Merge of 2.1 to main branch to include all changes up through #4459

 .../org/apache/accumulo/core/conf/Property.java| 24 +++---
 .../accumulo/core/iterators/user/GrepIterator.java |  2 +-
 .../core/iterators/user/GrepIteratorTest.java  | 18 
 .../java/org/apache/accumulo/manager/Manager.java  | 14 -
 .../accumulo/tserver/tablet/CompactableImpl.java   | 13 ++--
 .../accumulo/shell/commands/GrepCommand.java   |  2 +-
 .../org/apache/accumulo/test/shell/ShellIT.java|  1 +
 7 files changed, 62 insertions(+), 12 deletions(-)

diff --cc core/src/main/java/org/apache/accumulo/core/conf/Property.java
index 6dc56205ba,80a9b21b33..463b37cbcf
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@@ -1533,13 -1886,15 +1550,14 @@@ public enum Property 
  // white list prefixes
  return key.startsWith(Property.TABLE_PREFIX.getKey())
  || key.startsWith(Property.TSERV_PREFIX.getKey())
 +|| key.startsWith(Property.COMPACTION_SERVICE_PREFIX.getKey())
+ || key.startsWith(Property.SSERV_PREFIX.getKey())
  || key.startsWith(Property.MANAGER_PREFIX.getKey())
 -|| key.startsWith(Property.MASTER_PREFIX.getKey())
  || key.startsWith(Property.GC_PREFIX.getKey())
  || key.startsWith(Property.GENERAL_ARBITRARY_PROP_PREFIX.getKey())
 +|| key.equals(Property.COMPACTION_WARN_TIME.getKey())
  || 
key.equals(Property.GENERAL_FILE_NAME_ALLOCATION_BATCH_SIZE_MIN.getKey())
 -|| 
key.equals(Property.GENERAL_FILE_NAME_ALLOCATION_BATCH_SIZE_MAX.getKey())
 -|| key.startsWith(VFS_CONTEXT_CLASSPATH_PROPERTY.getKey())
 -|| key.startsWith(REPLICATION_PREFIX.getKey());
 +|| 
key.equals(Property.GENERAL_FILE_NAME_ALLOCATION_BATCH_SIZE_MAX.getKey());
}
  
/**
diff --cc server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
index 9cead258f7,86a1dd71d3..5c6cc2f436
--- a/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
@@@ -90,12 -85,16 +90,13 @@@ import org.apache.accumulo.core.manager
  import org.apache.accumulo.core.manager.thrift.ManagerGoalState;
  import org.apache.accumulo.core.manager.thrift.ManagerMonitorInfo;
  import org.apache.accumulo.core.manager.thrift.ManagerState;
 -import org.apache.accumulo.core.master.thrift.BulkImportState;
 -import org.apache.accumulo.core.master.thrift.TableInfo;
 -import org.apache.accumulo.core.master.thrift.TabletServerStatus;
 -import org.apache.accumulo.core.metadata.MetadataTable;
 -import org.apache.accumulo.core.metadata.RootTable;
 +import org.apache.accumulo.core.manager.thrift.TableInfo;
 +import org.apache.accumulo.core.manager.thrift.TabletServerStatus;
 +import org.apache.accumulo.core.metadata.AccumuloTable;
  import org.apache.accumulo.core.metadata.TServerInstance;
  import org.apache.accumulo.core.metadata.TabletLocationState;
 -import org.apache.accumulo.core.metadata.TabletState;
  import org.apache.accumulo.core.metadata.schema.Ample.DataLevel;
+ import org.apache.accumulo.core.metadata.schema.MetadataSchema;
  import 
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.TabletColumnFamily;
  import org.apache.accumulo.core.metrics.MetricsInfo;
  import org.apache.accumulo.core.metrics.MetricsProducer;
@@@ -703,17 -709,19 +704,20 @@@ public class Manager extends AbstractSe
   */
  private void cleanupNonexistentMigrations(final AccumuloClient 
accumuloClient)
  throws TableNotFoundException {
 -  Scanner scanner = accumuloClient.createScanner(MetadataTable.NAME, 
Authorizations.EMPTY);
 +  Scanner scanner =
 +  accumuloClient.createScanner(AccumuloTable.METADATA.tableName(), 
Authorizations.EMPTY);
TabletColumnFamily.PREV_ROW_COLUMN.fetch(scanner);
-   Set found = new HashSet<>();
+   scanner.setRange(MetadataSchema.TabletsSection.getRange());
+   Set notSeen;
+   synchronized (migrations) {
+ notSeen = new HashSet<>(migrations.keySet());
+   }
for (Entry entry : scanner) {
  KeyExtent extent = KeyExtent.fromMetaPrevRow(entry);
- if (migrations.containsKey(extent)) {
-   found.add(extent);
- }
+ notSeen.remove(extent);
}
-   migrations.keySet().retainAll(found);
+   // remove tablets that used to be in migrations and were not seen in 
the metadata table
+   migrations.keySet().removeAll(notSeen);
  }
  
  /**

(accumulo) branch main updated: Merge branch '2.1'

2024-04-24 Thread edcoleman

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

edcoleman 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 6c1e453f53 Merge branch '2.1'
6c1e453f53 is described below

commit 6c1e453f5399dc21bf9889bb78e0ff541ad95878
Author: Ed Coleman 
AuthorDate: Wed Apr 24 18:47:12 2024 +

Merge branch '2.1'

 - excludes changes to the grep iterator and grep shell command.
---
 core/pom.xml   |   1 +
 .../org/apache/accumulo/core/conf/Property.java|  11 +-
 .../core/metrics/MeterRegistryFactory.java |   5 +
 .../apache/accumulo/core/metrics/MetricsInfo.java  | 114 
 .../accumulo/core/metrics/MetricsProducer.java |  43 ---
 .../apache/accumulo/core/metrics/MetricsUtil.java  | 132 -
 .../spi/metrics/LoggingMeterRegistryFactory.java   |  81 ++
 .../core/spi/metrics/MeterRegistryFactory.java |  72 +
 .../accumulo/core/util/threads/ThreadPools.java|  38 ++-
 .../metrics/LoggingMeterRegistryFactoryTest.java   |  52 
 .../miniclusterImpl/MiniAccumuloConfigImpl.java|   3 +
 .../org/apache/accumulo/server/AbstractServer.java |   9 +-
 .../org/apache/accumulo/server/ServerContext.java  |  13 +
 .../server/compaction/PausedCompactionMetrics.java |   5 +-
 .../conf/store/impl/PropCacheCaffeineImpl.java |  18 +-
 .../server/conf/store/impl/PropStoreMetrics.java   |  92 --
 .../server/conf/store/impl/ZooPropLoader.java  |  19 +-
 .../server/conf/store/impl/ZooPropStore.java   |  15 +-
 .../server/metrics/MeterRegistryEnvPropImpl.java   |  75 +
 .../accumulo/server/metrics/MetricsInfoImpl.java   | 319 +
 .../apache/accumulo/server/rpc/TServerUtils.java   |  11 +-
 .../apache/accumulo/server/rpc/TimedProcessor.java |   6 +-
 .../conf/store/impl/PropCacheCaffeineImplTest.java |   6 +-
 .../server/conf/store/impl/PropStoreEventTest.java |   8 +-
 .../server/conf/store/impl/ZooPropLoaderTest.java  |  78 ++---
 .../metrics/MeterRegistryEnvPropImplTest.java  |  50 
 .../server/metrics/MetricsInfoImplTest.java|  84 ++
 .../accumulo/server/rpc/TServerUtilsTest.java  |  19 +-
 .../coordinator/CompactionCoordinator.java |  15 +-
 .../org/apache/accumulo/compactor/Compactor.java   |  18 +-
 .../apache/accumulo/gc/SimpleGarbageCollector.java |  19 +-
 .../java/org/apache/accumulo/manager/Manager.java  |  20 +-
 .../accumulo/manager/metrics/ManagerMetrics.java   |  24 +-
 .../accumulo/manager/metrics/fate/FateMetrics.java |  49 ++--
 .../java/org/apache/accumulo/monitor/Monitor.java  |   6 +
 .../org/apache/accumulo/tserver/ScanServer.java|  19 +-
 .../org/apache/accumulo/tserver/TabletServer.java  |  34 +--
 .../tserver/TabletServerResourceManager.java   |  35 +--
 .../tserver/metrics/TabletServerMinCMetrics.java   |   8 +-
 .../tserver/metrics/TabletServerScanMetrics.java   |  24 +-
 .../accumulo/tserver/tablet/CompactableImpl.java   |   9 +
 .../test/conf/store/PropCacheCaffeineImplZkIT.java |  10 +-
 .../accumulo/test/functional/ZombieTServer.java|   2 +-
 .../apache/accumulo/test/metrics/MetricsIT.java|  16 +-
 .../test/metrics/TestStatsDRegistryFactory.java|   6 +-
 .../accumulo/test/performance/NullTserver.java |   2 +-
 test/src/main/resources/log4j2-test.properties |  23 --
 47 files changed, 1109 insertions(+), 609 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 05d9a02c69..5d70035fab 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -271,6 +271,7 @@
   
   
   
+
io[.]micrometer[.]core[.]instrument[.]MeterRegistry
 io[.]opentelemetry[.]api[.]OpenTelemetry
 org[.]apache[.]hadoop[.]io[.]Text
 org[.]apache[.]accumulo[.]core[.]client[.].*
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 7d48c05ae1..6dc56205ba 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
@@ -322,8 +322,15 @@ public enum Property {
   "Enables metrics functionality using Micrometer.", "2.1.0"),
   
GENERAL_MICROMETER_JVM_METRICS_ENABLED("general.micrometer.jvm.metrics.enabled",
 "false",
   PropertyType.BOOLEAN, "Enables JVM metrics functionality using 
Micrometer.", "2.1.0"),
-  GENERAL_MICROMETER_FACTORY("general.micrometer.factory", "", 
PropertyType.CLASSNAME,
-  "Name of class that implements MeterRegistryFactory.", "2.1.0"),
+  GENERAL_MICROMETER_FACTORY("general.micrometer.factory",
+  "org.apache.accumulo.core.spi.metrics.LoggingMeterRegistryFactory",
+  PropertyType.CLASSNAMELIST,
+  "A comma separated list of one or more class names that implements"
+  + "

(accumulo) branch 2.1 updated: Additional metrics changes (#4459)

2024-04-24 Thread edcoleman

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

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


The following commit(s) were added to refs/heads/2.1 by this push:
 new 6d0b476852 Additional metrics changes (#4459)
6d0b476852 is described below

commit 6d0b4768522187d8c43b9bf0850034d80a684235
Author: EdColeman 
AuthorDate: Wed Apr 24 08:55:21 2024 -0400

Additional metrics changes (#4459)

* Completes removal of static MetricsUtils class (this completes changes 
started in #4384)
* Adds metric initialization to ServiceContext
  - provides consistent use of tags and service metrics initialization so  
service name and ip address are applied as common tags.
* Provide a metrics SPI to enable metric provider extensions by users
  - Adds the MeterRegistryFactory to ..core.spi.metrics and deprecates
  .core.metrics.MeterRegistryFactory
  - Modified the GENERAL_MICROMETER_FACTORY to be a list of class names. 
This allows multiple providers to be used. For example, logging and statsd.
  - Provides a sample metrics implementation using a LoggingProvider
* Provides general method that can be used to pass parameters using 
standard properties, with `general.custom.metrics.opts prefix`  to allow for 
user runtime customization
* Removes prop store metrics
---
 core/pom.xml   |   1 +
 .../org/apache/accumulo/core/conf/Property.java|  11 +-
 .../core/metrics/MeterRegistryFactory.java |   5 +
 .../apache/accumulo/core/metrics/MetricsInfo.java  | 114 
 .../accumulo/core/metrics/MetricsProducer.java |  43 ---
 .../apache/accumulo/core/metrics/MetricsUtil.java  | 149 --
 .../spi/metrics/LoggingMeterRegistryFactory.java   |  81 ++
 .../core/spi/metrics/MeterRegistryFactory.java |  72 +
 .../accumulo/core/util/threads/ThreadPools.java|  38 ++-
 .../metrics/LoggingMeterRegistryFactoryTest.java   |  52 
 .../miniclusterImpl/MiniAccumuloConfigImpl.java|   3 +
 .../org/apache/accumulo/server/AbstractServer.java |   9 +-
 .../org/apache/accumulo/server/ServerContext.java  |  13 +
 .../conf/store/impl/PropCacheCaffeineImpl.java |  18 +-
 .../server/conf/store/impl/PropStoreMetrics.java   |  92 --
 .../server/conf/store/impl/ZooPropLoader.java  |  19 +-
 .../server/conf/store/impl/ZooPropStore.java   |  15 +-
 .../server/metrics/MeterRegistryEnvPropImpl.java   |  75 +
 .../accumulo/server/metrics/MetricsInfoImpl.java   | 319 +
 .../apache/accumulo/server/rpc/TServerUtils.java   |  11 +-
 .../apache/accumulo/server/rpc/TimedProcessor.java |   6 +-
 .../conf/store/impl/PropCacheCaffeineImplTest.java |   6 +-
 .../server/conf/store/impl/PropStoreEventTest.java |   8 +-
 .../server/conf/store/impl/ZooPropLoaderTest.java  |  78 ++---
 .../metrics/MeterRegistryEnvPropImplTest.java  |  50 
 .../server/metrics/MetricsInfoImplTest.java|  84 ++
 .../accumulo/server/rpc/TServerUtilsTest.java  |  19 +-
 .../coordinator/CompactionCoordinator.java |  14 +-
 .../coordinator/CompactionCoordinatorTest.java |  11 +
 .../org/apache/accumulo/compactor/Compactor.java   |  17 +-
 .../apache/accumulo/compactor/CompactorTest.java   |  10 +
 .../apache/accumulo/gc/SimpleGarbageCollector.java |  19 +-
 .../java/org/apache/accumulo/manager/Manager.java  |  19 +-
 .../accumulo/manager/metrics/ManagerMetrics.java   |  17 +-
 .../manager/metrics/ReplicationMetrics.java|  12 +-
 .../accumulo/manager/metrics/fate/FateMetrics.java |  49 ++--
 .../java/org/apache/accumulo/monitor/Monitor.java  |   6 +
 .../org/apache/accumulo/tserver/ScanServer.java|  17 +-
 .../org/apache/accumulo/tserver/TabletServer.java  |  17 +-
 .../tserver/TabletServerResourceManager.java   |  35 +--
 .../tserver/metrics/TabletServerMinCMetrics.java   |   8 +-
 .../tserver/metrics/TabletServerScanMetrics.java   |  19 +-
 .../test/conf/store/PropCacheCaffeineImplZkIT.java |  10 +-
 .../accumulo/test/functional/ZombieTServer.java|   2 +-
 .../apache/accumulo/test/metrics/MetricsIT.java|  16 +-
 .../test/metrics/TestStatsDRegistryFactory.java|   6 +-
 .../accumulo/test/performance/NullTserver.java |   2 +-
 test/src/main/resources/log4j2-test.properties |  23 --
 48 files changed, 1112 insertions(+), 608 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index d8cc050b33..6e4ffc9883 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -277,6 +277,7 @@
   
   
   
+
io[.]micrometer[.]core[.]instrument[.]MeterRegistry
 io[.]opentelemetry[.]api[.]OpenTelemetry
 org[.]apache[.]hadoop[.]io[.]Text
 org[.]apache[.]accumulo[.]core[.]client[.].*
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/Property.java

(accumulo) branch main updated (6c1e453f53 -> 94b8d96e5c)

(accumulo) 01/01: Merge branch '2.1'

(accumulo) branch main updated: Merge branch '2.1'

(accumulo) branch 2.1 updated: Additional metrics changes (#4459)

4 matches

Site Navigation

Mail list logo

Footer information