You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by kt...@apache.org on 2017/01/30 20:25:36 UTC
[4/4] accumulo git commit: Merge branch '1.8'
Merge branch '1.8'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/96827a57
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/96827a57
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/96827a57
Branch: refs/heads/master
Commit: 96827a57e14aef7fd2f5765c69aa101212155a9a
Parents: adb2625 1f31ca6
Author: Keith Turner <kt...@apache.org>
Authored: Mon Jan 30 15:21:34 2017 -0500
Committer: Keith Turner <kt...@apache.org>
Committed: Mon Jan 30 15:21:34 2017 -0500
----------------------------------------------------------------------
.../org/apache/accumulo/fate/AdminUtil.java | 72 ++++++++++++++++----
.../master/tableOps/CancelCompactions.java | 2 +-
.../master/tableOps/FinishCancelCompaction.java | 7 +-
.../apache/accumulo/test/TableOperationsIT.java | 7 ++
.../accumulo/test/UserCompactionStrategyIT.java | 6 ++
.../functional/ConcurrentDeleteTableIT.java | 34 +--------
.../test/functional/FateStarvationIT.java | 2 +
.../test/functional/FunctionalTestUtils.java | 30 ++++++++
.../accumulo/test/functional/RenameIT.java | 2 +
9 files changed, 113 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/96827a57/server/master/src/main/java/org/apache/accumulo/master/tableOps/CancelCompactions.java
----------------------------------------------------------------------
diff --cc server/master/src/main/java/org/apache/accumulo/master/tableOps/CancelCompactions.java
index 0377de6,42d2699..73d67b1
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CancelCompactions.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CancelCompactions.java
@@@ -69,7 -73,7 +69,7 @@@ public class CancelCompactions extends
}
});
- return new FinishCancelCompaction(tableId);
- return new FinishCancelCompaction(getNamespaceId(environment), tableId);
++ return new FinishCancelCompaction(namespaceId, tableId);
}
@Override
http://git-wip-us.apache.org/repos/asf/accumulo/blob/96827a57/server/master/src/main/java/org/apache/accumulo/master/tableOps/FinishCancelCompaction.java
----------------------------------------------------------------------
diff --cc server/master/src/main/java/org/apache/accumulo/master/tableOps/FinishCancelCompaction.java
index 45fc8df,2bb34d2..6ac60b7
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/FinishCancelCompaction.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/FinishCancelCompaction.java
@@@ -22,14 -23,21 +22,17 @@@ import org.apache.accumulo.master.Maste
class FinishCancelCompaction extends MasterRepo {
private static final long serialVersionUID = 1L;
private String tableId;
+ private String namespaceId;
- public FinishCancelCompaction(String tableId) {
- private String getNamespaceId(Master env) throws Exception {
- return Utils.getNamespaceId(env.getInstance(), tableId, TableOperation.COMPACT_CANCEL, this.namespaceId);
- }
-
+ public FinishCancelCompaction(String namespaceId, String tableId) {
this.tableId = tableId;
+ this.namespaceId = namespaceId;
}
@Override
public Repo<Master> call(long tid, Master environment) throws Exception {
- Utils.getReadLock(tableId, tid).unlock();
+ Utils.unreserveTable(tableId, tid, false);
- Utils.unreserveNamespace(getNamespaceId(environment), tid, false);
++ Utils.unreserveNamespace(namespaceId, tid, false);
return null;
}