Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8459de59 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8459de59 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8459de59 Branch: refs/heads/master Commit: 8459de5907fc366bb30ab4f75f6cf227c3400c71 Parents: a8c3587 8eeab8a Author: Eric C. Newton <[email protected]> Authored: Tue Feb 24 15:35:23 2015 -0500 Committer: Eric C. Newton <[email protected]> Committed: Tue Feb 24 15:35:23 2015 -0500 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/core/rpc/ThriftUtil.java | 8 +++++++- .../src/main/java/org/apache/accumulo/master/Master.java | 6 +++++- .../org/apache/accumulo/master/tableOps/DeleteTable.java | 8 -------- .../test/java/org/apache/accumulo/test/WaitForBalanceIT.java | 7 ++++++- 4 files changed, 18 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/8459de59/server/master/src/main/java/org/apache/accumulo/master/Master.java ---------------------------------------------------------------------- diff --cc server/master/src/main/java/org/apache/accumulo/master/Master.java index 562c584,9277d8b..16cdd54 --- a/server/master/src/main/java/org/apache/accumulo/master/Master.java +++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java @@@ -1535,13 -1534,10 +1535,17 @@@ public class Master extends AccumuloSer @Override public Collection<KeyExtent> migrations() { - return migrations.keySet(); + Set<KeyExtent> migrationKeys = new HashSet<KeyExtent>(); + synchronized (migrations) { + migrationKeys.addAll(migrations.keySet()); + } + return migrationKeys; } + + @Override + public Set<TServerInstance> shutdownServers() { + synchronized (serversToShutdown) { + return new HashSet<TServerInstance>(serversToShutdown); + } + } }
