diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/FateCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/FateCommand.java index 881b2f99a11..82f9366748c 100644 --- a/shell/src/main/java/org/apache/accumulo/shell/commands/FateCommand.java +++ b/shell/src/main/java/org/apache/accumulo/shell/commands/FateCommand.java @@ -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())) { @@ -237,11 +238,11 @@ protected void printTx(Shell shellState, AdminUtil admin, ZooStore< } protected boolean deleteTx(PrintWriter out, AdminUtil admin, - ZooStore zs, ZooReaderWriter zk, ServiceLockPath zLockManagerPath, String[] args) - throws InterruptedException, KeeperException { + ZooStore 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; diff --git a/shell/src/test/java/org/apache/accumulo/shell/commands/FateCommandTest.java b/shell/src/test/java/org/apache/accumulo/shell/commands/FateCommandTest.java index 2419cbf9d82..fc02a83d82a 100644 --- a/shell/src/test/java/org/apache/accumulo/shell/commands/FateCommandTest.java +++ b/shell/src/test/java/org/apache/accumulo/shell/commands/FateCommandTest.java @@ -100,7 +100,8 @@ String dumpTx(ZooStore zs, String[] args) { @Override protected boolean deleteTx(PrintWriter out, AdminUtil admin, ZooStore zs, ZooReaderWriter zk, ServiceLockPath zLockManagerPath, - String[] args) throws InterruptedException, KeeperException { + ServiceLockPath zTableLocksPath, String[] args) + throws InterruptedException, KeeperException { deleteCalled = true; return true; }