This is an automated email from the ASF dual-hosted git repository.
kturner 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 1168832fbc Use ServerContext instead of Manager in fate util code
(#5941)
1168832fbc is described below
commit 1168832fbc21524514049723659b97532de81c1a
Author: Keith Turner <[email protected]>
AuthorDate: Tue Sep 30 13:06:12 2025 -0400
Use ServerContext instead of Manager in fate util code (#5941)
The class o.a.a.manager.tableOps.Utils took a Manager type for most of
its methods and only used the ServerContext. Modified these methods to
take a ServerContext intead. Making this change as the beginning of an
effort to remove direct usage of the Manager type in fate operations.
---
.../manager/tableOps/ChangeTableState.java | 13 +++---
.../apache/accumulo/manager/tableOps/Utils.java | 54 +++++++++++-----------
.../manager/tableOps/availability/LockTable.java | 12 +++--
.../availability/SetTabletAvailability.java | 4 +-
.../tableOps/bulkVer2/CleanUpBulkImport.java | 4 +-
.../manager/tableOps/bulkVer2/PrepBulkImport.java | 9 ++--
.../manager/tableOps/clone/CloneTable.java | 12 +++--
.../manager/tableOps/clone/CloneZookeeper.java | 13 +++---
.../manager/tableOps/clone/FinishCloneTable.java | 11 +++--
.../accumulo/manager/tableOps/compact/CleanUp.java | 4 +-
.../manager/tableOps/compact/CompactRange.java | 12 ++---
.../tableOps/compact/cancel/CancelCompactions.java | 9 ++--
.../compact/cancel/FinishCancelCompaction.java | 4 +-
.../manager/tableOps/create/CreateTable.java | 7 +--
.../manager/tableOps/create/FinishCreateTable.java | 4 +-
.../manager/tableOps/create/PopulateMetadata.java | 3 +-
.../manager/tableOps/create/PopulateZookeeper.java | 6 +--
.../accumulo/manager/tableOps/delete/CleanUp.java | 4 +-
.../manager/tableOps/delete/DeleteTable.java | 9 ++--
.../manager/tableOps/delete/PreDeleteTable.java | 13 +++---
.../manager/tableOps/merge/FinishTableRangeOp.java | 4 +-
.../manager/tableOps/merge/TableRangeOp.java | 10 ++--
.../namespace/create/FinishCreateNamespace.java | 2 +-
.../create/PopulateZookeeperWithNamespace.java | 8 ++--
.../tableOps/namespace/delete/DeleteNamespace.java | 7 +--
.../namespace/delete/NamespaceCleanUp.java | 2 +-
.../tableOps/namespace/rename/RenameNamespace.java | 9 ++--
.../manager/tableOps/rename/RenameTable.java | 13 +++---
.../manager/tableOps/tableExport/ExportTable.java | 7 +--
.../tableOps/tableExport/WriteExportFiles.java | 17 +++----
.../tableOps/tableImport/FinishImportTable.java | 6 +--
.../tableImport/ImportPopulateZookeeper.java | 6 +--
.../manager/tableOps/tableImport/ImportTable.java | 11 +++--
33 files changed, 165 insertions(+), 144 deletions(-)
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/ChangeTableState.java
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/ChangeTableState.java
index c016c9f44a..8a852a89d7 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/ChangeTableState.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/ChangeTableState.java
@@ -55,8 +55,9 @@ public class ChangeTableState extends ManagerRepo {
public long isReady(FateId fateId, Manager env) throws Exception {
// reserve the table so that this op does not run concurrently with
create, clone, or delete
// table
- return Utils.reserveNamespace(env, namespaceId, fateId, LockType.READ,
true, top)
- + Utils.reserveTable(env, tableId, fateId, LockType.WRITE, true, top,
LockRange.infinite());
+ return Utils.reserveNamespace(env.getContext(), namespaceId, fateId,
LockType.READ, true, top)
+ + Utils.reserveTable(env.getContext(), tableId, fateId,
LockType.WRITE, true, top,
+ LockRange.infinite());
}
@Override
@@ -67,8 +68,8 @@ public class ChangeTableState extends ManagerRepo {
}
env.getTableManager().transitionTableState(tableId, ts,
expectedCurrStates);
- Utils.unreserveNamespace(env, namespaceId, fateId, LockType.READ);
- Utils.unreserveTable(env, tableId, fateId, LockType.WRITE);
+ Utils.unreserveNamespace(env.getContext(), namespaceId, fateId,
LockType.READ);
+ Utils.unreserveTable(env.getContext(), tableId, fateId, LockType.WRITE);
LoggerFactory.getLogger(ChangeTableState.class).debug("Changed table state
{} {}", tableId, ts);
env.getEventCoordinator().event(tableId, "Set table state of %s to %s",
tableId, ts);
return null;
@@ -76,7 +77,7 @@ public class ChangeTableState extends ManagerRepo {
@Override
public void undo(FateId fateId, Manager env) {
- Utils.unreserveNamespace(env, namespaceId, fateId, LockType.READ);
- Utils.unreserveTable(env, tableId, fateId, LockType.WRITE);
+ Utils.unreserveNamespace(env.getContext(), namespaceId, fateId,
LockType.READ);
+ Utils.unreserveTable(env.getContext(), tableId, fateId, LockType.WRITE);
}
}
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/Utils.java
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/Utils.java
index 5b763dcb5b..cb8b774476 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/Utils.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/Utils.java
@@ -54,7 +54,6 @@ import
org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
import org.apache.accumulo.core.fate.zookeeper.ZooReservation;
import org.apache.accumulo.core.metadata.schema.Ample;
import org.apache.accumulo.core.metadata.schema.TabletMetadata;
-import org.apache.accumulo.manager.Manager;
import org.apache.accumulo.server.ServerContext;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
@@ -140,13 +139,14 @@ public class Utils {
}
- public static long reserveTable(Manager env, TableId tableId, FateId fateId,
LockType lockType,
- boolean tableMustExist, TableOperation op) throws Exception {
- return reserveTable(env, tableId, fateId, lockType, tableMustExist, op,
LockRange.infinite());
+ public static long reserveTable(ServerContext ctx, TableId tableId, FateId
fateId,
+ LockType lockType, boolean tableMustExist, TableOperation op) throws
Exception {
+ return reserveTable(ctx, tableId, fateId, lockType, tableMustExist, op,
LockRange.infinite());
}
- public static long reserveTable(Manager env, TableId tableId, FateId fateId,
LockType lockType,
- boolean tableMustExist, TableOperation op, final LockRange range) throws
Exception {
+ public static long reserveTable(ServerContext ctx, TableId tableId, FateId
fateId,
+ LockType lockType, boolean tableMustExist, TableOperation op, final
LockRange range)
+ throws Exception {
final LockRange widenedRange;
boolean shouldWiden = lockType == LockType.WRITE || op ==
TableOperation.COMPACT;
@@ -174,13 +174,13 @@ public class Utils {
*
* Widening is done for compactions because those operations widen their
range.
*/
- widenedRange = widen(env.getContext().getAmple(), tableId, range, op,
tableMustExist);
+ widenedRange = widen(ctx.getAmple(), tableId, range, op, tableMustExist);
log.debug("{} widened write lock range from {} to {}", fateId, range,
widenedRange);
} else {
widenedRange = range;
}
- var lock = getLock(env.getContext(), tableId, fateId, lockType,
widenedRange);
+ var lock = getLock(ctx, tableId, fateId, lockType, widenedRange);
if (shouldWiden && !widenedRange.equals(lock.getRange())) {
// It is possible the range changed since the lock entry was created.
Pre existing locks are
// found using the fate id and could have a different range.
@@ -201,7 +201,7 @@ public class Utils {
// it means the table splits changed so release the lock and try again
later. The table
// splits in this range can not change once the lock is acquired, so
this recheck is done
// after getting the lock.
- var widenedRange2 = widen(env.getContext().getAmple(), tableId, range,
op, tableMustExist);
+ var widenedRange2 = widen(ctx.getAmple(), tableId, range, op,
tableMustExist);
if (!widenedRange.equals(widenedRange2)) {
lock.unlock();
log.info(
@@ -212,7 +212,7 @@ public class Utils {
}
if (tableMustExist) {
- ZooReaderWriter zk = env.getContext().getZooSession().asReaderWriter();
+ ZooReaderWriter zk = ctx.getZooSession().asReaderWriter();
if (!zk.exists(Constants.ZTABLES + "/" + tableId)) {
throw new
AcceptableThriftTableOperationException(tableId.canonical(), "", op,
TableOperationExceptionType.NOTFOUND, "Table does not exist");
@@ -232,23 +232,23 @@ public class Utils {
}
}
- public static void unreserveTable(Manager env, TableId tableId, FateId
fateId,
+ public static void unreserveTable(ServerContext ctx, TableId tableId, FateId
fateId,
LockType lockType) {
- getLock(env.getContext(), tableId, fateId, lockType,
LockRange.infinite()).unlock();
+ getLock(ctx, tableId, fateId, lockType, LockRange.infinite()).unlock();
log.info("table {} {} unlocked for {}", tableId, fateId, lockType);
}
- public static void unreserveNamespace(Manager env, NamespaceId namespaceId,
FateId fateId,
+ public static void unreserveNamespace(ServerContext ctx, NamespaceId
namespaceId, FateId fateId,
LockType lockType) {
- getLock(env.getContext(), namespaceId, fateId, lockType,
LockRange.infinite()).unlock();
+ getLock(ctx, namespaceId, fateId, lockType, LockRange.infinite()).unlock();
log.info("namespace {} {} unlocked for {}", namespaceId, fateId, lockType);
}
- public static long reserveNamespace(Manager env, NamespaceId namespaceId,
FateId fateId,
+ public static long reserveNamespace(ServerContext ctx, NamespaceId
namespaceId, FateId fateId,
LockType lockType, boolean mustExist, TableOperation op) throws
Exception {
- if (getLock(env.getContext(), namespaceId, fateId, lockType,
LockRange.infinite()).tryLock()) {
+ if (getLock(ctx, namespaceId, fateId, lockType,
LockRange.infinite()).tryLock()) {
if (mustExist) {
- ZooReaderWriter zk = env.getContext().getZooSession().asReaderWriter();
+ ZooReaderWriter zk = ctx.getZooSession().asReaderWriter();
if (!zk.exists(Constants.ZNAMESPACES + "/" + namespaceId)) {
throw new
AcceptableThriftTableOperationException(namespaceId.canonical(), "", op,
TableOperationExceptionType.NAMESPACE_NOTFOUND, "Namespace does
not exist");
@@ -261,10 +261,10 @@ public class Utils {
}
}
- public static long reserveHdfsDirectory(Manager env, String directory,
FateId fateId)
+ public static long reserveHdfsDirectory(ServerContext ctx, String directory,
FateId fateId)
throws KeeperException, InterruptedException {
- ZooReaderWriter zk = env.getContext().getZooSession().asReaderWriter();
+ ZooReaderWriter zk = ctx.getZooSession().asReaderWriter();
if (ZooReservation.attempt(zk, Constants.ZHDFS_RESERVATIONS + "/"
+ Base64.getEncoder().encodeToString(directory.getBytes(UTF_8)),
fateId, "")) {
@@ -276,12 +276,10 @@ public class Utils {
}
}
- public static void unreserveHdfsDirectory(Manager env, String directory,
FateId fateId)
+ public static void unreserveHdfsDirectory(ServerContext ctx, String
directory, FateId fateId)
throws KeeperException, InterruptedException {
- ZooReservation.release(env.getContext().getZooSession().asReaderWriter(),
- Constants.ZHDFS_RESERVATIONS + "/"
- + Base64.getEncoder().encodeToString(directory.getBytes(UTF_8)),
- fateId);
+ ZooReservation.release(ctx.getZooSession().asReaderWriter(),
Constants.ZHDFS_RESERVATIONS + "/"
+ + Base64.getEncoder().encodeToString(directory.getBytes(UTF_8)),
fateId);
log.trace("{} unreserved bulk dir {}", fateId, directory);
}
@@ -308,9 +306,9 @@ public class Utils {
return lock;
}
- public static DistributedLock getReadLock(Manager env, AbstractId<?> id,
FateId fateId,
+ public static DistributedLock getReadLock(ServerContext ctx, AbstractId<?>
id, FateId fateId,
LockRange range) {
- return Utils.getLock(env.getContext(), id, fateId, LockType.READ, range);
+ return Utils.getLock(ctx, id, fateId, LockType.READ, range);
}
/**
@@ -320,9 +318,9 @@ public class Utils {
*
* @param path the fully-qualified path
*/
- public static SortedSet<Text> getSortedSetFromFile(Manager manager, Path
path, boolean encoded)
+ public static SortedSet<Text> getSortedSetFromFile(ServerContext ctx, Path
path, boolean encoded)
throws IOException {
- FileSystem fs = path.getFileSystem(manager.getContext().getHadoopConf());
+ FileSystem fs = path.getFileSystem(ctx.getHadoopConf());
var data = new TreeSet<Text>();
try (var file = new java.util.Scanner(fs.open(path), UTF_8)) {
while (file.hasNextLine()) {
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/availability/LockTable.java
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/availability/LockTable.java
index 921a5502e0..2d12f627df 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/availability/LockTable.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/availability/LockTable.java
@@ -48,10 +48,10 @@ public class LockTable extends ManagerRepo {
@Override
public long isReady(FateId fateId, Manager manager) throws Exception {
- return Utils.reserveNamespace(manager, namespaceId, fateId,
+ return Utils.reserveNamespace(manager.getContext(), namespaceId, fateId,
DistributedReadWriteLock.LockType.READ, true,
TableOperation.SET_TABLET_AVAILABILITY)
- + Utils.reserveTable(manager, tableId, fateId,
DistributedReadWriteLock.LockType.WRITE,
- true, TableOperation.SET_TABLET_AVAILABILITY);
+ + Utils.reserveTable(manager.getContext(), tableId, fateId,
+ DistributedReadWriteLock.LockType.WRITE, true,
TableOperation.SET_TABLET_AVAILABILITY);
}
@Override
@@ -61,7 +61,9 @@ public class LockTable extends ManagerRepo {
@Override
public void undo(FateId fateId, Manager manager) throws Exception {
- Utils.unreserveNamespace(manager, namespaceId, fateId,
DistributedReadWriteLock.LockType.READ);
- Utils.unreserveTable(manager, tableId, fateId,
DistributedReadWriteLock.LockType.WRITE);
+ Utils.unreserveNamespace(manager.getContext(), namespaceId, fateId,
+ DistributedReadWriteLock.LockType.READ);
+ Utils.unreserveTable(manager.getContext(), tableId, fateId,
+ DistributedReadWriteLock.LockType.WRITE);
}
}
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/availability/SetTabletAvailability.java
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/availability/SetTabletAvailability.java
index db4fcdbeaf..8c4ef15727 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/availability/SetTabletAvailability.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/availability/SetTabletAvailability.java
@@ -150,8 +150,8 @@ public class SetTabletAvailability extends ManagerRepo {
@Override
public Repo<Manager> call(FateId fateId, Manager manager) throws Exception {
- Utils.unreserveNamespace(manager, namespaceId, fateId, LockType.READ);
- Utils.unreserveTable(manager, tableId, fateId, LockType.WRITE);
+ Utils.unreserveNamespace(manager.getContext(), namespaceId, fateId,
LockType.READ);
+ Utils.unreserveTable(manager.getContext(), tableId, fateId,
LockType.WRITE);
return null;
}
}
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/CleanUpBulkImport.java
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/CleanUpBulkImport.java
index ec2912d808..90026173e5 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/CleanUpBulkImport.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/CleanUpBulkImport.java
@@ -75,8 +75,8 @@ public class CleanUpBulkImport extends ManagerRepo {
firstSplit, lastSplit);
removeBulkLoadEntries(ample, info.tableId, fateId, firstSplit, lastSplit);
- Utils.unreserveHdfsDirectory(manager, info.sourceDir, fateId);
- Utils.getReadLock(manager, info.tableId, fateId,
LockRange.infinite()).unlock();
+ Utils.unreserveHdfsDirectory(manager.getContext(), info.sourceDir, fateId);
+ Utils.getReadLock(manager.getContext(), info.tableId, fateId,
LockRange.infinite()).unlock();
// delete json renames and mapping files
Path renamingFile = new Path(bulkDir, Constants.BULK_RENAME_FILE);
Path mappingFile = new Path(bulkDir, Constants.BULK_LOAD_MAPPING);
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/PrepBulkImport.java
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/PrepBulkImport.java
index 1cfd946e45..06c47a5d77 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/PrepBulkImport.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/PrepBulkImport.java
@@ -88,7 +88,7 @@ public class PrepBulkImport extends ManagerRepo {
@Override
public long isReady(FateId fateId, Manager manager) throws Exception {
- long wait = Utils.reserveTable(manager, bulkInfo.tableId, fateId,
+ long wait = Utils.reserveTable(manager.getContext(), bulkInfo.tableId,
fateId,
DistributedReadWriteLock.LockType.READ, true,
TableOperation.BULK_IMPORT,
LockRange.of(bulkInfo.firstSplit, bulkInfo.lastSplit));
if (wait > 0) {
@@ -99,7 +99,7 @@ public class PrepBulkImport extends ManagerRepo {
return 500;
}
- return Utils.reserveHdfsDirectory(manager, bulkInfo.sourceDir, fateId);
+ return Utils.reserveHdfsDirectory(manager.getContext(),
bulkInfo.sourceDir, fateId);
}
@VisibleForTesting
@@ -319,8 +319,9 @@ public class PrepBulkImport extends ManagerRepo {
@Override
public void undo(FateId fateId, Manager environment) throws Exception {
// unreserve sourceDir/error directories
- Utils.unreserveHdfsDirectory(environment, bulkInfo.sourceDir, fateId);
- Utils.getReadLock(environment, bulkInfo.tableId, fateId,
LockRange.infinite()).unlock();
+ Utils.unreserveHdfsDirectory(environment.getContext(), bulkInfo.sourceDir,
fateId);
+ Utils.getReadLock(environment.getContext(), bulkInfo.tableId, fateId,
LockRange.infinite())
+ .unlock();
environment.removeBulkImportStatus(bulkInfo.sourceDir);
}
}
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/CloneTable.java
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/CloneTable.java
index 12fe102807..dd343bd9b8 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/CloneTable.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/CloneTable.java
@@ -45,10 +45,10 @@ public class CloneTable extends ManagerRepo {
@Override
public long isReady(FateId fateId, Manager environment) throws Exception {
- long val = Utils.reserveNamespace(environment, cloneInfo.getNamespaceId(),
fateId,
+ long val = Utils.reserveNamespace(environment.getContext(),
cloneInfo.getNamespaceId(), fateId,
+ LockType.READ, true, TableOperation.CLONE);
+ val += Utils.reserveTable(environment.getContext(),
cloneInfo.getSrcTableId(), fateId,
LockType.READ, true, TableOperation.CLONE);
- val += Utils.reserveTable(environment, cloneInfo.getSrcTableId(), fateId,
LockType.READ, true,
- TableOperation.CLONE);
return val;
}
@@ -62,8 +62,10 @@ public class CloneTable extends ManagerRepo {
@Override
public void undo(FateId fateId, Manager environment) {
- Utils.unreserveNamespace(environment, cloneInfo.getNamespaceId(), fateId,
LockType.READ);
- Utils.unreserveTable(environment, cloneInfo.getSrcTableId(), fateId,
LockType.READ);
+ Utils.unreserveNamespace(environment.getContext(),
cloneInfo.getNamespaceId(), fateId,
+ LockType.READ);
+ Utils.unreserveTable(environment.getContext(), cloneInfo.getSrcTableId(),
fateId,
+ LockType.READ);
}
}
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/CloneZookeeper.java
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/CloneZookeeper.java
index 40e17990f5..d079bb23b8 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/CloneZookeeper.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/CloneZookeeper.java
@@ -43,11 +43,11 @@ class CloneZookeeper extends ManagerRepo {
public long isReady(FateId fateId, Manager environment) throws Exception {
long val = 0;
if (!cloneInfo.getSrcNamespaceId().equals(cloneInfo.getNamespaceId())) {
- val += Utils.reserveNamespace(environment, cloneInfo.getNamespaceId(),
fateId, LockType.READ,
- true, TableOperation.CLONE);
+ val += Utils.reserveNamespace(environment.getContext(),
cloneInfo.getNamespaceId(), fateId,
+ LockType.READ, true, TableOperation.CLONE);
}
- val += Utils.reserveTable(environment, cloneInfo.getTableId(), fateId,
LockType.WRITE, false,
- TableOperation.CLONE);
+ val += Utils.reserveTable(environment.getContext(),
cloneInfo.getTableId(), fateId,
+ LockType.WRITE, false, TableOperation.CLONE);
return val;
}
@@ -69,9 +69,10 @@ class CloneZookeeper extends ManagerRepo {
public void undo(FateId fateId, Manager environment) throws Exception {
environment.getTableManager().removeTable(cloneInfo.getTableId(),
cloneInfo.getNamespaceId());
if (!cloneInfo.getSrcNamespaceId().equals(cloneInfo.getNamespaceId())) {
- Utils.unreserveNamespace(environment, cloneInfo.getNamespaceId(),
fateId, LockType.READ);
+ Utils.unreserveNamespace(environment.getContext(),
cloneInfo.getNamespaceId(), fateId,
+ LockType.READ);
}
- Utils.unreserveTable(environment, cloneInfo.getTableId(), fateId,
LockType.WRITE);
+ Utils.unreserveTable(environment.getContext(), cloneInfo.getTableId(),
fateId, LockType.WRITE);
environment.getContext().clearTableListCache();
}
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/FinishCloneTable.java
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/FinishCloneTable.java
index dd7c0fa908..f77bb38382 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/FinishCloneTable.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/FinishCloneTable.java
@@ -62,12 +62,15 @@ class FinishCloneTable extends ManagerRepo {
expectedCurrStates);
}
- Utils.unreserveNamespace(environment, cloneInfo.getSrcNamespaceId(),
fateId, LockType.READ);
+ Utils.unreserveNamespace(environment.getContext(),
cloneInfo.getSrcNamespaceId(), fateId,
+ LockType.READ);
if (!cloneInfo.getSrcNamespaceId().equals(cloneInfo.getNamespaceId())) {
- Utils.unreserveNamespace(environment, cloneInfo.getNamespaceId(),
fateId, LockType.READ);
+ Utils.unreserveNamespace(environment.getContext(),
cloneInfo.getNamespaceId(), fateId,
+ LockType.READ);
}
- Utils.unreserveTable(environment, cloneInfo.getSrcTableId(), fateId,
LockType.READ);
- Utils.unreserveTable(environment, cloneInfo.getTableId(), fateId,
LockType.WRITE);
+ Utils.unreserveTable(environment.getContext(), cloneInfo.getSrcTableId(),
fateId,
+ LockType.READ);
+ Utils.unreserveTable(environment.getContext(), cloneInfo.getTableId(),
fateId, LockType.WRITE);
environment.getEventCoordinator().event(cloneInfo.getTableId(), "Cloned
table %s from %s",
cloneInfo.getTableName(), cloneInfo.getSrcTableId());
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/CleanUp.java
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/CleanUp.java
index 13f41b21a8..6d6ff762c7 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/CleanUp.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/CleanUp.java
@@ -121,8 +121,8 @@ public class CleanUp extends ManagerRepo {
@Override
public Repo<Manager> call(FateId fateId, Manager manager) throws Exception {
CompactionConfigStorage.deleteConfig(manager.getContext(), fateId);
- Utils.getReadLock(manager, tableId, fateId, LockRange.infinite()).unlock();
- Utils.getReadLock(manager, namespaceId, fateId,
LockRange.infinite()).unlock();
+ Utils.getReadLock(manager.getContext(), tableId, fateId,
LockRange.infinite()).unlock();
+ Utils.getReadLock(manager.getContext(), namespaceId, fateId,
LockRange.infinite()).unlock();
return null;
}
}
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/CompactRange.java
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/CompactRange.java
index 7c39200acd..ab5630bc55 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/CompactRange.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/CompactRange.java
@@ -81,10 +81,10 @@ public class CompactRange extends ManagerRepo {
@Override
public long isReady(FateId fateId, Manager env) throws Exception {
- return Utils.reserveNamespace(env, namespaceId, fateId, LockType.READ,
true,
+ return Utils.reserveNamespace(env.getContext(), namespaceId, fateId,
LockType.READ, true,
TableOperation.COMPACT)
- + Utils.reserveTable(env, tableId, fateId, LockType.READ, true,
TableOperation.COMPACT,
- LockRange.of(startRow, endRow));
+ + Utils.reserveTable(env.getContext(), tableId, fateId, LockType.READ,
true,
+ TableOperation.COMPACT, LockRange.of(startRow, endRow));
}
@Override
@@ -96,7 +96,7 @@ public class CompactRange extends ManagerRepo {
log.debug("{} Widened compact range from {} to {}", fateId,
LockRange.of(extent), widenedRange);
// expecting the lock code should widen the range of the lock, make sure
this happened
- var myLock = Utils.getReadLock(env, tableId, fateId, LockRange.infinite());
+ var myLock = Utils.getReadLock(env.getContext(), tableId, fateId,
LockRange.infinite());
Preconditions.checkState(myLock.getRange().contains(widenedRange), "%s
does not contain %s",
myLock.getRange(), widenedRange);
@@ -110,8 +110,8 @@ public class CompactRange extends ManagerRepo {
try {
CompactionConfigStorage.deleteConfig(env.getContext(), fateId);
} finally {
- Utils.unreserveNamespace(env, namespaceId, fateId, LockType.READ);
- Utils.unreserveTable(env, tableId, fateId, LockType.READ);
+ Utils.unreserveNamespace(env.getContext(), namespaceId, fateId,
LockType.READ);
+ Utils.unreserveTable(env.getContext(), tableId, fateId, LockType.READ);
}
}
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/cancel/CancelCompactions.java
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/cancel/CancelCompactions.java
index 77ebb9a001..ce1f791f76 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/cancel/CancelCompactions.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/cancel/CancelCompactions.java
@@ -46,9 +46,10 @@ public class CancelCompactions extends ManagerRepo {
@Override
public long isReady(FateId fateId, Manager env) throws Exception {
- return Utils.reserveNamespace(env, namespaceId, fateId, LockType.READ,
true,
+
+ return Utils.reserveNamespace(env.getContext(), namespaceId, fateId,
LockType.READ, true,
TableOperation.COMPACT_CANCEL)
- + Utils.reserveTable(env, tableId, fateId, LockType.READ, true,
+ + Utils.reserveTable(env.getContext(), tableId, fateId, LockType.READ,
true,
TableOperation.COMPACT_CANCEL);
}
@@ -66,8 +67,8 @@ public class CancelCompactions extends ManagerRepo {
@Override
public void undo(FateId fateId, Manager env) {
- Utils.unreserveTable(env, tableId, fateId, LockType.READ);
- Utils.unreserveNamespace(env, namespaceId, fateId, LockType.READ);
+ Utils.unreserveTable(env.getContext(), tableId, fateId, LockType.READ);
+ Utils.unreserveNamespace(env.getContext(), namespaceId, fateId,
LockType.READ);
}
}
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/cancel/FinishCancelCompaction.java
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/cancel/FinishCancelCompaction.java
index 2674663031..7e37c0b4df 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/cancel/FinishCancelCompaction.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/cancel/FinishCancelCompaction.java
@@ -39,8 +39,8 @@ class FinishCancelCompaction extends ManagerRepo {
@Override
public Repo<Manager> call(FateId fateId, Manager environment) {
- Utils.unreserveTable(environment, tableId, fateId, LockType.READ);
- Utils.unreserveNamespace(environment, namespaceId, fateId, LockType.READ);
+ Utils.unreserveTable(environment.getContext(), tableId, fateId,
LockType.READ);
+ Utils.unreserveNamespace(environment.getContext(), namespaceId, fateId,
LockType.READ);
return null;
}
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/CreateTable.java
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/CreateTable.java
index 6e3f560a95..990b61d299 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/CreateTable.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/CreateTable.java
@@ -67,8 +67,9 @@ public class CreateTable extends ManagerRepo {
@Override
public long isReady(FateId fateId, Manager environment) throws Exception {
// reserve the table's namespace to make sure it doesn't change while the
table is created
- return Utils.reserveNamespace(environment, tableInfo.getNamespaceId(),
fateId, LockType.READ,
- true, TableOperation.CREATE);
+ return Utils.reserveNamespace(environment.getContext(),
tableInfo.getNamespaceId(), fateId,
+ LockType.READ, true, TableOperation.CREATE);
+
}
@Override
@@ -97,7 +98,7 @@ public class CreateTable extends ManagerRepo {
} catch (IOException e) {
log.error("Table failed to be created and failed to clean up split files
at {}", p, e);
} finally {
- Utils.unreserveNamespace(env, tableInfo.getNamespaceId(), fateId,
LockType.READ);
+ Utils.unreserveNamespace(env.getContext(), tableInfo.getNamespaceId(),
fateId, LockType.READ);
}
}
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/FinishCreateTable.java
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/FinishCreateTable.java
index aa75956694..9de2555434 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/FinishCreateTable.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/FinishCreateTable.java
@@ -64,8 +64,8 @@ class FinishCreateTable extends ManagerRepo {
TableState.ONLINE, expectedCurrStates);
}
- Utils.unreserveNamespace(env, tableInfo.getNamespaceId(), fateId,
LockType.READ);
- Utils.unreserveTable(env, tableInfo.getTableId(), fateId, LockType.WRITE);
+ Utils.unreserveNamespace(env.getContext(), tableInfo.getNamespaceId(),
fateId, LockType.READ);
+ Utils.unreserveTable(env.getContext(), tableInfo.getTableId(), fateId,
LockType.WRITE);
env.getEventCoordinator().event(tableInfo.getTableId(), "Created table %s
",
tableInfo.getTableName());
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/PopulateMetadata.java
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/PopulateMetadata.java
index 2c96c6abf4..4c0bef3cb9 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/PopulateMetadata.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/PopulateMetadata.java
@@ -68,7 +68,8 @@ class PopulateMetadata extends ManagerRepo {
if (tableInfo.getInitialSplitSize() > 0) {
splits = Utils.getSortedSplitsFromFile(env.getContext(),
tableInfo.getSplitPath());
- SortedSet<Text> dirs = Utils.getSortedSetFromFile(env,
tableInfo.getSplitDirsPath(), false);
+ SortedSet<Text> dirs =
+ Utils.getSortedSetFromFile(env.getContext(),
tableInfo.getSplitDirsPath(), false);
splitDirMap = createSplitDirectoryMap(splits, dirs);
} else {
splits = new TreeMap<>();
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/PopulateZookeeper.java
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/PopulateZookeeper.java
index 4e7b01e09c..20042f00ac 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/PopulateZookeeper.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/PopulateZookeeper.java
@@ -43,8 +43,8 @@ class PopulateZookeeper extends ManagerRepo {
@Override
public long isReady(FateId fateId, Manager environment) throws Exception {
- return Utils.reserveTable(environment, tableInfo.getTableId(), fateId,
LockType.WRITE, false,
- TableOperation.CREATE);
+ return Utils.reserveTable(environment.getContext(),
tableInfo.getTableId(), fateId,
+ LockType.WRITE, false, TableOperation.CREATE);
}
@Override
@@ -74,7 +74,7 @@ class PopulateZookeeper extends ManagerRepo {
@Override
public void undo(FateId fateId, Manager manager) throws Exception {
manager.getTableManager().removeTable(tableInfo.getTableId(),
tableInfo.getNamespaceId());
- Utils.unreserveTable(manager, tableInfo.getTableId(), fateId,
LockType.WRITE);
+ Utils.unreserveTable(manager.getContext(), tableInfo.getTableId(), fateId,
LockType.WRITE);
manager.getContext().clearTableListCache();
}
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/delete/CleanUp.java
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/delete/CleanUp.java
index 5d7622be88..53a2968420 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/delete/CleanUp.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/delete/CleanUp.java
@@ -143,8 +143,8 @@ class CleanUp extends ManagerRepo {
log.error("{}", e.getMessage(), e);
}
- Utils.unreserveTable(manager, tableId, fateId, LockType.WRITE);
- Utils.unreserveNamespace(manager, namespaceId, fateId, LockType.READ);
+ Utils.unreserveTable(manager.getContext(), tableId, fateId,
LockType.WRITE);
+ Utils.unreserveNamespace(manager.getContext(), namespaceId, fateId,
LockType.READ);
LoggerFactory.getLogger(CleanUp.class).debug("Deleted table " + tableId);
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/delete/DeleteTable.java
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/delete/DeleteTable.java
index 08da62a949..4138f03336 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/delete/DeleteTable.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/delete/DeleteTable.java
@@ -45,9 +45,10 @@ public class DeleteTable extends ManagerRepo {
@Override
public long isReady(FateId fateId, Manager env) throws Exception {
- return Utils.reserveNamespace(env, namespaceId, fateId, LockType.READ,
false,
+ return Utils.reserveNamespace(env.getContext(), namespaceId, fateId,
LockType.READ, false,
TableOperation.DELETE)
- + Utils.reserveTable(env, tableId, fateId, LockType.WRITE, true,
TableOperation.DELETE);
+ + Utils.reserveTable(env.getContext(), tableId, fateId,
LockType.WRITE, true,
+ TableOperation.DELETE);
}
@Override
@@ -61,7 +62,7 @@ public class DeleteTable extends ManagerRepo {
@Override
public void undo(FateId fateId, Manager env) {
- Utils.unreserveTable(env, tableId, fateId, LockType.WRITE);
- Utils.unreserveNamespace(env, namespaceId, fateId, LockType.READ);
+ Utils.unreserveTable(env.getContext(), tableId, fateId, LockType.WRITE);
+ Utils.unreserveNamespace(env.getContext(), namespaceId, fateId,
LockType.READ);
}
}
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/delete/PreDeleteTable.java
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/delete/PreDeleteTable.java
index 9481678d22..3cb08f4d2b 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/delete/PreDeleteTable.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/delete/PreDeleteTable.java
@@ -53,9 +53,10 @@ public class PreDeleteTable extends ManagerRepo {
@Override
public long isReady(FateId fateId, Manager env) throws Exception {
- return Utils.reserveNamespace(env, namespaceId, fateId, LockType.READ,
true,
+ return Utils.reserveNamespace(env.getContext(), namespaceId, fateId,
LockType.READ, true,
TableOperation.DELETE)
- + Utils.reserveTable(env, tableId, fateId, LockType.READ, true,
TableOperation.DELETE);
+ + Utils.reserveTable(env.getContext(), tableId, fateId, LockType.READ,
true,
+ TableOperation.DELETE);
}
private void preventFutureCompactions(ServerContext ctx)
@@ -78,15 +79,15 @@ public class PreDeleteTable extends ManagerRepo {
}
return new DeleteTable(namespaceId, tableId);
} finally {
- Utils.unreserveTable(environment, tableId, fateId, LockType.READ);
- Utils.unreserveNamespace(environment, namespaceId, fateId,
LockType.READ);
+ Utils.unreserveTable(environment.getContext(), tableId, fateId,
LockType.READ);
+ Utils.unreserveNamespace(environment.getContext(), namespaceId, fateId,
LockType.READ);
}
}
@Override
public void undo(FateId fateId, Manager env) {
- Utils.unreserveTable(env, tableId, fateId, LockType.READ);
- Utils.unreserveNamespace(env, namespaceId, fateId, LockType.READ);
+ Utils.unreserveTable(env.getContext(), tableId, fateId, LockType.READ);
+ Utils.unreserveNamespace(env.getContext(), namespaceId, fateId,
LockType.READ);
}
}
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/merge/FinishTableRangeOp.java
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/merge/FinishTableRangeOp.java
index 96cd61e20d..bb73727d6a 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/merge/FinishTableRangeOp.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/merge/FinishTableRangeOp.java
@@ -55,8 +55,8 @@ class FinishTableRangeOp extends ManagerRepo {
public Repo<Manager> call(FateId fateId, Manager manager) throws Exception {
removeOperationIds(log, data, fateId, manager);
- Utils.unreserveTable(manager, data.tableId, fateId, LockType.WRITE);
- Utils.unreserveNamespace(manager, data.namespaceId, fateId, LockType.READ);
+ Utils.unreserveTable(manager.getContext(), data.tableId, fateId,
LockType.WRITE);
+ Utils.unreserveNamespace(manager.getContext(), data.namespaceId, fateId,
LockType.READ);
return null;
}
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/merge/TableRangeOp.java
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/merge/TableRangeOp.java
index 6dfa6cf034..d9ccb5be09 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/merge/TableRangeOp.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/merge/TableRangeOp.java
@@ -43,10 +43,10 @@ public class TableRangeOp extends ManagerRepo {
@Override
public long isReady(FateId fateId, Manager env) throws Exception {
- return Utils.reserveNamespace(env, data.namespaceId, fateId,
LockType.READ, true,
+ return Utils.reserveNamespace(env.getContext(), data.namespaceId, fateId,
LockType.READ, true,
TableOperation.MERGE)
- + Utils.reserveTable(env, data.tableId, fateId, LockType.WRITE, true,
TableOperation.MERGE,
- LockRange.of(data.getReserveExtent()));
+ + Utils.reserveTable(env.getContext(), data.tableId, fateId,
LockType.WRITE, true,
+ TableOperation.MERGE, LockRange.of(data.getReserveExtent()));
}
public TableRangeOp(MergeInfo.Operation op, NamespaceId namespaceId, TableId
tableId,
@@ -73,7 +73,7 @@ public class TableRangeOp extends ManagerRepo {
@Override
public void undo(FateId fateId, Manager env) throws Exception {
- Utils.unreserveNamespace(env, data.namespaceId, fateId, LockType.READ);
- Utils.unreserveTable(env, data.tableId, fateId, LockType.WRITE);
+ Utils.unreserveNamespace(env.getContext(), data.namespaceId, fateId,
LockType.READ);
+ Utils.unreserveTable(env.getContext(), data.tableId, fateId,
LockType.WRITE);
}
}
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/create/FinishCreateNamespace.java
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/create/FinishCreateNamespace.java
index 550ce2ab80..cd31ceb28e 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/create/FinishCreateNamespace.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/create/FinishCreateNamespace.java
@@ -44,7 +44,7 @@ class FinishCreateNamespace extends ManagerRepo {
@Override
public Repo<Manager> call(FateId fateId, Manager env) {
- Utils.unreserveNamespace(env, namespaceInfo.namespaceId, fateId,
LockType.WRITE);
+ Utils.unreserveNamespace(env.getContext(), namespaceInfo.namespaceId,
fateId, LockType.WRITE);
env.getEventCoordinator().event("Created namespace %s ",
namespaceInfo.namespaceName);
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/create/PopulateZookeeperWithNamespace.java
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/create/PopulateZookeeperWithNamespace.java
index 654a117daa..4e0956fb67 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/create/PopulateZookeeperWithNamespace.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/create/PopulateZookeeperWithNamespace.java
@@ -41,8 +41,9 @@ class PopulateZookeeperWithNamespace extends ManagerRepo {
@Override
public long isReady(FateId fateId, Manager environment) throws Exception {
- return Utils.reserveNamespace(environment, namespaceInfo.namespaceId,
fateId, LockType.WRITE,
- false, TableOperation.CREATE);
+ return Utils.reserveNamespace(environment.getContext(),
namespaceInfo.namespaceId, fateId,
+ LockType.WRITE, false, TableOperation.CREATE);
+
}
@Override
@@ -65,7 +66,8 @@ class PopulateZookeeperWithNamespace extends ManagerRepo {
public void undo(FateId fateId, Manager manager) throws Exception {
manager.getTableManager().removeNamespace(namespaceInfo.namespaceId);
manager.getContext().clearTableListCache();
- Utils.unreserveNamespace(manager, namespaceInfo.namespaceId, fateId,
LockType.WRITE);
+ Utils.unreserveNamespace(manager.getContext(), namespaceInfo.namespaceId,
fateId,
+ LockType.WRITE);
}
}
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/delete/DeleteNamespace.java
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/delete/DeleteNamespace.java
index 6de8c92a18..21022ca42f 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/delete/DeleteNamespace.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/delete/DeleteNamespace.java
@@ -39,8 +39,9 @@ public class DeleteNamespace extends ManagerRepo {
@Override
public long isReady(FateId fateId, Manager environment) throws Exception {
- return Utils.reserveNamespace(environment, namespaceId, fateId,
LockType.WRITE, true,
- TableOperation.DELETE);
+ return Utils.reserveNamespace(environment.getContext(), namespaceId,
fateId, LockType.WRITE,
+ true, TableOperation.DELETE);
+
}
@Override
@@ -51,7 +52,7 @@ public class DeleteNamespace extends ManagerRepo {
@Override
public void undo(FateId fateId, Manager environment) {
- Utils.unreserveNamespace(environment, namespaceId, fateId, LockType.WRITE);
+ Utils.unreserveNamespace(environment.getContext(), namespaceId, fateId,
LockType.WRITE);
}
}
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/delete/NamespaceCleanUp.java
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/delete/NamespaceCleanUp.java
index e02d0e45c2..c0207f94b3 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/delete/NamespaceCleanUp.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/delete/NamespaceCleanUp.java
@@ -65,7 +65,7 @@ class NamespaceCleanUp extends ManagerRepo {
log.error("{}", e.getMessage(), e);
}
- Utils.unreserveNamespace(manager, namespaceId, fateId, LockType.WRITE);
+ Utils.unreserveNamespace(manager.getContext(), namespaceId, fateId,
LockType.WRITE);
log.debug("Deleted namespace " + namespaceId);
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/rename/RenameNamespace.java
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/rename/RenameNamespace.java
index 6e9161e39e..4c16de9d2b 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/rename/RenameNamespace.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/rename/RenameNamespace.java
@@ -37,8 +37,9 @@ public class RenameNamespace extends ManagerRepo {
@Override
public long isReady(FateId fateId, Manager environment) throws Exception {
- return Utils.reserveNamespace(environment, namespaceId, fateId,
LockType.WRITE, true,
- TableOperation.RENAME);
+ return Utils.reserveNamespace(environment.getContext(), namespaceId,
fateId, LockType.WRITE,
+ true, TableOperation.RENAME);
+
}
public RenameNamespace(NamespaceId namespaceId, String oldName, String
newName) {
@@ -54,7 +55,7 @@ public class RenameNamespace extends ManagerRepo {
manager.getContext().getNamespaceMapping().rename(namespaceId, oldName,
newName);
manager.getContext().clearTableListCache();
} finally {
- Utils.unreserveNamespace(manager, namespaceId, fateId, LockType.WRITE);
+ Utils.unreserveNamespace(manager.getContext(), namespaceId, fateId,
LockType.WRITE);
}
LoggerFactory.getLogger(RenameNamespace.class).debug("Renamed namespace {}
{} {}", namespaceId,
@@ -65,7 +66,7 @@ public class RenameNamespace extends ManagerRepo {
@Override
public void undo(FateId fateId, Manager env) {
- Utils.unreserveNamespace(env, namespaceId, fateId, LockType.WRITE);
+ Utils.unreserveNamespace(env.getContext(), namespaceId, fateId,
LockType.WRITE);
}
}
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/rename/RenameTable.java
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/rename/RenameTable.java
index e0c078958c..bf9a8adb28 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/rename/RenameTable.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/rename/RenameTable.java
@@ -42,9 +42,10 @@ public class RenameTable extends ManagerRepo {
@Override
public long isReady(FateId fateId, Manager env) throws Exception {
- return Utils.reserveNamespace(env, namespaceId, fateId, LockType.READ,
true,
+ return Utils.reserveNamespace(env.getContext(), namespaceId, fateId,
LockType.READ, true,
TableOperation.RENAME)
- + Utils.reserveTable(env, tableId, fateId, LockType.WRITE, true,
TableOperation.RENAME);
+ + Utils.reserveTable(env.getContext(), tableId, fateId,
LockType.WRITE, true,
+ TableOperation.RENAME);
}
public RenameTable(NamespaceId namespaceId, TableId tableId, String
oldTableName,
@@ -68,8 +69,8 @@ public class RenameTable extends ManagerRepo {
context.clearTableListCache();
} finally {
- Utils.unreserveTable(manager, tableId, fateId, LockType.WRITE);
- Utils.unreserveNamespace(manager, namespaceId, fateId, LockType.READ);
+ Utils.unreserveTable(manager.getContext(), tableId, fateId,
LockType.WRITE);
+ Utils.unreserveNamespace(manager.getContext(), namespaceId, fateId,
LockType.READ);
}
LoggerFactory.getLogger(RenameTable.class).debug("Renamed table {} {} {}",
tableId,
@@ -80,8 +81,8 @@ public class RenameTable extends ManagerRepo {
@Override
public void undo(FateId fateId, Manager env) {
- Utils.unreserveTable(env, tableId, fateId, LockType.WRITE);
- Utils.unreserveNamespace(env, namespaceId, fateId, LockType.READ);
+ Utils.unreserveTable(env.getContext(), tableId, fateId, LockType.WRITE);
+ Utils.unreserveNamespace(env.getContext(), namespaceId, fateId,
LockType.READ);
}
}
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableExport/ExportTable.java
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableExport/ExportTable.java
index 36a766c098..d7ffed9d85 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableExport/ExportTable.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableExport/ExportTable.java
@@ -42,8 +42,8 @@ public class ExportTable extends ManagerRepo {
@Override
public long isReady(FateId fateId, Manager environment) throws Exception {
- return Utils.reserveHdfsDirectory(environment, new
Path(tableInfo.exportDir).toString(),
- fateId);
+ return Utils.reserveHdfsDirectory(environment.getContext(),
+ new Path(tableInfo.exportDir).toString(), fateId);
}
@Override
@@ -53,7 +53,8 @@ public class ExportTable extends ManagerRepo {
@Override
public void undo(FateId fateId, Manager env) throws Exception {
- Utils.unreserveHdfsDirectory(env, new
Path(tableInfo.exportDir).toString(), fateId);
+ String directory = new Path(tableInfo.exportDir).toString();
+ Utils.unreserveHdfsDirectory(env.getContext(), directory, fateId);
}
/**
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableExport/WriteExportFiles.java
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableExport/WriteExportFiles.java
index 8eca315bf4..baea32fa68 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableExport/WriteExportFiles.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableExport/WriteExportFiles.java
@@ -94,9 +94,9 @@ class WriteExportFiles extends ManagerRepo {
@Override
public long isReady(FateId fateId, Manager manager) throws Exception {
- long reserved = Utils.reserveNamespace(manager, tableInfo.namespaceID,
fateId, LockType.READ,
- true, TableOperation.EXPORT)
- + Utils.reserveTable(manager, tableInfo.tableID, fateId,
LockType.READ, true,
+ long reserved = Utils.reserveNamespace(manager.getContext(),
tableInfo.namespaceID, fateId,
+ LockType.READ, true, TableOperation.EXPORT)
+ + Utils.reserveTable(manager.getContext(), tableInfo.tableID, fateId,
LockType.READ, true,
TableOperation.EXPORT);
if (reserved > 0) {
return reserved;
@@ -144,16 +144,17 @@ class WriteExportFiles extends ManagerRepo {
tableInfo.tableName, TableOperation.EXPORT,
TableOperationExceptionType.OTHER,
"Failed to create export files " + ioe.getMessage());
}
- Utils.unreserveNamespace(manager, tableInfo.namespaceID, fateId,
LockType.READ);
- Utils.unreserveTable(manager, tableInfo.tableID, fateId, LockType.READ);
- Utils.unreserveHdfsDirectory(manager, new
Path(tableInfo.exportDir).toString(), fateId);
+ Utils.unreserveNamespace(manager.getContext(), tableInfo.namespaceID,
fateId, LockType.READ);
+ Utils.unreserveTable(manager.getContext(), tableInfo.tableID, fateId,
LockType.READ);
+ Utils.unreserveHdfsDirectory(manager.getContext(), new
Path(tableInfo.exportDir).toString(),
+ fateId);
return null;
}
@Override
public void undo(FateId fateId, Manager env) {
- Utils.unreserveNamespace(env, tableInfo.namespaceID, fateId,
LockType.READ);
- Utils.unreserveTable(env, tableInfo.tableID, fateId, LockType.READ);
+ Utils.unreserveNamespace(env.getContext(), tableInfo.namespaceID, fateId,
LockType.READ);
+ Utils.unreserveTable(env.getContext(), tableInfo.tableID, fateId,
LockType.READ);
}
public static void exportTable(VolumeManager fs, ServerContext context,
String tableName,
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/FinishImportTable.java
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/FinishImportTable.java
index 707f708e3d..d7262add9e 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/FinishImportTable.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/FinishImportTable.java
@@ -60,11 +60,11 @@ class FinishImportTable extends ManagerRepo {
final TableState newState = tableInfo.keepOffline ? TableState.OFFLINE :
TableState.ONLINE;
env.getTableManager().transitionTableState(tableInfo.tableId, newState,
expectedCurrStates);
- Utils.unreserveNamespace(env, tableInfo.namespaceId, fateId,
LockType.READ);
- Utils.unreserveTable(env, tableInfo.tableId, fateId, LockType.WRITE);
+ Utils.unreserveNamespace(env.getContext(), tableInfo.namespaceId, fateId,
LockType.READ);
+ Utils.unreserveTable(env.getContext(), tableInfo.tableId, fateId,
LockType.WRITE);
for (ImportedTableInfo.DirectoryMapping dm : tableInfo.directories) {
- Utils.unreserveHdfsDirectory(env, new Path(dm.exportDir).toString(),
fateId);
+ Utils.unreserveHdfsDirectory(env.getContext(), new
Path(dm.exportDir).toString(), fateId);
}
env.getEventCoordinator().event(tableInfo.tableId, "Imported table %s ",
tableInfo.tableName);
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/ImportPopulateZookeeper.java
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/ImportPopulateZookeeper.java
index 6ec3a13d44..c177630cc2 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/ImportPopulateZookeeper.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/ImportPopulateZookeeper.java
@@ -49,8 +49,8 @@ class ImportPopulateZookeeper extends ManagerRepo {
@Override
public long isReady(FateId fateId, Manager environment) throws Exception {
- return Utils.reserveTable(environment, tableInfo.tableId, fateId,
LockType.WRITE, false,
- TableOperation.IMPORT);
+ return Utils.reserveTable(environment.getContext(), tableInfo.tableId,
fateId, LockType.WRITE,
+ false, TableOperation.IMPORT);
}
private Map<String,String> getExportedProps(VolumeManager fs) throws
Exception {
@@ -95,7 +95,7 @@ class ImportPopulateZookeeper extends ManagerRepo {
public void undo(FateId fateId, Manager env) throws Exception {
var context = env.getContext();
env.getTableManager().removeTable(tableInfo.tableId,
tableInfo.namespaceId);
- Utils.unreserveTable(env, tableInfo.tableId, fateId, LockType.WRITE);
+ Utils.unreserveTable(env.getContext(), tableInfo.tableId, fateId,
LockType.WRITE);
context.clearTableListCache();
}
}
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/ImportTable.java
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/ImportTable.java
index 6ab0a39b76..d92a27cf2d 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/ImportTable.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/ImportTable.java
@@ -79,10 +79,11 @@ public class ImportTable extends ManagerRepo {
public long isReady(FateId fateId, Manager environment) throws Exception {
long result = 0;
for (ImportedTableInfo.DirectoryMapping dm : tableInfo.directories) {
- result += Utils.reserveHdfsDirectory(environment, new
Path(dm.exportDir).toString(), fateId);
+ result += Utils.reserveHdfsDirectory(environment.getContext(),
+ new Path(dm.exportDir).toString(), fateId);
}
- result += Utils.reserveNamespace(environment, tableInfo.namespaceId,
fateId, LockType.READ,
- true, TableOperation.IMPORT);
+ result += Utils.reserveNamespace(environment.getContext(),
tableInfo.namespaceId, fateId,
+ LockType.READ, true, TableOperation.IMPORT);
return result;
}
@@ -157,10 +158,10 @@ public class ImportTable extends ManagerRepo {
@Override
public void undo(FateId fateId, Manager env) throws Exception {
for (ImportedTableInfo.DirectoryMapping dm : tableInfo.directories) {
- Utils.unreserveHdfsDirectory(env, new Path(dm.exportDir).toString(),
fateId);
+ Utils.unreserveHdfsDirectory(env.getContext(), new
Path(dm.exportDir).toString(), fateId);
}
- Utils.unreserveNamespace(env, tableInfo.namespaceId, fateId,
LockType.READ);
+ Utils.unreserveNamespace(env.getContext(), tableInfo.namespaceId, fateId,
LockType.READ);
}
static List<ImportedTableInfo.DirectoryMapping> parseExportDir(Set<String>
exportDirs) {
