You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2023/06/29 13:41:19 UTC
[accumulo] branch main updated (d7af3a0c8c -> 2d12563ce1)
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 d7af3a0c8c Merge branch '2.1'
add ad9b41ac9c avoids indirection for normally empty scans in GC ref stream (#3543)
add 544ef01681 Backported MANAGER_TABLET_GROUP_WATCHER_INTERVAL property (#3542)
add eeff601b07 Pre-compile Patterns and avoid String.matches() (#3554)
new 2ec2321df8 Add ValidationUtilTest from PR #3549
new 2d12563ce1 Merge branch '2.1'
The 2 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 | 9 ++++++-
.../accumulo/core/metadata/ValidationUtil.java | 23 ++++++++--------
.../core/metadata/schema/MetadataSchema.java | 6 ++++-
.../ValidationUtilTest.java} | 31 +++++++++++++++-------
.../main/java/org/apache/accumulo/gc/GCRun.java | 8 +++++-
.../java/org/apache/accumulo/manager/Manager.java | 8 +++---
.../accumulo/manager/TabletGroupWatcher.java | 11 +++++---
.../accumulo/test/conf/PropStoreConfigIT.java | 5 +++-
8 files changed, 67 insertions(+), 34 deletions(-)
copy core/src/test/java/org/apache/accumulo/core/{file/FilePrefixTest.java => metadata/ValidationUtilTest.java} (53%)
[accumulo] 01/01: Merge branch '2.1'
Posted by ct...@apache.org.
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 2d12563ce1cc43e99756a592f199fff1d3302478
Merge: d7af3a0c8c 2ec2321df8
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Thu Jun 29 09:30:40 2023 -0400
Merge branch '2.1'
Include merging PR #3543, PR #3542, PR #3554, and the ValidationUtilTest
in 2ec2321df8da0c90d2836561a2d16895e9bad0b5 originally from PR #3549
.../org/apache/accumulo/core/conf/Property.java | 9 +++-
.../accumulo/core/metadata/ValidationUtil.java | 23 +++++-----
.../core/metadata/schema/MetadataSchema.java | 6 ++-
.../accumulo/core/metadata/ValidationUtilTest.java | 50 ++++++++++++++++++++++
.../main/java/org/apache/accumulo/gc/GCRun.java | 8 +++-
.../java/org/apache/accumulo/manager/Manager.java | 8 ++--
.../accumulo/manager/TabletGroupWatcher.java | 11 +++--
.../accumulo/test/conf/PropStoreConfigIT.java | 5 ++-
8 files changed, 96 insertions(+), 24 deletions(-)
diff --cc core/src/main/java/org/apache/accumulo/core/conf/Property.java
index 0508cafb2a,9c2e9532ee..e64147f02e
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@@ -307,6 -311,18 +307,10 @@@ public enum Property
"The balancer class that accumulo will use to make tablet assignment and "
+ "migration decisions.",
"1.3.5"),
+ MANAGER_TABLET_GROUP_WATCHER_INTERVAL("manager.tablet.watcher.interval", "60s",
+ PropertyType.TIMEDURATION,
+ "Time to wait between scanning tablet states to identify tablets that need to be assigned, un-assigned, migrated, etc.",
+ "2.1.2"),
- MANAGER_BULK_RETRIES("manager.bulk.retries", "3", PropertyType.COUNT,
- "The number of attempts to bulk import a RFile before giving up.", "1.4.0"),
- MANAGER_BULK_THREADPOOL_SIZE("manager.bulk.threadpool.size", "5", PropertyType.COUNT,
- "The number of threads to use when coordinating a bulk import.", "1.4.0"),
- MANAGER_BULK_THREADPOOL_TIMEOUT("manager.bulk.threadpool.timeout", "0s",
- PropertyType.TIMEDURATION,
- "The time after which bulk import threads terminate with no work available. Zero (0) will keep the threads alive indefinitely.",
- "2.1.0"),
MANAGER_BULK_TIMEOUT("manager.bulk.timeout", "5m", PropertyType.TIMEDURATION,
"The time to wait for a tablet server to process a bulk import request", "1.4.3"),
MANAGER_RENAME_THREADS("manager.rename.threadpool.size", "20", PropertyType.COUNT,
diff --cc core/src/main/java/org/apache/accumulo/core/metadata/schema/MetadataSchema.java
index 934842e21d,b1b306b083..38abc7e459
--- a/core/src/main/java/org/apache/accumulo/core/metadata/schema/MetadataSchema.java
+++ b/core/src/main/java/org/apache/accumulo/core/metadata/schema/MetadataSchema.java
@@@ -18,9 -18,14 +18,11 @@@
*/
package org.apache.accumulo.core.metadata.schema;
-import static com.google.common.base.Preconditions.checkArgument;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static java.util.Objects.requireNonNull;
+ import java.util.regex.Pattern;
+
import org.apache.accumulo.core.client.admin.TimeType;
-import org.apache.accumulo.core.data.ArrayByteSequence;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.data.PartialKey;
diff --cc server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
index 42c90ad754,bab128fb23..7e8efbf963
--- a/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
@@@ -225,9 -222,8 +222,10 @@@ public class Manager extends AbstractSe
private final AtomicBoolean managerInitialized = new AtomicBoolean(false);
private final AtomicBoolean managerUpgrading = new AtomicBoolean(false);
+ private final long timeToCacheRecoveryWalExistence;
+ private ExecutorService tableInformationStatusPool = null;
+
@Override
public synchronized ManagerState getManagerState() {
return state;