Skip to content

Fixes the shell fate delete command #6051

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ddanielr wants to merge 2 commits into
base: 2.1
Choose a base branch
from
+7 −5
Open

Fixes the shell fate delete command #6051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47bcfb2
Fixes the shell fate delete command
ddanielr Jan 12, 2026
4229f04
fix-formatting
ddanielr Jan 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions shell/src/main/java/org/apache/accumulo/shell/commands/FateCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,8 @@ public int execute(final String fullCommand, final CommandLine cl, final Shell s
} else if (cl.hasOption(delete.getOpt())) {
String[] txids = cl.getOptionValues(delete.getOpt());
validateArgs(txids);
failedCommand = deleteTx(shellState.getWriter(), admin, zs, zk, managerLockPath, txids);
failedCommand =
deleteTx(shellState.getWriter(), admin, zs, zk, managerLockPath, tableLocksPath, txids);
} else if (cl.hasOption(list.getOpt())) {
printTx(shellState, admin, zs, zk, tableLocksPath, cl.getOptionValues(list.getOpt()), cl);
} else if (cl.hasOption(print.getOpt())) {
Expand Down Expand Up @@ -237,11 +238,11 @@ protected void printTx(Shell shellState, AdminUtil<FateCommand> admin, ZooStore<
}

protected boolean deleteTx(PrintWriter out, AdminUtil<FateCommand> admin,
ZooStore<FateCommand> zs, ZooReaderWriter zk, ServiceLockPath zLockManagerPath, String[] args)
throws InterruptedException, KeeperException {
ZooStore<FateCommand> zs, ZooReaderWriter zk, ServiceLockPath zLockManagerPath,
ServiceLockPath zTableLocksPath, String[] args) throws InterruptedException, KeeperException {
for (int i = 1; i < args.length; i++) {
if (admin.prepDelete(zs, zk, zLockManagerPath, args[i])) {
admin.deleteLocks(zk, zLockManagerPath, args[i]);
admin.deleteLocks(zk, zTableLocksPath, args[i]);
} else {
out.printf("Could not delete transaction: %s%n", args[i]);
return false;
Expand Down
3 changes: 2 additions & 1 deletion shell/src/test/java/org/apache/accumulo/shell/commands/FateCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,8 @@ String dumpTx(ZooStore<FateCommand> zs, String[] args) {
@Override
protected boolean deleteTx(PrintWriter out, AdminUtil<FateCommand> admin,
ZooStore<FateCommand> zs, ZooReaderWriter zk, ServiceLockPath zLockManagerPath,
String[] args) throws InterruptedException, KeeperException {
ServiceLockPath zTableLocksPath, String[] args)
throws InterruptedException, KeeperException {
deleteCalled = true;
return true;
}
Expand Down