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 2024/01/19 22:03:56 UTC
(accumulo) branch main updated (3bc0cfbfba -> 68c7e20062)
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 3bc0cfbfba Merge commit 'cf9417ad911b1f055d22620efd58238d1b0df236'
add e67cff2db2 fixes split recovery for metadata tablet (#4137)
new 0525755e2e Merge commit 'e67cff2db2a89ec203e96ad0b65183764c0f4342'
add cefa3a405d Stricter checks before transitioning table state (#4165)
add 33b889a98e Trivial javadoc update in SimpleGarbageCollector.isSafeMode. (#4174)
new 68c7e20062 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:
.../accumulo/server/tables/TableManager.java | 22 ++++++++++++----------
.../accumulo/server/util/ManagerMetadataUtil.java | 7 +++----
.../apache/accumulo/gc/SimpleGarbageCollector.java | 2 +-
.../accumulo/manager/FateServiceHandler.java | 16 ++++++++++++----
.../manager/tableOps/ChangeTableState.java | 9 +++++++--
.../manager/tableOps/clone/FinishCloneTable.java | 9 +++++++--
.../manager/tableOps/create/FinishCreateTable.java | 6 ++++--
.../manager/tableOps/delete/DeleteTable.java | 6 +++++-
.../tableOps/tableImport/FinishImportTable.java | 5 ++++-
9 files changed, 55 insertions(+), 27 deletions(-)
(accumulo) 02/02: 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 68c7e200622ac43498b336a4e7bd4a7bcd1a6888
Merge: 0525755e2e 33b889a98e
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Fri Jan 19 15:13:16 2024 -0500
Merge branch '2.1'
.../accumulo/server/tables/TableManager.java | 22 ++++++++++++----------
.../apache/accumulo/gc/SimpleGarbageCollector.java | 2 +-
.../accumulo/manager/FateServiceHandler.java | 16 ++++++++++++----
.../manager/tableOps/ChangeTableState.java | 9 +++++++--
.../manager/tableOps/clone/FinishCloneTable.java | 9 +++++++--
.../manager/tableOps/create/FinishCreateTable.java | 6 ++++--
.../manager/tableOps/delete/DeleteTable.java | 6 +++++-
.../tableOps/tableImport/FinishImportTable.java | 5 ++++-
8 files changed, 52 insertions(+), 23 deletions(-)
diff --cc server/manager/src/main/java/org/apache/accumulo/manager/FateServiceHandler.java
index 4532712ed7,0444099675..9d66cdcc93
--- a/server/manager/src/main/java/org/apache/accumulo/manager/FateServiceHandler.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/FateServiceHandler.java
@@@ -62,7 -62,7 +63,8 @@@ import org.apache.accumulo.core.conf.Pr
import org.apache.accumulo.core.data.NamespaceId;
import org.apache.accumulo.core.data.TableId;
import org.apache.accumulo.core.fate.ReadOnlyTStore.TStatus;
+ import org.apache.accumulo.core.manager.state.tables.TableState;
+import org.apache.accumulo.core.manager.thrift.BulkImportState;
import org.apache.accumulo.core.manager.thrift.FateOperation;
import org.apache.accumulo.core.manager.thrift.FateService;
import org.apache.accumulo.core.manager.thrift.ThriftPropertyException;
(accumulo) 01/02: Merge commit 'e67cff2db2a89ec203e96ad0b65183764c0f4342'
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 0525755e2eb5d99dbcd660444223df6018945229
Merge: 3bc0cfbfba e67cff2db2
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Fri Jan 19 15:11:33 2024 -0500
Merge commit 'e67cff2db2a89ec203e96ad0b65183764c0f4342'
Merge #4137 from 2.1 branch into main
.../java/org/apache/accumulo/server/util/ManagerMetadataUtil.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --cc server/base/src/main/java/org/apache/accumulo/server/util/ManagerMetadataUtil.java
index 0497a6403f,c0b5e27fa6..eb179bd844
--- a/server/base/src/main/java/org/apache/accumulo/server/util/ManagerMetadataUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/ManagerMetadataUtil.java
@@@ -40,11 -40,10 +40,10 @@@ import org.apache.accumulo.core.data.Ra
import org.apache.accumulo.core.data.TableId;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.dataImpl.KeyExtent;
-import org.apache.accumulo.core.fate.zookeeper.ServiceLock;
+import org.apache.accumulo.core.lock.ServiceLock;
- import org.apache.accumulo.core.metadata.AccumuloTable;
+import org.apache.accumulo.core.metadata.ReferencedTabletFile;
import org.apache.accumulo.core.metadata.StoredTabletFile;
import org.apache.accumulo.core.metadata.TServerInstance;
-import org.apache.accumulo.core.metadata.TabletFile;
import org.apache.accumulo.core.metadata.schema.Ample;
import org.apache.accumulo.core.metadata.schema.Ample.TabletMutator;
import org.apache.accumulo.core.metadata.schema.DataFileValue;