accumulo git commit: ACCUMULO-4124 run sub-jobs in local mode

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/master 7be2f04e5 -> b4cd908a3


ACCUMULO-4124 run sub-jobs in local mode


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b4cd908a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b4cd908a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b4cd908a

Branch: refs/heads/master
Commit: b4cd908a3cef731b0d7154b94097c7ce0eea4e09
Parents: 7be2f04
Author: Eric C. Newton 
Authored: Tue Feb 2 15:27:30 2016 -0500
Committer: Eric C. Newton 
Committed: Tue Feb 2 15:27:30 2016 -0500

--
 .../accumulo/test/examples/simple/filedata/ChunkInputFormatIT.java  | 1 +
 .../org/apache/accumulo/test/mapred/AccumuloFileOutputFormatIT.java | 1 +
 .../java/org/apache/accumulo/test/mapred/AccumuloInputFormatIT.java | 1 +
 .../accumulo/test/mapred/AccumuloMultiTableInputFormatIT.java   | 1 +
 .../org/apache/accumulo/test/mapred/AccumuloOutputFormatIT.java | 1 +
 .../org/apache/accumulo/test/mapred/AccumuloRowInputFormatIT.java   | 1 +
 test/src/main/java/org/apache/accumulo/test/mapred/TokenFileIT.java | 1 +
 .../apache/accumulo/test/mapreduce/AccumuloFileOutputFormatIT.java  | 1 +
 .../org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java   | 1 +
 .../accumulo/test/mapreduce/AccumuloMultiTableInputFormatIT.java| 1 +
 .../org/apache/accumulo/test/mapreduce/AccumuloOutputFormatIT.java  | 1 +
 .../apache/accumulo/test/mapreduce/AccumuloRowInputFormatIT.java| 1 +
 .../main/java/org/apache/accumulo/test/mapreduce/TokenFileIT.java   | 1 +
 13 files changed, 13 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/b4cd908a/test/src/main/java/org/apache/accumulo/test/examples/simple/filedata/ChunkInputFormatIT.java
--
diff --git 
a/test/src/main/java/org/apache/accumulo/test/examples/simple/filedata/ChunkInputFormatIT.java
 
b/test/src/main/java/org/apache/accumulo/test/examples/simple/filedata/ChunkInputFormatIT.java
index b2b6aff..69d30af 100644
--- 
a/test/src/main/java/org/apache/accumulo/test/examples/simple/filedata/ChunkInputFormatIT.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/examples/simple/filedata/ChunkInputFormatIT.java
@@ -260,6 +260,7 @@ public class ChunkInputFormatIT extends 
AccumuloClusterHarness {
 
 public static int main(String... args) throws Exception {
   Configuration conf = new Configuration();
+  conf.set("mapreduce.framework.name", "local");
   conf.set("mapreduce.cluster.local.dir", new 
File(System.getProperty("user.dir"), "target/mapreduce-tmp").getAbsolutePath());
   return ToolRunner.run(conf, new CIFTester(), args);
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b4cd908a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloFileOutputFormatIT.java
--
diff --git 
a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloFileOutputFormatIT.java
 
b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloFileOutputFormatIT.java
index dd085cc..fda3713 100644
--- 
a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloFileOutputFormatIT.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloFileOutputFormatIT.java
@@ -166,6 +166,7 @@ public class AccumuloFileOutputFormatIT extends 
AccumuloClusterHarness {
 
 public static void main(String[] args) throws Exception {
   Configuration conf = new Configuration();
+  conf.set("mapreduce.framework.name", "local");
   conf.set("mapreduce.cluster.local.dir", new 
File(System.getProperty("user.dir"), "target/mapreduce-tmp").getAbsolutePath());
   assertEquals(0, ToolRunner.run(conf, new MRTester(), args));
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b4cd908a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloInputFormatIT.java
--
diff --git 
a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloInputFormatIT.java 
b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloInputFormatIT.java
index cd80139..2a15041 100644
--- 
a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloInputFormatIT.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloInputFormatIT.java
@@ -142,6 +142,7 @@ public class AccumuloInputFormatIT extends 
AccumuloClusterHarness {
 
 public static void main(String... args) throws Exception {
   Configuration conf = new Configuration();
+  conf.set("mapreduce.framework.name", "local");
   conf.set("mapreduce.cluster.local.dir", new 
File(System.getProperty("user.dir"), "target/mapreduce-tmp").getAbsolutePath());
 

accumulo git commit: ACCUMULO-4123 increment the counters properly

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/master f1523abd5 -> 24ee37f90


ACCUMULO-4123 increment the counters properly


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/24ee37f9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/24ee37f9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/24ee37f9

Branch: refs/heads/master
Commit: 24ee37f90417b88f791c1d3b395cc8ad479e01ba
Parents: f1523ab
Author: Eric C. Newton 
Authored: Tue Feb 2 10:39:29 2016 -0500
Committer: Eric C. Newton 
Committed: Tue Feb 2 10:39:29 2016 -0500

--
 .../apache/accumulo/test/mrit/IntegrationTestMapReduce.java| 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/24ee37f9/test/src/main/java/org/apache/accumulo/test/mrit/IntegrationTestMapReduce.java
--
diff --git 
a/test/src/main/java/org/apache/accumulo/test/mrit/IntegrationTestMapReduce.java
 
b/test/src/main/java/org/apache/accumulo/test/mrit/IntegrationTestMapReduce.java
index 62b82c9..ee8d7b3 100644
--- 
a/test/src/main/java/org/apache/accumulo/test/mrit/IntegrationTestMapReduce.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/mrit/IntegrationTestMapReduce.java
@@ -103,7 +103,7 @@ public class IntegrationTestMapReduce extends Configured 
implements Tool {
 test = Class.forName(className);
   } catch (ClassNotFoundException e) {
 log.debug("Error finding class {}", className, e);
-context.getCounter(TestCounts.ERROR);
+context.getCounter(TestCounts.ERROR).increment(1);
 context.write(ERROR, new Text(e.toString()));
 return;
   }
@@ -136,11 +136,11 @@ public class IntegrationTestMapReduce extends Configured 
implements Tool {
 Result result = core.run(test);
 if (result.wasSuccessful()) {
   log.info("{} was successful", className);
-  context.getCounter(TestCounts.PASS);
+  context.getCounter(TestCounts.PASS).increment(1);
   context.write(PASS, value);
 } else {
   log.info("{} failed", className);
-  context.getCounter(TestCounts.FAIL);
+  context.getCounter(TestCounts.FAIL).increment(1);
   context.write(FAIL, new Text(className + "(" + 
StringUtils.join(failures, ", ") + ")"));
 }
   } catch (Exception e) {

accumulo git commit: ACCUMULO-4125 keep easymock in the mrit jar

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/master 24ee37f90 -> 7be2f04e5


ACCUMULO-4125 keep easymock in the mrit jar


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7be2f04e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7be2f04e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7be2f04e

Branch: refs/heads/master
Commit: 7be2f04e57b4b1cee4699224fd51ae8e382e9737
Parents: 24ee37f
Author: Eric C. Newton 
Authored: Tue Feb 2 12:39:55 2016 -0500
Committer: Eric C. Newton 
Committed: Tue Feb 2 12:39:55 2016 -0500

--
 test/pom.xml | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/7be2f04e/test/pom.xml
--
diff --git a/test/pom.xml b/test/pom.xml
index 196d500..e78a9c1 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -373,7 +373,6 @@
   com.google.auto
   javax.servlet:servlet-api
   org.apache.accumulo:accumulo-native
-  org.easymock
   org.slf4j:slf4j-log4j12
 
   

[1/2] accumulo git commit: ACCUMULO-4122 fix typo

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/1.7 5596b016c -> 6cc5ab56b


ACCUMULO-4122 fix typo


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a95127d1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a95127d1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a95127d1

Branch: refs/heads/1.7
Commit: a95127d1d0e989d4c955a009f8cbaf4aaed3903c
Parents: 8c5607e
Author: Eric C. Newton 
Authored: Mon Feb 1 14:29:24 2016 -0500
Committer: Eric C. Newton 
Committed: Mon Feb 1 14:29:24 2016 -0500

--
 .../org/apache/accumulo/test/functional/GarbageCollectorIT.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a95127d1/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
--
diff --git 
a/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
 
b/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
index d5b92cf..b7f3396 100644
--- 
a/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
+++ 
b/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
@@ -208,7 +208,7 @@ public class GarbageCollectorIT extends ConfigurableMacIT {
 Process gc = cluster.exec(SimpleGarbageCollector.class);
 try {
   String output = "";
-  while (!output.contains("Ingoring invalid deletion candidate")) {
+  while (!output.contains("Ignoring invalid deletion candidate")) {
 UtilWaitThread.sleep(250);
 try {
   output = FunctionalTestUtils.readAll(cluster, 
SimpleGarbageCollector.class, gc);

[3/3] accumulo git commit: ACCUMULO-4122 fix typo

[ecn]

ACCUMULO-4122 fix typo


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f1523abd
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f1523abd
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f1523abd

Branch: refs/heads/master
Commit: f1523abd53ce20a3ffbd21bbe1f14caac13728e0
Parents: fed5dd5 6cc5ab5
Author: Eric C. Newton 
Authored: Mon Feb 1 14:30:23 2016 -0500
Committer: Eric C. Newton 
Committed: Mon Feb 1 14:30:23 2016 -0500

--
 .../org/apache/accumulo/test/functional/GarbageCollectorIT.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/f1523abd/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
--
diff --cc 
test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
index 25e541b,000..12607a5
mode 100644,00..100644
--- 
a/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
@@@ -1,309 -1,0 +1,309 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one or more
 + * contributor license agreements.  See the NOTICE file distributed with
 + * this work for additional information regarding copyright ownership.
 + * The ASF licenses this file to You under the Apache License, Version 2.0
 + * (the "License"); you may not use this file except in compliance with
 + * the License.  You may obtain a copy of the License at
 + *
 + * http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an "AS IS" BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + */
 +package org.apache.accumulo.test.functional;
 +
 +import static java.nio.charset.StandardCharsets.UTF_8;
 +import static org.junit.Assert.assertNull;
 +import static org.junit.Assert.assertTrue;
 +
 +import java.io.IOException;
 +import java.util.Arrays;
 +import java.util.Collections;
 +import java.util.Iterator;
 +import java.util.List;
 +import java.util.Map.Entry;
 +import java.util.concurrent.TimeUnit;
 +
 +import org.apache.accumulo.core.Constants;
 +import org.apache.accumulo.core.cli.BatchWriterOpts;
 +import org.apache.accumulo.core.cli.ScannerOpts;
 +import org.apache.accumulo.core.client.BatchWriter;
 +import org.apache.accumulo.core.client.BatchWriterConfig;
 +import org.apache.accumulo.core.client.Connector;
 +import org.apache.accumulo.core.client.Instance;
 +import org.apache.accumulo.core.client.Scanner;
 +import org.apache.accumulo.core.client.ZooKeeperInstance;
 +import org.apache.accumulo.core.conf.Property;
 +import org.apache.accumulo.core.data.Key;
 +import org.apache.accumulo.core.data.Mutation;
 +import org.apache.accumulo.core.data.Value;
 +import org.apache.accumulo.core.metadata.MetadataTable;
 +import org.apache.accumulo.core.metadata.schema.MetadataSchema;
 +import org.apache.accumulo.core.security.Authorizations;
 +import org.apache.accumulo.core.security.TablePermission;
 +import org.apache.accumulo.core.util.ServerServices;
 +import org.apache.accumulo.core.util.ServerServices.Service;
 +import org.apache.accumulo.core.zookeeper.ZooUtil;
 +import org.apache.accumulo.fate.zookeeper.ZooLock;
 +import org.apache.accumulo.gc.SimpleGarbageCollector;
 +import org.apache.accumulo.minicluster.MemoryUnit;
 +import org.apache.accumulo.minicluster.ServerType;
 +import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl;
 +import org.apache.accumulo.minicluster.impl.ProcessNotFoundException;
 +import org.apache.accumulo.minicluster.impl.ProcessReference;
 +import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
 +import org.apache.accumulo.test.TestIngest;
 +import org.apache.accumulo.test.VerifyIngest;
 +import org.apache.hadoop.conf.Configuration;
 +import org.apache.hadoop.fs.Path;
 +import org.apache.hadoop.fs.RawLocalFileSystem;
 +import org.apache.hadoop.io.Text;
 +import org.apache.zookeeper.KeeperException;
 +import org.apache.zookeeper.KeeperException.NoNodeException;
 +import org.junit.Assert;
 +import org.junit.Test;
 +
 +import com.google.common.collect.Iterators;
 +import static 
com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
 +
 +public class GarbageCollectorIT extends ConfigurableMacBase {
 +  private static final String OUR_SECRET = "itsreallysecret";
 +
 +  @Override
 +  public int defaultTimeoutSeconds() {
 +return 5 * 60;
 +  }
 +
 

[2/2] accumulo git commit: Merge branch '1.6' into 1.7

[ecn]

Merge branch '1.6' into 1.7


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6cc5ab56
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6cc5ab56
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6cc5ab56

Branch: refs/heads/1.7
Commit: 6cc5ab56bec23edb916dbc2a9b32cbef4ff8a4e1
Parents: 5596b01 a95127d
Author: Eric C. Newton 
Authored: Mon Feb 1 14:29:36 2016 -0500
Committer: Eric C. Newton 
Committed: Mon Feb 1 14:29:36 2016 -0500

--
 .../org/apache/accumulo/test/functional/GarbageCollectorIT.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/6cc5ab56/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
--

[1/3] accumulo git commit: ACCUMULO-4122 fix typo

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/master fed5dd50a -> f1523abd5


ACCUMULO-4122 fix typo


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a95127d1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a95127d1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a95127d1

Branch: refs/heads/master
Commit: a95127d1d0e989d4c955a009f8cbaf4aaed3903c
Parents: 8c5607e
Author: Eric C. Newton 
Authored: Mon Feb 1 14:29:24 2016 -0500
Committer: Eric C. Newton 
Committed: Mon Feb 1 14:29:24 2016 -0500

--
 .../org/apache/accumulo/test/functional/GarbageCollectorIT.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a95127d1/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
--
diff --git 
a/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
 
b/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
index d5b92cf..b7f3396 100644
--- 
a/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
+++ 
b/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
@@ -208,7 +208,7 @@ public class GarbageCollectorIT extends ConfigurableMacIT {
 Process gc = cluster.exec(SimpleGarbageCollector.class);
 try {
   String output = "";
-  while (!output.contains("Ingoring invalid deletion candidate")) {
+  while (!output.contains("Ignoring invalid deletion candidate")) {
 UtilWaitThread.sleep(250);
 try {
   output = FunctionalTestUtils.readAll(cluster, 
SimpleGarbageCollector.class, gc);

accumulo git commit: ACCUMULO-4122 fix typo

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/1.6 8c5607e2a -> a95127d1d


ACCUMULO-4122 fix typo


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a95127d1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a95127d1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a95127d1

Branch: refs/heads/1.6
Commit: a95127d1d0e989d4c955a009f8cbaf4aaed3903c
Parents: 8c5607e
Author: Eric C. Newton 
Authored: Mon Feb 1 14:29:24 2016 -0500
Committer: Eric C. Newton 
Committed: Mon Feb 1 14:29:24 2016 -0500

--
 .../org/apache/accumulo/test/functional/GarbageCollectorIT.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a95127d1/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
--
diff --git 
a/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
 
b/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
index d5b92cf..b7f3396 100644
--- 
a/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
+++ 
b/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
@@ -208,7 +208,7 @@ public class GarbageCollectorIT extends ConfigurableMacIT {
 Process gc = cluster.exec(SimpleGarbageCollector.class);
 try {
   String output = "";
-  while (!output.contains("Ingoring invalid deletion candidate")) {
+  while (!output.contains("Ignoring invalid deletion candidate")) {
 UtilWaitThread.sleep(250);
 try {
   output = FunctionalTestUtils.readAll(cluster, 
SimpleGarbageCollector.class, gc);

[2/2] accumulo git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo

[ecn]

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/fed5dd50
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fed5dd50
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fed5dd50

Branch: refs/heads/master
Commit: fed5dd50aecb9e7b602e0208ef6fae706b0b2619
Parents: d75e963 7a6b482
Author: Eric C. Newton 
Authored: Mon Feb 1 12:30:52 2016 -0500
Committer: Eric C. Newton 
Committed: Mon Feb 1 12:30:52 2016 -0500

--
 .gitignore  |   3 +
 assemble/.gitignore |   3 +
 assemble/pom.xml|   3 +
 core/.gitignore |   3 +
 core/pom.xml|   3 +
 .../core/client/impl/CompressedIterators.java   |  14 +-
 .../core/client/impl/ConditionalWriterImpl.java |  46 +-
 .../accumulo/core/iterators/IteratorUtil.java   |  89 +-
 .../client/impl/ConditionalComparatorTest.java  |  53 ++
 docs/.gitignore |   3 +
 examples/simple/.gitignore  |   3 +
 examples/simple/pom.xml |   3 +
 fate/.gitignore |   3 +
 maven-plugin/.gitignore |   3 +
 minicluster/.gitignore  |   3 +
 pom.xml |  12 ++
 proxy/.gitignore|   3 +
 server/base/.gitignore  |   3 +
 server/gc/.gitignore|   3 +
 server/master/.gitignore|   3 +
 server/monitor/.gitignore   |   3 +
 server/monitor/pom.xml  |   3 +
 server/native/.gitignore|   3 +
 server/tracer/.gitignore|   3 +
 server/tserver/.gitignore   |   3 +
 server/tserver/pom.xml  |   3 +
 .../tserver/ConditionCheckerContext.java| 164 +++
 .../apache/accumulo/tserver/TabletServer.java   |  79 +++--
 .../accumulo/tserver/tablet/ScanDataSource.java |  19 ++-
 .../apache/accumulo/tserver/tablet/Tablet.java  |  18 ++
 shell/.gitignore|   4 +-
 shell/pom.xml   |  17 ++
 start/.gitignore|   4 +-
 test/.gitignore |   4 +
 test/pom.xml|   3 +
 .../accumulo/test/ConditionalWriterIT.java  | 139 +++-
 trace/.gitignore|   3 +
 37 files changed, 614 insertions(+), 117 deletions(-)
--

[1/2] accumulo git commit: ACCUMULO-4117 work around THRIFT-3450

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/master 7a6b48203 -> fed5dd50a


ACCUMULO-4117 work around THRIFT-3450


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d75e963d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d75e963d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d75e963d

Branch: refs/heads/master
Commit: d75e963de130ab8fe2dc1622b5683c51b54b0102
Parents: 664012d
Author: Eric C. Newton 
Authored: Mon Feb 1 12:30:31 2016 -0500
Committer: Eric C. Newton 
Committed: Mon Feb 1 12:30:31 2016 -0500

--
 .../accumulo/core/rpc/SslConnectionParams.java  | 16 ++--
 1 file changed, 14 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/d75e963d/core/src/main/java/org/apache/accumulo/core/rpc/SslConnectionParams.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/rpc/SslConnectionParams.java 
b/core/src/main/java/org/apache/accumulo/core/rpc/SslConnectionParams.java
index f85ea10..017134e 100644
--- a/core/src/main/java/org/apache/accumulo/core/rpc/SslConnectionParams.java
+++ b/core/src/main/java/org/apache/accumulo/core/rpc/SslConnectionParams.java
@@ -209,12 +209,24 @@ public class SslConnectionParams {
 return trustStoreType;
   }
 
+  // Work around THRIFT-3450 ... fixed with b9641e094...
+  static class TSSLTransportParametersHack extends TSSLTransportParameters {
+TSSLTransportParametersHack(String clientProtocol) {
+  super(clientProtocol, new String[] {});
+  this.cipherSuites = null;
+}
+  }
+
   public TSSLTransportParameters getTTransportParams() {
 if (useJsse)
   throw new IllegalStateException("Cannot get TTransportParams for JSEE 
configuration.");
 
-// Null cipherSuites is implicitly handled
-TSSLTransportParameters params = new 
TSSLTransportParameters(clientProtocol, cipherSuites);
+TSSLTransportParameters params;
+if (cipherSuites != null) {
+  params = new TSSLTransportParameters(clientProtocol, cipherSuites);
+} else {
+  params = new TSSLTransportParametersHack(clientProtocol);
+}
 
 params.requireClientAuth(clientAuth);
 if (keyStoreSet) {

[1/2] accumulo git commit: ACCUMULO-4116 fix bad merge

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/master c3f596ead -> 664012d16


ACCUMULO-4116 fix bad merge


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bd9969f1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bd9969f1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bd9969f1

Branch: refs/heads/master
Commit: bd9969f1d14a0b719cd8454413231ab33d3b9a12
Parents: 9036325
Author: Eric C. Newton 
Authored: Wed Jan 27 11:36:46 2016 -0500
Committer: Eric C. Newton 
Committed: Wed Jan 27 11:36:46 2016 -0500

--
 test/system/continuous/run-moru.sh | 4 
 1 file changed, 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/bd9969f1/test/system/continuous/run-moru.sh
--
diff --git a/test/system/continuous/run-moru.sh 
b/test/system/continuous/run-moru.sh
index 9824f67..eb4403d 100755
--- a/test/system/continuous/run-moru.sh
+++ b/test/system/continuous/run-moru.sh
@@ -27,15 +27,11 @@ bin=$( cd -P "$( dirname "${SOURCE}" )" && pwd )
 script=$( basename "${SOURCE}" )
 # Stop: Resolve Script Directory
 
-<<< HEAD
-. "${bin}/mapred-setup.sh"
-===
 CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}}
 . $CONTINUOUS_CONF_DIR/continuous-env.sh
 . $ACCUMULO_CONF_DIR/accumulo-env.sh
 
 SERVER_LIBJAR="$ACCUMULO_HOME/lib/accumulo-test.jar"
->>> 1.6
 
 "$ACCUMULO_HOME/bin/tool.sh" "$SERVER_LIBJAR" 
org.apache.accumulo.test.continuous.ContinuousMoru -libjars "$SERVER_LIBJAR" -i 
"$INSTANCE_NAME" -z "$ZOO_KEEPERS" -u "$USER" -p "$PASS" --table "$TABLE" --min 
"$MIN" --max "$MAX" --maxColF "$MAX_CF" --maxColQ "$MAX_CQ" --batchMemory 
"$MAX_MEM" --batchLatency "$MAX_LATENCY" --batchThreads "$NUM_THREADS" 
--maxMappers "$VERIFY_MAX_MAPS"
 

[1/3] accumulo git commit: ACCUMULO-4116 inline mapred-setup.sh to use the more convenient vars computed by the script template

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/1.7 edaa44a5b -> bd9969f1d


ACCUMULO-4116 inline mapred-setup.sh to use the more convenient vars computed 
by the script template


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d3316b3c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d3316b3c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d3316b3c

Branch: refs/heads/1.7
Commit: d3316b3cfb229f58c8f88c988c47bcd7848967c2
Parents: d89846e
Author: Eric C. Newton 
Authored: Wed Jan 27 09:00:08 2016 -0500
Committer: Eric C. Newton 
Committed: Wed Jan 27 09:00:08 2016 -0500

--
 test/system/continuous/mapred-setup.sh | 25 -
 test/system/continuous/run-moru.sh |  6 +-
 test/system/continuous/run-verify.sh   |  6 +-
 3 files changed, 10 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3316b3c/test/system/continuous/mapred-setup.sh
--
diff --git a/test/system/continuous/mapred-setup.sh 
b/test/system/continuous/mapred-setup.sh
deleted file mode 100755
index e6bd2ca..000
--- a/test/system/continuous/mapred-setup.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /usr/bin/env bash
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# a little helper script that other scripts can source to setup 
-# for running a map reduce job
-
-CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-$ACCUMULO_HOME/test/system/continuous/}
-. $CONTINUOUS_CONF_DIR/continuous-env.sh
-. $ACCUMULO_CONF_DIR/accumulo-env.sh
-
-SERVER_LIBJAR="$ACCUMULO_HOME/lib/accumulo-test.jar"

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3316b3c/test/system/continuous/run-moru.sh
--
diff --git a/test/system/continuous/run-moru.sh 
b/test/system/continuous/run-moru.sh
index 3133b05..1c8d81a 100755
--- a/test/system/continuous/run-moru.sh
+++ b/test/system/continuous/run-moru.sh
@@ -27,7 +27,11 @@ bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )"
 script=$( basename "${SOURCE}" )
 # Stop: Resolve Script Directory
 
-. ${bin}/mapred-setup.sh
+CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}}
+. $CONTINUOUS_CONF_DIR/continuous-env.sh
+. $ACCUMULO_CONF_DIR/accumulo-env.sh
+
+SERVER_LIBJAR="$ACCUMULO_HOME/lib/accumulo-test.jar"
 
 $ACCUMULO_HOME/bin/tool.sh "$SERVER_LIBJAR" 
org.apache.accumulo.test.continuous.ContinuousMoru -libjars "$SERVER_LIBJAR" -i 
$INSTANCE_NAME -z $ZOO_KEEPERS -u $USER -p $PASS --table $TABLE --min $MIN 
--max $MAX --maxColF $MAX_CF --maxColQ $MAX_CQ --batchMemory $MAX_MEM 
--batchLatency $MAX_LATENCY --batchThreads $NUM_THREADS --maxMappers 
$VERIFY_MAX_MAPS
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3316b3c/test/system/continuous/run-verify.sh
--
diff --git a/test/system/continuous/run-verify.sh 
b/test/system/continuous/run-verify.sh
index 42eb214..bd4df66 100755
--- a/test/system/continuous/run-verify.sh
+++ b/test/system/continuous/run-verify.sh
@@ -27,7 +27,11 @@ bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )"
 script=$( basename "${SOURCE}" )
 # Stop: Resolve Script Directory
 
-. ${bin}/mapred-setup.sh
+CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}}
+. $CONTINUOUS_CONF_DIR/continuous-env.sh
+. $ACCUMULO_CONF_DIR/accumulo-env.sh
+
+SERVER_LIBJAR="$ACCUMULO_HOME/lib/accumulo-test.jar"
 
 AUTH_OPT="";
 

[2/3] accumulo git commit: ACCUMULO-4116 merge to 1.7

[ecn]

ACCUMULO-4116 merge to 1.7


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/90363259
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/90363259
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/90363259

Branch: refs/heads/1.7
Commit: 90363259d25c5ccc43c209041d2824a7699040e3
Parents: edaa44a d3316b3
Author: Eric C. Newton 
Authored: Wed Jan 27 09:01:37 2016 -0500
Committer: Eric C. Newton 
Committed: Wed Jan 27 09:01:37 2016 -0500

--
 test/system/continuous/mapred-setup.sh | 25 -
 test/system/continuous/run-moru.sh |  8 
 test/system/continuous/run-verify.sh   |  6 +-
 3 files changed, 13 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/90363259/test/system/continuous/run-moru.sh
--
diff --cc test/system/continuous/run-moru.sh
index f82d5f9,1c8d81a..9824f67
--- a/test/system/continuous/run-moru.sh
+++ b/test/system/continuous/run-moru.sh
@@@ -27,7 -27,11 +27,15 @@@ bin=$( cd -P "$( dirname "${SOURCE}" )
  script=$( basename "${SOURCE}" )
  # Stop: Resolve Script Directory
  
++<<< HEAD
 +. "${bin}/mapred-setup.sh"
++===
+ CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}}
+ . $CONTINUOUS_CONF_DIR/continuous-env.sh
+ . $ACCUMULO_CONF_DIR/accumulo-env.sh
+ 
+ SERVER_LIBJAR="$ACCUMULO_HOME/lib/accumulo-test.jar"
++>>> 1.6
  
 -$ACCUMULO_HOME/bin/tool.sh "$SERVER_LIBJAR" 
org.apache.accumulo.test.continuous.ContinuousMoru -libjars "$SERVER_LIBJAR" -i 
$INSTANCE_NAME -z $ZOO_KEEPERS -u $USER -p $PASS --table $TABLE --min $MIN 
--max $MAX --maxColF $MAX_CF --maxColQ $MAX_CQ --batchMemory $MAX_MEM 
--batchLatency $MAX_LATENCY --batchThreads $NUM_THREADS --maxMappers 
$VERIFY_MAX_MAPS
 +"$ACCUMULO_HOME/bin/tool.sh" "$SERVER_LIBJAR" 
org.apache.accumulo.test.continuous.ContinuousMoru -libjars "$SERVER_LIBJAR" -i 
"$INSTANCE_NAME" -z "$ZOO_KEEPERS" -u "$USER" -p "$PASS" --table "$TABLE" --min 
"$MIN" --max "$MAX" --maxColF "$MAX_CF" --maxColQ "$MAX_CQ" --batchMemory 
"$MAX_MEM" --batchLatency "$MAX_LATENCY" --batchThreads "$NUM_THREADS" 
--maxMappers "$VERIFY_MAX_MAPS"
  

http://git-wip-us.apache.org/repos/asf/accumulo/blob/90363259/test/system/continuous/run-verify.sh
--
diff --cc test/system/continuous/run-verify.sh
index c68c3ea,bd4df66..b163663
--- a/test/system/continuous/run-verify.sh
+++ b/test/system/continuous/run-verify.sh
@@@ -27,12 -27,20 +27,16 @@@ bin=$( cd -P "$( dirname "${SOURCE}" )
  script=$( basename "${SOURCE}" )
  # Stop: Resolve Script Directory
  
- . "${bin}/mapred-setup.sh"
+ CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}}
+ . $CONTINUOUS_CONF_DIR/continuous-env.sh
+ . $ACCUMULO_CONF_DIR/accumulo-env.sh
+ 
+ SERVER_LIBJAR="$ACCUMULO_HOME/lib/accumulo-test.jar"
  
  AUTH_OPT="";
 +[[ -n $VERIFY_AUTHS ]] && AUTH_OPT="--auths $VERIFY_AUTHS"
  
 -if [ -n "$VERIFY_AUTHS" ] ; then
 -  AUTH_OPT="--auths $VERIFY_AUTHS";
 -fi
  SCAN_OPT=--offline
 -if [ "$SCAN_OFFLINE" == "false" ] ; then
 -   SCAN_OPT=
 -fi
 +[[ $SCAN_OFFLINE == false ]] && SCAN_OPT=
  
 -$ACCUMULO_HOME/bin/tool.sh "$SERVER_LIBJAR" 
org.apache.accumulo.test.continuous.ContinuousVerify 
-Dmapreduce.job.reduce.slowstart.completedmaps=0.95 -libjars "$SERVER_LIBJAR" 
$AUTH_OPT -i $INSTANCE_NAME -z $ZOO_KEEPERS -u $USER -p $PASS --table $TABLE 
--output $VERIFY_OUT --maxMappers $VERIFY_MAX_MAPS --reducers $VERIFY_REDUCERS 
$SCAN_OPT
 +"$ACCUMULO_HOME/bin/tool.sh" "$SERVER_LIBJAR" 
org.apache.accumulo.test.continuous.ContinuousVerify 
-Dmapreduce.job.reduce.slowstart.completedmaps=0.95 -libjars "$SERVER_LIBJAR" 
"$AUTH_OPT" -i "$INSTANCE_NAME" -z "$ZOO_KEEPERS" -u "$USER" -p "$PASS" --table 
"$TABLE" --output "$VERIFY_OUT" --maxMappers "$VERIFY_MAX_MAPS" --reducers 
"$VERIFY_REDUCERS" "$SCAN_OPT"

[3/3] accumulo git commit: ACCUMULO-4116 fix bad merge

[ecn]

ACCUMULO-4116 fix bad merge


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bd9969f1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bd9969f1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bd9969f1

Branch: refs/heads/1.7
Commit: bd9969f1d14a0b719cd8454413231ab33d3b9a12
Parents: 9036325
Author: Eric C. Newton 
Authored: Wed Jan 27 11:36:46 2016 -0500
Committer: Eric C. Newton 
Committed: Wed Jan 27 11:36:46 2016 -0500

--
 test/system/continuous/run-moru.sh | 4 
 1 file changed, 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/bd9969f1/test/system/continuous/run-moru.sh
--
diff --git a/test/system/continuous/run-moru.sh 
b/test/system/continuous/run-moru.sh
index 9824f67..eb4403d 100755
--- a/test/system/continuous/run-moru.sh
+++ b/test/system/continuous/run-moru.sh
@@ -27,15 +27,11 @@ bin=$( cd -P "$( dirname "${SOURCE}" )" && pwd )
 script=$( basename "${SOURCE}" )
 # Stop: Resolve Script Directory
 
-<<< HEAD
-. "${bin}/mapred-setup.sh"
-===
 CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}}
 . $CONTINUOUS_CONF_DIR/continuous-env.sh
 . $ACCUMULO_CONF_DIR/accumulo-env.sh
 
 SERVER_LIBJAR="$ACCUMULO_HOME/lib/accumulo-test.jar"
->>> 1.6
 
 "$ACCUMULO_HOME/bin/tool.sh" "$SERVER_LIBJAR" 
org.apache.accumulo.test.continuous.ContinuousMoru -libjars "$SERVER_LIBJAR" -i 
"$INSTANCE_NAME" -z "$ZOO_KEEPERS" -u "$USER" -p "$PASS" --table "$TABLE" --min 
"$MIN" --max "$MAX" --maxColF "$MAX_CF" --maxColQ "$MAX_CQ" --batchMemory 
"$MAX_MEM" --batchLatency "$MAX_LATENCY" --batchThreads "$NUM_THREADS" 
--maxMappers "$VERIFY_MAX_MAPS"
 

accumulo git commit: ACCUMULO-4116 inline mapred-setup.sh to use the more convenient vars computed by the script template

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/1.6 d89846e8f -> d3316b3cf


ACCUMULO-4116 inline mapred-setup.sh to use the more convenient vars computed 
by the script template


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d3316b3c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d3316b3c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d3316b3c

Branch: refs/heads/1.6
Commit: d3316b3cfb229f58c8f88c988c47bcd7848967c2
Parents: d89846e
Author: Eric C. Newton 
Authored: Wed Jan 27 09:00:08 2016 -0500
Committer: Eric C. Newton 
Committed: Wed Jan 27 09:00:08 2016 -0500

--
 test/system/continuous/mapred-setup.sh | 25 -
 test/system/continuous/run-moru.sh |  6 +-
 test/system/continuous/run-verify.sh   |  6 +-
 3 files changed, 10 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3316b3c/test/system/continuous/mapred-setup.sh
--
diff --git a/test/system/continuous/mapred-setup.sh 
b/test/system/continuous/mapred-setup.sh
deleted file mode 100755
index e6bd2ca..000
--- a/test/system/continuous/mapred-setup.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /usr/bin/env bash
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# a little helper script that other scripts can source to setup 
-# for running a map reduce job
-
-CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-$ACCUMULO_HOME/test/system/continuous/}
-. $CONTINUOUS_CONF_DIR/continuous-env.sh
-. $ACCUMULO_CONF_DIR/accumulo-env.sh
-
-SERVER_LIBJAR="$ACCUMULO_HOME/lib/accumulo-test.jar"

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3316b3c/test/system/continuous/run-moru.sh
--
diff --git a/test/system/continuous/run-moru.sh 
b/test/system/continuous/run-moru.sh
index 3133b05..1c8d81a 100755
--- a/test/system/continuous/run-moru.sh
+++ b/test/system/continuous/run-moru.sh
@@ -27,7 +27,11 @@ bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )"
 script=$( basename "${SOURCE}" )
 # Stop: Resolve Script Directory
 
-. ${bin}/mapred-setup.sh
+CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}}
+. $CONTINUOUS_CONF_DIR/continuous-env.sh
+. $ACCUMULO_CONF_DIR/accumulo-env.sh
+
+SERVER_LIBJAR="$ACCUMULO_HOME/lib/accumulo-test.jar"
 
 $ACCUMULO_HOME/bin/tool.sh "$SERVER_LIBJAR" 
org.apache.accumulo.test.continuous.ContinuousMoru -libjars "$SERVER_LIBJAR" -i 
$INSTANCE_NAME -z $ZOO_KEEPERS -u $USER -p $PASS --table $TABLE --min $MIN 
--max $MAX --maxColF $MAX_CF --maxColQ $MAX_CQ --batchMemory $MAX_MEM 
--batchLatency $MAX_LATENCY --batchThreads $NUM_THREADS --maxMappers 
$VERIFY_MAX_MAPS
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3316b3c/test/system/continuous/run-verify.sh
--
diff --git a/test/system/continuous/run-verify.sh 
b/test/system/continuous/run-verify.sh
index 42eb214..bd4df66 100755
--- a/test/system/continuous/run-verify.sh
+++ b/test/system/continuous/run-verify.sh
@@ -27,7 +27,11 @@ bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )"
 script=$( basename "${SOURCE}" )
 # Stop: Resolve Script Directory
 
-. ${bin}/mapred-setup.sh
+CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}}
+. $CONTINUOUS_CONF_DIR/continuous-env.sh
+. $ACCUMULO_CONF_DIR/accumulo-env.sh
+
+SERVER_LIBJAR="$ACCUMULO_HOME/lib/accumulo-test.jar"
 
 AUTH_OPT="";
 

[2/2] accumulo git commit: Merge branch '1.7'

[ecn]

Merge branch '1.7'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/664012d1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/664012d1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/664012d1

Branch: refs/heads/master
Commit: 664012d1679e69b53fd663b840fabad53555c6f3
Parents: c3f596e bd9969f
Author: Eric C. Newton 
Authored: Wed Jan 27 11:37:01 2016 -0500
Committer: Eric C. Newton 
Committed: Wed Jan 27 11:37:01 2016 -0500

--
 test/system/continuous/run-moru.sh | 4 
 1 file changed, 4 deletions(-)
--

[3/3] accumulo git commit: Merge branch '1.7'

[ecn]

Merge branch '1.7'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c3f596ea
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c3f596ea
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c3f596ea

Branch: refs/heads/master
Commit: c3f596eadc0946eb55dc16575c6b9be8e63f214e
Parents: 2d99238 9036325
Author: Eric C. Newton 
Authored: Wed Jan 27 09:01:54 2016 -0500
Committer: Eric C. Newton 
Committed: Wed Jan 27 09:01:54 2016 -0500

--
 test/system/continuous/mapred-setup.sh | 25 -
 test/system/continuous/run-moru.sh |  8 
 test/system/continuous/run-verify.sh   |  6 +-
 3 files changed, 13 insertions(+), 26 deletions(-)
--

[1/3] accumulo git commit: ACCUMULO-4116 inline mapred-setup.sh to use the more convenient vars computed by the script template

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/master 2d99238d5 -> c3f596ead


ACCUMULO-4116 inline mapred-setup.sh to use the more convenient vars computed 
by the script template


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d3316b3c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d3316b3c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d3316b3c

Branch: refs/heads/master
Commit: d3316b3cfb229f58c8f88c988c47bcd7848967c2
Parents: d89846e
Author: Eric C. Newton 
Authored: Wed Jan 27 09:00:08 2016 -0500
Committer: Eric C. Newton 
Committed: Wed Jan 27 09:00:08 2016 -0500

--
 test/system/continuous/mapred-setup.sh | 25 -
 test/system/continuous/run-moru.sh |  6 +-
 test/system/continuous/run-verify.sh   |  6 +-
 3 files changed, 10 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3316b3c/test/system/continuous/mapred-setup.sh
--
diff --git a/test/system/continuous/mapred-setup.sh 
b/test/system/continuous/mapred-setup.sh
deleted file mode 100755
index e6bd2ca..000
--- a/test/system/continuous/mapred-setup.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /usr/bin/env bash
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# a little helper script that other scripts can source to setup 
-# for running a map reduce job
-
-CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-$ACCUMULO_HOME/test/system/continuous/}
-. $CONTINUOUS_CONF_DIR/continuous-env.sh
-. $ACCUMULO_CONF_DIR/accumulo-env.sh
-
-SERVER_LIBJAR="$ACCUMULO_HOME/lib/accumulo-test.jar"

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3316b3c/test/system/continuous/run-moru.sh
--
diff --git a/test/system/continuous/run-moru.sh 
b/test/system/continuous/run-moru.sh
index 3133b05..1c8d81a 100755
--- a/test/system/continuous/run-moru.sh
+++ b/test/system/continuous/run-moru.sh
@@ -27,7 +27,11 @@ bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )"
 script=$( basename "${SOURCE}" )
 # Stop: Resolve Script Directory
 
-. ${bin}/mapred-setup.sh
+CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}}
+. $CONTINUOUS_CONF_DIR/continuous-env.sh
+. $ACCUMULO_CONF_DIR/accumulo-env.sh
+
+SERVER_LIBJAR="$ACCUMULO_HOME/lib/accumulo-test.jar"
 
 $ACCUMULO_HOME/bin/tool.sh "$SERVER_LIBJAR" 
org.apache.accumulo.test.continuous.ContinuousMoru -libjars "$SERVER_LIBJAR" -i 
$INSTANCE_NAME -z $ZOO_KEEPERS -u $USER -p $PASS --table $TABLE --min $MIN 
--max $MAX --maxColF $MAX_CF --maxColQ $MAX_CQ --batchMemory $MAX_MEM 
--batchLatency $MAX_LATENCY --batchThreads $NUM_THREADS --maxMappers 
$VERIFY_MAX_MAPS
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3316b3c/test/system/continuous/run-verify.sh
--
diff --git a/test/system/continuous/run-verify.sh 
b/test/system/continuous/run-verify.sh
index 42eb214..bd4df66 100755
--- a/test/system/continuous/run-verify.sh
+++ b/test/system/continuous/run-verify.sh
@@ -27,7 +27,11 @@ bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )"
 script=$( basename "${SOURCE}" )
 # Stop: Resolve Script Directory
 
-. ${bin}/mapred-setup.sh
+CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}}
+. $CONTINUOUS_CONF_DIR/continuous-env.sh
+. $ACCUMULO_CONF_DIR/accumulo-env.sh
+
+SERVER_LIBJAR="$ACCUMULO_HOME/lib/accumulo-test.jar"
 
 AUTH_OPT="";
 

[2/3] accumulo git commit: ACCUMULO-4116 merge to 1.7

[ecn]

ACCUMULO-4116 merge to 1.7


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/90363259
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/90363259
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/90363259

Branch: refs/heads/master
Commit: 90363259d25c5ccc43c209041d2824a7699040e3
Parents: edaa44a d3316b3
Author: Eric C. Newton 
Authored: Wed Jan 27 09:01:37 2016 -0500
Committer: Eric C. Newton 
Committed: Wed Jan 27 09:01:37 2016 -0500

--
 test/system/continuous/mapred-setup.sh | 25 -
 test/system/continuous/run-moru.sh |  8 
 test/system/continuous/run-verify.sh   |  6 +-
 3 files changed, 13 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/90363259/test/system/continuous/run-moru.sh
--
diff --cc test/system/continuous/run-moru.sh
index f82d5f9,1c8d81a..9824f67
--- a/test/system/continuous/run-moru.sh
+++ b/test/system/continuous/run-moru.sh
@@@ -27,7 -27,11 +27,15 @@@ bin=$( cd -P "$( dirname "${SOURCE}" )
  script=$( basename "${SOURCE}" )
  # Stop: Resolve Script Directory
  
++<<< HEAD
 +. "${bin}/mapred-setup.sh"
++===
+ CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}}
+ . $CONTINUOUS_CONF_DIR/continuous-env.sh
+ . $ACCUMULO_CONF_DIR/accumulo-env.sh
+ 
+ SERVER_LIBJAR="$ACCUMULO_HOME/lib/accumulo-test.jar"
++>>> 1.6
  
 -$ACCUMULO_HOME/bin/tool.sh "$SERVER_LIBJAR" 
org.apache.accumulo.test.continuous.ContinuousMoru -libjars "$SERVER_LIBJAR" -i 
$INSTANCE_NAME -z $ZOO_KEEPERS -u $USER -p $PASS --table $TABLE --min $MIN 
--max $MAX --maxColF $MAX_CF --maxColQ $MAX_CQ --batchMemory $MAX_MEM 
--batchLatency $MAX_LATENCY --batchThreads $NUM_THREADS --maxMappers 
$VERIFY_MAX_MAPS
 +"$ACCUMULO_HOME/bin/tool.sh" "$SERVER_LIBJAR" 
org.apache.accumulo.test.continuous.ContinuousMoru -libjars "$SERVER_LIBJAR" -i 
"$INSTANCE_NAME" -z "$ZOO_KEEPERS" -u "$USER" -p "$PASS" --table "$TABLE" --min 
"$MIN" --max "$MAX" --maxColF "$MAX_CF" --maxColQ "$MAX_CQ" --batchMemory 
"$MAX_MEM" --batchLatency "$MAX_LATENCY" --batchThreads "$NUM_THREADS" 
--maxMappers "$VERIFY_MAX_MAPS"
  

http://git-wip-us.apache.org/repos/asf/accumulo/blob/90363259/test/system/continuous/run-verify.sh
--
diff --cc test/system/continuous/run-verify.sh
index c68c3ea,bd4df66..b163663
--- a/test/system/continuous/run-verify.sh
+++ b/test/system/continuous/run-verify.sh
@@@ -27,12 -27,20 +27,16 @@@ bin=$( cd -P "$( dirname "${SOURCE}" )
  script=$( basename "${SOURCE}" )
  # Stop: Resolve Script Directory
  
- . "${bin}/mapred-setup.sh"
+ CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}}
+ . $CONTINUOUS_CONF_DIR/continuous-env.sh
+ . $ACCUMULO_CONF_DIR/accumulo-env.sh
+ 
+ SERVER_LIBJAR="$ACCUMULO_HOME/lib/accumulo-test.jar"
  
  AUTH_OPT="";
 +[[ -n $VERIFY_AUTHS ]] && AUTH_OPT="--auths $VERIFY_AUTHS"
  
 -if [ -n "$VERIFY_AUTHS" ] ; then
 -  AUTH_OPT="--auths $VERIFY_AUTHS";
 -fi
  SCAN_OPT=--offline
 -if [ "$SCAN_OFFLINE" == "false" ] ; then
 -   SCAN_OPT=
 -fi
 +[[ $SCAN_OFFLINE == false ]] && SCAN_OPT=
  
 -$ACCUMULO_HOME/bin/tool.sh "$SERVER_LIBJAR" 
org.apache.accumulo.test.continuous.ContinuousVerify 
-Dmapreduce.job.reduce.slowstart.completedmaps=0.95 -libjars "$SERVER_LIBJAR" 
$AUTH_OPT -i $INSTANCE_NAME -z $ZOO_KEEPERS -u $USER -p $PASS --table $TABLE 
--output $VERIFY_OUT --maxMappers $VERIFY_MAX_MAPS --reducers $VERIFY_REDUCERS 
$SCAN_OPT
 +"$ACCUMULO_HOME/bin/tool.sh" "$SERVER_LIBJAR" 
org.apache.accumulo.test.continuous.ContinuousVerify 
-Dmapreduce.job.reduce.slowstart.completedmaps=0.95 -libjars "$SERVER_LIBJAR" 
"$AUTH_OPT" -i "$INSTANCE_NAME" -z "$ZOO_KEEPERS" -u "$USER" -p "$PASS" --table 
"$TABLE" --output "$VERIFY_OUT" --maxMappers "$VERIFY_MAX_MAPS" --reducers 
"$VERIFY_REDUCERS" "$SCAN_OPT"

[2/2] accumulo git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo

[ecn]

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/a12b3741
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a12b3741
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a12b3741

Branch: refs/heads/master
Commit: a12b3741a0703bd8ebeb5b8ff64aa7f21a9a
Parents: 497a884 e59649b
Author: Eric C. Newton 
Authored: Wed Jan 20 11:36:13 2016 -0500
Committer: Eric C. Newton 
Committed: Wed Jan 20 11:36:13 2016 -0500

--
 assemble/build.sh   |   4 +-
 .../core/bloomfilter/DynamicBloomFilter.java|   4 +-
 .../accumulo/core/client/BatchWriterConfig.java |  10 +-
 .../core/client/ConditionalWriterConfig.java|   4 +-
 .../accumulo/core/client/ScannerBase.java   |   2 -
 .../core/client/lexicoder/FloatLexicoder.java   |  61 +++
 .../client/mapred/AccumuloFileOutputFormat.java |   4 +-
 .../mapreduce/AccumuloFileOutputFormat.java |   4 +-
 .../lib/impl/FileOutputConfigurator.java|   4 +-
 .../lib/util/FileOutputConfigurator.java|   4 +-
 .../security/tokens/AuthenticationToken.java|   2 +-
 .../org/apache/accumulo/core/conf/Property.java |   6 +-
 .../core/constraints/VisibilityConstraint.java  |   1 -
 .../java/org/apache/accumulo/core/data/Key.java |   2 +-
 .../org/apache/accumulo/core/data/Range.java|   6 +-
 .../file/blockfile/cache/CachedBlockQueue.java  |   2 +-
 .../core/file/blockfile/cache/ClassSize.java|   4 +-
 .../file/blockfile/impl/CachableBlockFile.java  |   4 +-
 .../accumulo/core/file/rfile/bcfile/Utils.java  |  35 +-
 .../core/iterators/IteratorEnvironment.java |   2 -
 .../iterators/system/SynchronizedIterator.java  |   2 +-
 .../user/WholeColumnFamilyIterator.java |   4 +-
 .../core/metadata/ServicerForMetadataTable.java |   2 +-
 .../core/metadata/ServicerForRootTable.java |   2 +-
 .../core/metadata/ServicerForUserTables.java|   2 +-
 .../core/metadata/schema/MetadataSchema.java|   2 +-
 .../core/replication/ReplicationSchema.java |   6 +-
 .../accumulo/core/sample/RowColumnSampler.java  |   4 +-
 .../core/security/ColumnVisibility.java |   8 +-
 .../core/security/VisibilityEvaluator.java  |  60 ++-
 .../security/crypto/CryptoModuleParameters.java |   7 +-
 .../org/apache/accumulo/core/util/OpTimer.java  |   7 +-
 .../core/util/UnsynchronizedBuffer.java |   4 +-
 .../core/util/format/BinaryFormatter.java   |  41 +-
 .../core/util/format/DateFormatSupplier.java|  95 +
 .../core/util/format/DateStringFormatter.java   |  57 +--
 .../core/util/format/DefaultFormatter.java  |  99 +++--
 .../accumulo/core/util/format/Formatter.java|   2 +-
 .../core/util/format/FormatterConfig.java   | 115 ++
 .../core/util/format/FormatterFactory.java  |   8 +-
 .../accumulo/core/util/format/HexFormatter.java |   8 +-
 .../accumulo/core/conf/config-header.html   |  12 +-
 .../client/lexicoder/FloatLexicoderTest.java|  45 +++
 .../core/security/VisibilityEvaluatorTest.java  |  37 +-
 .../core/util/UnsynchronizedBufferTest.java |  56 +++
 .../util/format/DateFormatSupplierTest.java |  74 
 .../util/format/DateStringFormatterTest.java|  29 +-
 .../core/util/format/DefaultFormatterTest.java  |  62 ++-
 .../core/util/format/FormatterConfigTest.java   |  81 
 .../core/util/format/FormatterFactoryTest.java  |   5 +-
 .../core/util/format/HexFormatterTest.java  |   6 +-
 .../ShardedTableDistributionFormatterTest.java  |   4 +-
 .../format/StatisticsDisplayFormatterTest.java  |   4 +-
 docs/src/main/asciidoc/chapters/clients.txt |   2 +-
 .../examples/simple/filedata/ChunkCombiner.java |  18 +-
 pom.xml | 390 ++-
 .../apache/accumulo/server/ServerConstants.java |   2 +-
 .../server/master/balancer/GroupBalancer.java   |   4 +-
 .../master/balancer/RegexGroupBalancer.java |   6 +-
 .../server/replication/StatusFormatter.java |  18 +-
 .../server/rpc/CustomNonBlockingServer.java |  63 ++-
 .../server/security/SecurityOperation.java  |   6 +-
 .../server/security/UserImpersonation.java  |   2 +-
 .../server/security/SystemCredentialsTest.java  |   2 +-
 .../replication/SequentialWorkAssigner.java |   2 +-
 .../monitor/servlets/DefaultServlet.java|   2 +-
 .../monitor/servlets/ReplicationServlet.java|   2 +-
 .../monitor/servlets/TablesServlet.java |   4 +-
 .../apache/accumulo/tracer/TraceFormatter.java  |  22 +-
 .../tserver/compaction/CompactionStrategy.java  |   6 +-
 .../tserver/session/ConditionalSession.java |   3 +-
 .../tserver/session/MultiScanSession.java   |   4 +-
 .../accumulo/tserver/session/ScanSession.java   |   8 +-
 

[1/2] accumulo git commit: ACCUMULO-4112 use the least durable write for MinC flags in the WALog

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/master e59649bff -> a12b3741a


ACCUMULO-4112 use the least durable write for MinC flags in the WALog


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/497a884c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/497a884c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/497a884c

Branch: refs/heads/master
Commit: 497a884c9da50c6c3620816a0e1fd5321ca6eaed
Parents: 1255574
Author: Eric C. Newton 
Authored: Wed Jan 20 11:35:56 2016 -0500
Committer: Eric C. Newton 
Committed: Wed Jan 20 11:35:56 2016 -0500

--
 .../apache/accumulo/server/util/MetadataTableUtil.java|  4 ++--
 .../java/org/apache/accumulo/tserver/log/DfsLogger.java   |  4 ++--
 .../apache/accumulo/tserver/log/TabletServerLogger.java   | 10 --
 3 files changed, 8 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/497a884c/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
--
diff --git 
a/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
 
b/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
index d4ec4f8..4b88c5b 100644
--- 
a/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
@@ -16,6 +16,7 @@
  */
 package org.apache.accumulo.server.util;
 
+import static 
com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static 
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN;
 import static 
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.ServerColumnFamily.TIME_COLUMN;
@@ -96,7 +97,6 @@ import org.slf4j.LoggerFactory;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Optional;
-import static 
com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
 
 /**
  * provides a reference to the metadata table for updates by tablet servers
@@ -131,7 +131,7 @@ public class MetadataTableUtil {
 return rootTable;
   }
 
-  private static void putLockID(ZooLock zooLock, Mutation m) {
+  public static void putLockID(ZooLock zooLock, Mutation m) {
 TabletsSection.ServerColumnFamily.LOCK_COLUMN.put(m, new 
Value(zooLock.getLockID().serialize(ZooUtil.getRoot(HdfsZooInstance.getInstance())
 + "/")
 .getBytes(UTF_8)));
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/497a884c/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
--
diff --git 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
index 4c388b9..aa69b1a 100644
--- 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
+++ 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
@@ -645,7 +645,7 @@ public class DfsLogger implements Comparable {
 key.event = COMPACTION_FINISH;
 key.seq = seq;
 key.tid = tid;
-return logFileData(Collections.singletonList(new 
Pair(key, EMPTY)), Durability.SYNC);
+return logFileData(Collections.singletonList(new 
Pair(key, EMPTY)), Durability.LOG);
   }
 
   public LoggerOperation minorCompactionStarted(int seq, int tid, String fqfn) 
throws IOException {
@@ -654,7 +654,7 @@ public class DfsLogger implements Comparable {
 key.seq = seq;
 key.tid = tid;
 key.filename = fqfn;
-return logFileData(Collections.singletonList(new 
Pair(key, EMPTY)), Durability.SYNC);
+return logFileData(Collections.singletonList(new 
Pair(key, EMPTY)), Durability.LOG);
   }
 
   public String getLogger() {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/497a884c/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
--
diff --git 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
index 1102ecb..04f4e50 100644
--- 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
+++ 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
@@ -16,6 +16,8 @@
  */
 

accumulo git commit: ACCUMULO-4097 use sensible defaults for required options

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/master 0b1eabc5b -> 125557476


ACCUMULO-4097 use sensible defaults for required options


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/12555747
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/12555747
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/12555747

Branch: refs/heads/master
Commit: 1255574768f90db286d7c6d127c58033e0009ddb
Parents: 0b1eabc
Author: Eric C. Newton 
Authored: Mon Jan 4 13:24:59 2016 -0500
Committer: Eric C. Newton 
Committed: Mon Jan 4 13:24:59 2016 -0500

--
 .../apache/accumulo/test/continuous/ContinuousVerify.java | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/12555747/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
--
diff --git 
a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java 
b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
index 8a8a9a2..3380559 100644
--- 
a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
@@ -143,14 +143,14 @@ public class ContinuousVerify extends Configured 
implements Tool {
   }
 
   static class Opts extends MapReduceClientOnDefaultTable {
-@Parameter(names = "--output", description = "location in HDFS to store 
the results; must not exist", required = true)
+@Parameter(names = "--output", description = "location in HDFS to store 
the results; must not exist")
 String outputDir = "/tmp/continuousVerify";
 
-@Parameter(names = "--maxMappers", description = "the maximum number of 
mappers to use", required = true, validateWith = PositiveInteger.class)
-int maxMaps = 0;
+@Parameter(names = "--maxMappers", description = "the maximum number of 
mappers to use", validateWith = PositiveInteger.class)
+int maxMaps = 1;
 
-@Parameter(names = "--reducers", description = "the number of reducers to 
use", required = true, validateWith = PositiveInteger.class)
-int reducers = 0;
+@Parameter(names = "--reducers", description = "the number of reducers to 
use", validateWith = PositiveInteger.class)
+int reducers = 1;
 
 @Parameter(names = "--offline", description = "perform the verification 
directly on the files while the table is offline")
 boolean scanOffline = false;

accumulo git commit: ACCUMULO-4091 added MutationsRejectedException discussions

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/master af040bfb4 -> 7b1e26ae2


ACCUMULO-4091 added MutationsRejectedException discussions


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7b1e26ae
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7b1e26ae
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7b1e26ae

Branch: refs/heads/master
Commit: 7b1e26ae29bcb89c02aeb508864c48cb46f427fa
Parents: af040bf
Author: Eric C. Newton 
Authored: Mon Dec 28 11:41:19 2015 -0500
Committer: Eric C. Newton 
Committed: Mon Dec 28 11:41:19 2015 -0500

--
 .../main/asciidoc/chapters/troubleshooting.txt  | 55 
 1 file changed, 55 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/7b1e26ae/docs/src/main/asciidoc/chapters/troubleshooting.txt
--
diff --git a/docs/src/main/asciidoc/chapters/troubleshooting.txt 
b/docs/src/main/asciidoc/chapters/troubleshooting.txt
index ada0fbf..9546638 100644
--- a/docs/src/main/asciidoc/chapters/troubleshooting.txt
+++ b/docs/src/main/asciidoc/chapters/troubleshooting.txt
@@ -229,6 +229,61 @@ messages to zookeeper.
 
 *A*: Ensure the tablet server JVM is not running low on memory.
 
+*Q*: I'm seeing errors in tablet server logs that include the words 
"MutationsRejectedException" and "# constraint violations: 1". Moments after 
that the server died.
+
+The error you are seeing is part of a failing tablet server scenario.
+This is a bit complicated, so name two of your tablet servers A and B.
+
+Tablet server A is hosting a tablet, let's call it a-tablet.
+
+Tablet server B is hosting a metadata tablet, let's call it m-tablet.
+
+m-tablet records the information about a-tablet, for example, the names of the 
files it is using to store data.
+
+When A ingests some data, it eventually flushes the updates from memory to a 
file.
+
+Tablet server A then writes this new information to m-tablet, on Tablet server 
B.
+
+Here's a likely failure scenario:
+
+Tablet server A does not have enough memory for all the processes running on 
it.
+The operating system sees a large chunk of the tablet server being unused, and 
swaps it out to disk to make room for other processes.
+Tablet server A does a java memory garbage collection, which causes it to 
start using all the memory allocated to it.
+As the server starts pulling data from swap, it runs very slowly.
+It fails to send the keep-alive messages to zookeeper in a timely fashion, and 
it looses its zookeeper session.
+
+But, it's running so slowly, that it takes a moment to realize it should no 
longer be hosting tablets.
+
+The thread that is flushing a-tablet memory attempts to update m-tablet with 
the new file information.
+
+Fortunately there's a constraint on m-tablet.
+Mutations to the metadata table must contain a valid zookeeper session.
+This prevents tablet server A from making updates to m-tablet when it no long 
has the right to host the tablet.
+
+The "MutationsRejectedException" error is from tablet server A making an 
update to tablet server B's m-tablet.
+It's getting a constraint violation: tablet server A has lost its zookeeper 
session, and will fail momentarily.
+
+*A*: Ensure that memory is not over-allocated.  Monitor swap usage, or turn 
swap off.
+
+*Q*: My accumulo client is getting a MutationsRejectedException. The monitor 
is displaying "No Such SessionID" errors.
+
+When your client starts sending mutations to accumulo, it creates a session. 
Once the session is created,
+mutations are streamed to accumulo, without acknowledgement, against this 
session.  Once the client is done,
+it will close the session, and get an acknowledgement.
+
+If the client fails to communicate with accumulo, it will release the session, 
assuming that the client has died.
+If the client then attempts to send more mutations against the session, you 
will see "No Such SessionID" errors on
+the server, and MutationRejectedExceptions in the client.
+
+The client library should be either actively using the connection to the 
tablet servers,
+or closing the connection and sessions. If the session times out, something is 
causing your client
+to pause.
+
+The most frequent source of these pauses are java garbage collection pauses
+due to the JVM running out of memory, or being swapped out to disk.
+
+*A*: Ensure your client has adequate memory and is not being swapped out to 
disk.
+
 ### Tools
 
 The accumulo script can be used to run classes from the command line.

[07/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

[ecn]

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/cpp/proxy_types.cpp
--
diff --git a/proxy/src/main/cpp/proxy_types.cpp 
b/proxy/src/main/cpp/proxy_types.cpp
index a055b48..8c443e0 100644
--- a/proxy/src/main/cpp/proxy_types.cpp
+++ b/proxy/src/main/cpp/proxy_types.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,6 +23,9 @@
 #include "proxy_types.h"
 
 #include 
+#include 
+
+#include 
 
 namespace accumulo {
 
@@ -190,11 +193,35 @@ const char* _kTimeTypeNames[] = {
 };
 const std::map 
_TimeType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(2, _kTimeTypeValues, 
_kTimeTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
 
-const char* Key::ascii_fingerprint = "91151A432E03F5E8564877B5194B48E2";
-const uint8_t Key::binary_fingerprint[16] = 
{0x91,0x15,0x1A,0x43,0x2E,0x03,0xF5,0xE8,0x56,0x48,0x77,0xB5,0x19,0x4B,0x48,0xE2};
+
+Key::~Key() throw() {
+}
+
+
+void Key::__set_row(const std::string& val) {
+  this->row = val;
+}
+
+void Key::__set_colFamily(const std::string& val) {
+  this->colFamily = val;
+}
+
+void Key::__set_colQualifier(const std::string& val) {
+  this->colQualifier = val;
+}
+
+void Key::__set_colVisibility(const std::string& val) {
+  this->colVisibility = val;
+}
+
+void Key::__set_timestamp(const int64_t val) {
+  this->timestamp = val;
+__isset.timestamp = true;
+}
 
 uint32_t Key::read(::apache::thrift::protocol::TProtocol* iprot) {
 
+  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -267,6 +294,7 @@ uint32_t Key::read(::apache::thrift::protocol::TProtocol* 
iprot) {
 
 uint32_t Key::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
+  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("Key");
 
   xfer += oprot->writeFieldBegin("row", ::apache::thrift::protocol::T_STRING, 
1);
@@ -305,11 +333,70 @@ void swap(Key , Key ) {
   swap(a.__isset, b.__isset);
 }
 
-const char* ColumnUpdate::ascii_fingerprint = 
"65CC1863F7DDC1DE75B9EAF9E2DC0D1F";
-const uint8_t ColumnUpdate::binary_fingerprint[16] = 
{0x65,0xCC,0x18,0x63,0xF7,0xDD,0xC1,0xDE,0x75,0xB9,0xEA,0xF9,0xE2,0xDC,0x0D,0x1F};
+Key::Key(const Key& other0) {
+  row = other0.row;
+  colFamily = other0.colFamily;
+  colQualifier = other0.colQualifier;
+  colVisibility = other0.colVisibility;
+  timestamp = other0.timestamp;
+  __isset = other0.__isset;
+}
+Key& Key::operator=(const Key& other1) {
+  row = other1.row;
+  colFamily = other1.colFamily;
+  colQualifier = other1.colQualifier;
+  colVisibility = other1.colVisibility;
+  timestamp = other1.timestamp;
+  __isset = other1.__isset;
+  return *this;
+}
+void Key::printTo(std::ostream& out) const {
+  using ::apache::thrift::to_string;
+  out << "Key(";
+  out << "row=" << to_string(row);
+  out << ", " << "colFamily=" << to_string(colFamily);
+  out << ", " << "colQualifier=" << to_string(colQualifier);
+  out << ", " << "colVisibility=" << to_string(colVisibility);
+  out << ", " << "timestamp="; (__isset.timestamp ? (out << 
to_string(timestamp)) : (out << ""));
+  out << ")";
+}
+
+
+ColumnUpdate::~ColumnUpdate() throw() {
+}
+
+
+void ColumnUpdate::__set_colFamily(const std::string& val) {
+  this->colFamily = val;
+}
+
+void ColumnUpdate::__set_colQualifier(const std::string& val) {
+  this->colQualifier = val;
+}
+
+void ColumnUpdate::__set_colVisibility(const std::string& val) {
+  this->colVisibility = val;
+__isset.colVisibility = true;
+}
+
+void ColumnUpdate::__set_timestamp(const int64_t val) {
+  this->timestamp = val;
+__isset.timestamp = true;
+}
+
+void ColumnUpdate::__set_value(const std::string& val) {
+  this->value = val;
+__isset.value = true;
+}
+
+void ColumnUpdate::__set_deleteCell(const bool val) {
+  this->deleteCell = val;
+__isset.deleteCell = true;
+}
 
 uint32_t ColumnUpdate::read(::apache::thrift::protocol::TProtocol* iprot) {
 
+  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -390,6 +477,7 @@ uint32_t 
ColumnUpdate::read(::apache::thrift::protocol::TProtocol* iprot) {
 
 uint32_t ColumnUpdate::write(::apache::thrift::protocol::TProtocol* oprot) 
const {
   uint32_t xfer = 0;
+  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("ColumnUpdate");
 
   xfer += oprot->writeFieldBegin("colFamily", 
::apache::thrift::protocol::T_STRING, 1);
@@ -436,11 +524,53 @@ void swap(ColumnUpdate , ColumnUpdate ) {
   swap(a.__isset, b.__isset);
 }
 
-const char* DiskUsage::ascii_fingerprint = 

[15/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

[ecn]

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java 
b/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java
index 58f2f02..865b3e5 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class 
UpdateErrors implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, 
Comparable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2015-12-16")
+public class UpdateErrors implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, 
Comparable {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("UpdateErrors");
 
   private static final org.apache.thrift.protocol.TField 
FAILED_EXTENTS_FIELD_DESC = new 
org.apache.thrift.protocol.TField("failedExtents", 
org.apache.thrift.protocol.TType.MAP, (short)1);
@@ -431,7 +434,24 @@ import org.slf4j.LoggerFactory;
 
   @Override
   public int hashCode() {
-return 0;
+List list = new ArrayList();
+
+boolean present_failedExtents = true && (isSetFailedExtents());
+list.add(present_failedExtents);
+if (present_failedExtents)
+  list.add(failedExtents);
+
+boolean present_violationSummaries = true && (isSetViolationSummaries());
+list.add(present_violationSummaries);
+if (present_violationSummaries)
+  list.add(violationSummaries);
+
+boolean present_authorizationFailures = true && 
(isSetAuthorizationFailures());
+list.add(present_authorizationFailures);
+if (present_authorizationFailures)
+  list.add(authorizationFailures);
+
+return list.hashCode();
   }
 
   @Override
@@ -563,14 +583,14 @@ import org.slf4j.LoggerFactory;
   {
 org.apache.thrift.protocol.TMap _map58 = iprot.readMapBegin();
 struct.failedExtents = new 
HashMap(2*_map58.size);
-for (int _i59 = 0; _i59 < _map58.size; ++_i59)
+TKeyExtent _key59;
+long _val60;
+for (int _i61 = 0; _i61 < _map58.size; ++_i61)
 {
-  TKeyExtent _key60;
-  long _val61;
-  _key60 = new TKeyExtent();
-  _key60.read(iprot);
-  _val61 = iprot.readI64();
-  struct.failedExtents.put(_key60, _val61);
+  _key59 = new TKeyExtent();
+  _key59.read(iprot);
+  _val60 = iprot.readI64();
+  struct.failedExtents.put(_key59, _val60);
 }
 iprot.readMapEnd();
   }
@@ -584,12 +604,12 @@ import org.slf4j.LoggerFactory;
   {
 org.apache.thrift.protocol.TList _list62 = 
iprot.readListBegin();
 struct.violationSummaries = new 
ArrayList(_list62.size);
-for (int _i63 = 0; _i63 < _list62.size; ++_i63)
+TConstraintViolationSummary _elem63;
+for (int _i64 = 0; _i64 < _list62.size; ++_i64)
 {
-  TConstraintViolationSummary _elem64;
-  _elem64 = new TConstraintViolationSummary();
-  _elem64.read(iprot);
-  struct.violationSummaries.add(_elem64);
+  _elem63 = new TConstraintViolationSummary();
+  _elem63.read(iprot);
+  struct.violationSummaries.add(_elem63);
 }
 iprot.readListEnd();
   }
@@ -603,14 +623,14 @@ import org.slf4j.LoggerFactory;
   {
 org.apache.thrift.protocol.TMap _map65 = iprot.readMapBegin();
 struct.authorizationFailures = new 
HashMap(2*_map65.size);
-for (int _i66 = 0; _i66 < _map65.size; ++_i66)
+TKeyExtent _key66;
+

[16/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

[ecn]

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTest.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTest.java
 
b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTest.java
index c4af921..4848920 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTest.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class 
ThriftTest {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2015-12-16")
+public class ThriftTest {
 
   public interface Iface {
 
@@ -663,7 +666,9 @@ import org.slf4j.LoggerFactory;
 
 @Override
 public int hashCode() {
-  return 0;
+  List list = new ArrayList();
+
+  return list.hashCode();
 }
 
 @Override
@@ -930,7 +935,7 @@ import org.slf4j.LoggerFactory;
 public Object getFieldValue(_Fields field) {
   switch (field) {
   case SUCCESS:
-return Boolean.valueOf(isSuccess());
+return isSuccess();
 
   }
   throw new IllegalStateException();
@@ -976,7 +981,14 @@ import org.slf4j.LoggerFactory;
 
 @Override
 public int hashCode() {
-  return 0;
+  List list = new ArrayList();
+
+  boolean present_success = true;
+  list.add(present_success);
+  if (present_success)
+list.add(success);
+
+  return list.hashCode();
 }
 
 @Override
@@ -1263,7 +1275,9 @@ import org.slf4j.LoggerFactory;
 
 @Override
 public int hashCode() {
-  return 0;
+  List list = new ArrayList();
+
+  return list.hashCode();
 }
 
 @Override
@@ -1530,7 +1544,7 @@ import org.slf4j.LoggerFactory;
 public Object getFieldValue(_Fields field) {
   switch (field) {
   case SUCCESS:
-return Boolean.valueOf(isSuccess());
+return isSuccess();
 
   }
   throw new IllegalStateException();
@@ -1576,7 +1590,14 @@ import org.slf4j.LoggerFactory;
 
 @Override
 public int hashCode() {
-  return 0;
+  List list = new ArrayList();
+
+  boolean present_success = true;
+  list.add(present_success);
+  if (present_success)
+list.add(success);
+
+  return list.hashCode();
 }
 
 @Override
@@ -1863,7 +1884,9 @@ import org.slf4j.LoggerFactory;
 
 @Override
 public int hashCode() {
-  return 0;
+  List list = new ArrayList();
+
+  return list.hashCode();
 }
 
 @Override
@@ -2175,7 +2198,7 @@ import org.slf4j.LoggerFactory;
 public Object getFieldValue(_Fields field) {
   switch (field) {
   case SUCCESS:
-return Boolean.valueOf(isSuccess());
+return isSuccess();
 
   case EX:
 return getEx();
@@ -2235,7 +2258,19 @@ import org.slf4j.LoggerFactory;
 
 @Override
 public int hashCode() {
-  return 0;
+  List list = new ArrayList();
+
+  boolean present_success = true;
+  list.add(present_success);
+  if (present_success)
+list.add(success);
+
+  boolean present_ex = true && (isSetEx());
+  list.add(present_ex);
+  if (present_ex)
+list.add(ex);
+
+  return list.hashCode();
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialMultiScan.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialMultiScan.java 
b/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialMultiScan.java
index d124c14..558cc86 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialMultiScan.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialMultiScan.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import 

[09/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

[ecn]

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/cpp/AccumuloProxy.h
--
diff --git a/proxy/src/main/cpp/AccumuloProxy.h 
b/proxy/src/main/cpp/AccumuloProxy.h
index 269884f..a14fda9 100644
--- a/proxy/src/main/cpp/AccumuloProxy.h
+++ b/proxy/src/main/cpp/AccumuloProxy.h
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,10 +24,16 @@
 #define AccumuloProxy_H
 
 #include 
+#include 
 #include "proxy_types.h"
 
 namespace accumulo {
 
+#ifdef _WIN32
+  #pragma warning( push )
+  #pragma warning (disable : 4250 ) //inheriting methods via dominance 
+#endif
+
 class AccumuloProxyIf {
  public:
   virtual ~AccumuloProxyIf() {}
@@ -381,30 +387,27 @@ class AccumuloProxyNull : virtual public AccumuloProxyIf {
 
 typedef struct _AccumuloProxy_login_args__isset {
   _AccumuloProxy_login_args__isset() : principal(false), 
loginProperties(false) {}
-  bool principal;
-  bool loginProperties;
+  bool principal :1;
+  bool loginProperties :1;
 } _AccumuloProxy_login_args__isset;
 
 class AccumuloProxy_login_args {
  public:
 
+  AccumuloProxy_login_args(const AccumuloProxy_login_args&);
+  AccumuloProxy_login_args& operator=(const AccumuloProxy_login_args&);
   AccumuloProxy_login_args() : principal() {
   }
 
-  virtual ~AccumuloProxy_login_args() throw() {}
-
+  virtual ~AccumuloProxy_login_args() throw();
   std::string principal;
   std::map  loginProperties;
 
   _AccumuloProxy_login_args__isset __isset;
 
-  void __set_principal(const std::string& val) {
-principal = val;
-  }
+  void __set_principal(const std::string& val);
 
-  void __set_loginProperties(const std::map & val) {
-loginProperties = val;
-  }
+  void __set_loginProperties(const std::map & val);
 
   bool operator == (const AccumuloProxy_login_args & rhs) const
   {
@@ -430,8 +433,7 @@ class AccumuloProxy_login_pargs {
  public:
 
 
-  virtual ~AccumuloProxy_login_pargs() throw() {}
-
+  virtual ~AccumuloProxy_login_pargs() throw();
   const std::string* principal;
   const std::map * loginProperties;
 
@@ -441,30 +443,27 @@ class AccumuloProxy_login_pargs {
 
 typedef struct _AccumuloProxy_login_result__isset {
   _AccumuloProxy_login_result__isset() : success(false), ouch2(false) {}
-  bool success;
-  bool ouch2;
+  bool success :1;
+  bool ouch2 :1;
 } _AccumuloProxy_login_result__isset;
 
 class AccumuloProxy_login_result {
  public:
 
+  AccumuloProxy_login_result(const AccumuloProxy_login_result&);
+  AccumuloProxy_login_result& operator=(const AccumuloProxy_login_result&);
   AccumuloProxy_login_result() : success() {
   }
 
-  virtual ~AccumuloProxy_login_result() throw() {}
-
+  virtual ~AccumuloProxy_login_result() throw();
   std::string success;
   AccumuloSecurityException ouch2;
 
   _AccumuloProxy_login_result__isset __isset;
 
-  void __set_success(const std::string& val) {
-success = val;
-  }
+  void __set_success(const std::string& val);
 
-  void __set_ouch2(const AccumuloSecurityException& val) {
-ouch2 = val;
-  }
+  void __set_ouch2(const AccumuloSecurityException& val);
 
   bool operator == (const AccumuloProxy_login_result & rhs) const
   {
@@ -487,16 +486,15 @@ class AccumuloProxy_login_result {
 
 typedef struct _AccumuloProxy_login_presult__isset {
   _AccumuloProxy_login_presult__isset() : success(false), ouch2(false) {}
-  bool success;
-  bool ouch2;
+  bool success :1;
+  bool ouch2 :1;
 } _AccumuloProxy_login_presult__isset;
 
 class AccumuloProxy_login_presult {
  public:
 
 
-  virtual ~AccumuloProxy_login_presult() throw() {}
-
+  virtual ~AccumuloProxy_login_presult() throw();
   std::string* success;
   AccumuloSecurityException ouch2;
 
@@ -508,36 +506,31 @@ class AccumuloProxy_login_presult {
 
 typedef struct _AccumuloProxy_addConstraint_args__isset {
   _AccumuloProxy_addConstraint_args__isset() : login(false), tableName(false), 
constraintClassName(false) {}
-  bool login;
-  bool tableName;
-  bool constraintClassName;
+  bool login :1;
+  bool tableName :1;
+  bool constraintClassName :1;
 } _AccumuloProxy_addConstraint_args__isset;
 
 class AccumuloProxy_addConstraint_args {
  public:
 
+  AccumuloProxy_addConstraint_args(const AccumuloProxy_addConstraint_args&);
+  AccumuloProxy_addConstraint_args& operator=(const 
AccumuloProxy_addConstraint_args&);
   AccumuloProxy_addConstraint_args() : login(), tableName(), 
constraintClassName() {
   }
 
-  virtual ~AccumuloProxy_addConstraint_args() throw() {}
-
+  virtual ~AccumuloProxy_addConstraint_args() throw();
   std::string login;
   std::string tableName;
   std::string constraintClassName;
 
   _AccumuloProxy_addConstraint_args__isset __isset;
 
- 

[05/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

[ecn]

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java
--
diff --git 
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java 
b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java
index eaa49ef..eb848c8 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class 
AccumuloProxy {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2015-12-16")
+public class AccumuloProxy {
 
   public interface Iface {
 
@@ -2492,7 +2495,7 @@ import org.slf4j.LoggerFactory;
   update_args args = new update_args();
   args.setWriter(writer);
   args.setCells(cells);
-  sendBase("update", args);
+  sendBaseOneway("update", args);
 }
 
 public void flush(String writer) throws UnknownWriter, 
MutationsRejectedException, org.apache.thrift.TException
@@ -5317,7 +5320,7 @@ import org.slf4j.LoggerFactory;
   }
 
   public void write_args(org.apache.thrift.protocol.TProtocol prot) throws 
org.apache.thrift.TException {
-prot.writeMessageBegin(new 
org.apache.thrift.protocol.TMessage("update", 
org.apache.thrift.protocol.TMessageType.CALL, 0));
+prot.writeMessageBegin(new 
org.apache.thrift.protocol.TMessage("update", 
org.apache.thrift.protocol.TMessageType.ONEWAY, 0));
 update_args args = new update_args();
 args.setWriter(writer);
 args.setCells(cells);
@@ -12975,7 +12978,19 @@ import org.slf4j.LoggerFactory;
 
 @Override
 public int hashCode() {
-  return 0;
+  List list = new ArrayList();
+
+  boolean present_principal = true && (isSetPrincipal());
+  list.add(present_principal);
+  if (present_principal)
+list.add(principal);
+
+  boolean present_loginProperties = true && (isSetLoginProperties());
+  list.add(present_loginProperties);
+  if (present_loginProperties)
+list.add(loginProperties);
+
+  return list.hashCode();
 }
 
 @Override
@@ -13097,13 +13112,13 @@ import org.slf4j.LoggerFactory;
 {
   org.apache.thrift.protocol.TMap _map164 = 
iprot.readMapBegin();
   struct.loginProperties = new 
HashMap(2*_map164.size);
-  for (int _i165 = 0; _i165 < _map164.size; ++_i165)
+  String _key165;
+  String _val166;
+  for (int _i167 = 0; _i167 < _map164.size; ++_i167)
   {
-String _key166;
-String _val167;
-_key166 = iprot.readString();
-_val167 = iprot.readString();
-struct.loginProperties.put(_key166, _val167);
+_key165 = iprot.readString();
+_val166 = iprot.readString();
+struct.loginProperties.put(_key165, _val166);
   }
   iprot.readMapEnd();
 }
@@ -13197,13 +13212,13 @@ import org.slf4j.LoggerFactory;
   {
 org.apache.thrift.protocol.TMap _map170 = new 
org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, 
org.apache.thrift.protocol.TType.STRING, iprot.readI32());
 struct.loginProperties = new 
HashMap(2*_map170.size);
-for (int _i171 = 0; _i171 < _map170.size; ++_i171)
+String _key171;
+String _val172;
+for (int _i173 = 0; _i173 < _map170.size; ++_i173)
 {
-  String _key172;
-  String _val173;
-  _key172 = iprot.readString();
-  _val173 = iprot.readString();
-  struct.loginProperties.put(_key172, _val173);
+  _key171 = iprot.readString();
+  _val172 = iprot.readString();
+  struct.loginProperties.put(_key171, _val172);
 }
   }
   struct.setLoginPropertiesIsSet(true);
@@ -13309,7 +13324,7 @@ import org.slf4j.LoggerFactory;
   AccumuloSecurityException ouch2)
 {
   this();
-  this.success = success;
+  this.success = 

[06/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

[ecn]

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/cpp/proxy_types.h
--
diff --git a/proxy/src/main/cpp/proxy_types.h b/proxy/src/main/cpp/proxy_types.h
index 569de88..f7cce4c 100644
--- a/proxy/src/main/cpp/proxy_types.h
+++ b/proxy/src/main/cpp/proxy_types.h
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,6 +23,8 @@
 #ifndef proxy_TYPES_H
 #define proxy_TYPES_H
 
+#include 
+
 #include 
 #include 
 #include 
@@ -159,26 +161,80 @@ struct TimeType {
 
 extern const std::map _TimeType_VALUES_TO_NAMES;
 
+class Key;
+
+class ColumnUpdate;
+
+class DiskUsage;
+
+class KeyValue;
+
+class ScanResult;
+
+class Range;
+
+class ScanColumn;
+
+class IteratorSetting;
+
+class ScanOptions;
+
+class BatchScanOptions;
+
+class KeyValueAndPeek;
+
+class KeyExtent;
+
+class Column;
+
+class Condition;
+
+class ConditionalUpdates;
+
+class ConditionalWriterOptions;
+
+class ActiveScan;
+
+class ActiveCompaction;
+
+class WriterOptions;
+
+class CompactionStrategyConfig;
+
+class UnknownScanner;
+
+class UnknownWriter;
+
+class NoMoreEntriesException;
+
+class AccumuloException;
+
+class AccumuloSecurityException;
+
+class TableNotFoundException;
+
+class TableExistsException;
+
+class MutationsRejectedException;
+
 typedef struct _Key__isset {
   _Key__isset() : row(false), colFamily(false), colQualifier(false), 
colVisibility(false), timestamp(true) {}
-  bool row;
-  bool colFamily;
-  bool colQualifier;
-  bool colVisibility;
-  bool timestamp;
+  bool row :1;
+  bool colFamily :1;
+  bool colQualifier :1;
+  bool colVisibility :1;
+  bool timestamp :1;
 } _Key__isset;
 
 class Key {
  public:
 
-  static const char* ascii_fingerprint; // = 
"91151A432E03F5E8564877B5194B48E2";
-  static const uint8_t binary_fingerprint[16]; // = 
{0x91,0x15,0x1A,0x43,0x2E,0x03,0xF5,0xE8,0x56,0x48,0x77,0xB5,0x19,0x4B,0x48,0xE2};
-
+  Key(const Key&);
+  Key& operator=(const Key&);
   Key() : row(), colFamily(), colQualifier(), colVisibility(), 
timestamp(9223372036854775807LL) {
   }
 
-  virtual ~Key() throw() {}
-
+  virtual ~Key() throw();
   std::string row;
   std::string colFamily;
   std::string colQualifier;
@@ -187,26 +243,15 @@ class Key {
 
   _Key__isset __isset;
 
-  void __set_row(const std::string& val) {
-row = val;
-  }
+  void __set_row(const std::string& val);
 
-  void __set_colFamily(const std::string& val) {
-colFamily = val;
-  }
+  void __set_colFamily(const std::string& val);
 
-  void __set_colQualifier(const std::string& val) {
-colQualifier = val;
-  }
+  void __set_colQualifier(const std::string& val);
 
-  void __set_colVisibility(const std::string& val) {
-colVisibility = val;
-  }
+  void __set_colVisibility(const std::string& val);
 
-  void __set_timestamp(const int64_t val) {
-timestamp = val;
-__isset.timestamp = true;
-  }
+  void __set_timestamp(const int64_t val);
 
   bool operator == (const Key & rhs) const
   {
@@ -233,31 +278,36 @@ class Key {
   uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
   uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
+  virtual void printTo(std::ostream& out) const;
 };
 
 void swap(Key , Key );
 
+inline std::ostream& operator<<(std::ostream& out, const Key& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 typedef struct _ColumnUpdate__isset {
   _ColumnUpdate__isset() : colFamily(false), colQualifier(false), 
colVisibility(false), timestamp(false), value(false), deleteCell(false) {}
-  bool colFamily;
-  bool colQualifier;
-  bool colVisibility;
-  bool timestamp;
-  bool value;
-  bool deleteCell;
+  bool colFamily :1;
+  bool colQualifier :1;
+  bool colVisibility :1;
+  bool timestamp :1;
+  bool value :1;
+  bool deleteCell :1;
 } _ColumnUpdate__isset;
 
 class ColumnUpdate {
  public:
 
-  static const char* ascii_fingerprint; // = 
"65CC1863F7DDC1DE75B9EAF9E2DC0D1F";
-  static const uint8_t binary_fingerprint[16]; // = 
{0x65,0xCC,0x18,0x63,0xF7,0xDD,0xC1,0xDE,0x75,0xB9,0xEA,0xF9,0xE2,0xDC,0x0D,0x1F};
-
+  ColumnUpdate(const ColumnUpdate&);
+  ColumnUpdate& operator=(const ColumnUpdate&);
   ColumnUpdate() : colFamily(), colQualifier(), colVisibility(), timestamp(0), 
value(), deleteCell(0) {
   }
 
-  virtual ~ColumnUpdate() throw() {}
-
+  virtual ~ColumnUpdate() throw();
   std::string colFamily;
   std::string colQualifier;
   std::string colVisibility;
@@ -267,33 +317,17 @@ class ColumnUpdate {
 
   _ColumnUpdate__isset __isset;
 
-  void __set_colFamily(const std::string& val) {
-colFamily = val;
-  }
+  void __set_colFamily(const std::string& val);
 
-  void __set_colQualifier(const std::string& val) {
-colQualifier = val;
-  }
+  void __set_colQualifier(const std::string& val);

[18/18] accumulo git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo

[ecn]

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/794ec90d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/794ec90d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/794ec90d

Branch: refs/heads/master
Commit: 794ec90d5052dd1235c33765b64a1aa40f01d8d8
Parents: 3af75fc 67560a6
Author: Eric C. Newton 
Authored: Wed Dec 16 16:09:08 2015 -0500
Committer: Eric C. Newton 
Committed: Wed Dec 16 16:09:08 2015 -0500

--
 pom.xml | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/794ec90d/pom.xml
--

[01/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/master 67560a618 -> 794ec90d5


http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/python/constants.py
--
diff --git a/proxy/src/main/python/constants.py 
b/proxy/src/main/python/constants.py
index aea4826..8139236 100644
--- a/proxy/src/main/python/constants.py
+++ b/proxy/src/main/python/constants.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Autogenerated by Thrift Compiler (0.9.1)
+# Autogenerated by Thrift Compiler (0.9.3)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/python/ttypes.py
--
diff --git a/proxy/src/main/python/ttypes.py b/proxy/src/main/python/ttypes.py
index 9444f71..c224c50 100644
--- a/proxy/src/main/python/ttypes.py
+++ b/proxy/src/main/python/ttypes.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Autogenerated by Thrift Compiler (0.9.1)
+# Autogenerated by Thrift Compiler (0.9.3)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -303,27 +303,27 @@ class Key:
 break
   if fid == 1:
 if ftype == TType.STRING:
-  self.row = iprot.readString();
+  self.row = iprot.readString()
 else:
   iprot.skip(ftype)
   elif fid == 2:
 if ftype == TType.STRING:
-  self.colFamily = iprot.readString();
+  self.colFamily = iprot.readString()
 else:
   iprot.skip(ftype)
   elif fid == 3:
 if ftype == TType.STRING:
-  self.colQualifier = iprot.readString();
+  self.colQualifier = iprot.readString()
 else:
   iprot.skip(ftype)
   elif fid == 4:
 if ftype == TType.STRING:
-  self.colVisibility = iprot.readString();
+  self.colVisibility = iprot.readString()
 else:
   iprot.skip(ftype)
   elif fid == 5:
 if ftype == TType.I64:
-  self.timestamp = iprot.readI64();
+  self.timestamp = iprot.readI64()
 else:
   iprot.skip(ftype)
   else:
@@ -363,6 +363,15 @@ class Key:
 return
 
 
+  def __hash__(self):
+value = 17
+value = (value * 31) ^ hash(self.row)
+value = (value * 31) ^ hash(self.colFamily)
+value = (value * 31) ^ hash(self.colQualifier)
+value = (value * 31) ^ hash(self.colVisibility)
+value = (value * 31) ^ hash(self.timestamp)
+return value
+
   def __repr__(self):
 L = ['%s=%r' % (key, value)
   for key, value in self.__dict__.iteritems()]
@@ -414,32 +423,32 @@ class ColumnUpdate:
 break
   if fid == 1:
 if ftype == TType.STRING:
-  self.colFamily = iprot.readString();
+  self.colFamily = iprot.readString()
 else:
   iprot.skip(ftype)
   elif fid == 2:
 if ftype == TType.STRING:
-  self.colQualifier = iprot.readString();
+  self.colQualifier = iprot.readString()
 else:
   iprot.skip(ftype)
   elif fid == 3:
 if ftype == TType.STRING:
-  self.colVisibility = iprot.readString();
+  self.colVisibility = iprot.readString()
 else:
   iprot.skip(ftype)
   elif fid == 4:
 if ftype == TType.I64:
-  self.timestamp = iprot.readI64();
+  self.timestamp = iprot.readI64()
 else:
   iprot.skip(ftype)
   elif fid == 5:
 if ftype == TType.STRING:
-  self.value = iprot.readString();
+  self.value = iprot.readString()
 else:
   iprot.skip(ftype)
   elif fid == 6:
 if ftype == TType.BOOL:
-  self.deleteCell = iprot.readBool();
+  self.deleteCell = iprot.readBool()
 else:
   iprot.skip(ftype)
   else:
@@ -483,6 +492,16 @@ class ColumnUpdate:
 return
 
 
+  def __hash__(self):
+value = 17
+value = (value * 31) ^ hash(self.colFamily)
+value = (value * 31) ^ hash(self.colQualifier)
+value = (value * 31) ^ hash(self.colVisibility)
+value = (value * 31) ^ hash(self.timestamp)
+value = (value * 31) ^ hash(self.value)
+value = (value * 31) ^ hash(self.deleteCell)
+return value
+
   def __repr__(self):
 L = ['%s=%r' % (key, value)
   for key, value in self.__dict__.iteritems()]
@@ -525,14 +544,14 @@ class DiskUsage:
   self.tables = []
   (_etype3, _size0) = iprot.readListBegin()
   for _i4 in xrange(_size0):
-_elem5 = iprot.readString();
+_elem5 = iprot.readString()
 self.tables.append(_elem5)
   iprot.readListEnd()
 else:
   iprot.skip(ftype)
   elif 

[14/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

[ecn]

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java
 
b/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java
index bf9befb..1b8ed46 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class 
MasterMonitorInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, 
Comparable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2015-12-16")
+public class MasterMonitorInfo implements 
org.apache.thrift.TBase, 
java.io.Serializable, Cloneable, Comparable {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("MasterMonitorInfo");
 
   private static final org.apache.thrift.protocol.TField TABLE_MAP_FIELD_DESC 
= new org.apache.thrift.protocol.TField("tableMap", 
org.apache.thrift.protocol.TType.MAP, (short)1);
@@ -722,7 +725,7 @@ import org.slf4j.LoggerFactory;
   return getGoalState();
 
 case UNASSIGNED_TABLETS:
-  return Integer.valueOf(getUnassignedTablets());
+  return getUnassignedTablets();
 
 case SERVERS_SHUTTING_DOWN:
   return getServersShuttingDown();
@@ -865,7 +868,54 @@ import org.slf4j.LoggerFactory;
 
   @Override
   public int hashCode() {
-return 0;
+List list = new ArrayList();
+
+boolean present_tableMap = true && (isSetTableMap());
+list.add(present_tableMap);
+if (present_tableMap)
+  list.add(tableMap);
+
+boolean present_tServerInfo = true && (isSetTServerInfo());
+list.add(present_tServerInfo);
+if (present_tServerInfo)
+  list.add(tServerInfo);
+
+boolean present_badTServers = true && (isSetBadTServers());
+list.add(present_badTServers);
+if (present_badTServers)
+  list.add(badTServers);
+
+boolean present_state = true && (isSetState());
+list.add(present_state);
+if (present_state)
+  list.add(state.getValue());
+
+boolean present_goalState = true && (isSetGoalState());
+list.add(present_goalState);
+if (present_goalState)
+  list.add(goalState.getValue());
+
+boolean present_unassignedTablets = true;
+list.add(present_unassignedTablets);
+if (present_unassignedTablets)
+  list.add(unassignedTablets);
+
+boolean present_serversShuttingDown = true && (isSetServersShuttingDown());
+list.add(present_serversShuttingDown);
+if (present_serversShuttingDown)
+  list.add(serversShuttingDown);
+
+boolean present_deadTabletServers = true && (isSetDeadTabletServers());
+list.add(present_deadTabletServers);
+if (present_deadTabletServers)
+  list.add(deadTabletServers);
+
+boolean present_bulkImports = true && (isSetBulkImports());
+list.add(present_bulkImports);
+if (present_bulkImports)
+  list.add(bulkImports);
+
+return list.hashCode();
   }
 
   @Override
@@ -1103,14 +1153,14 @@ import org.slf4j.LoggerFactory;
   {
 org.apache.thrift.protocol.TMap _map26 = iprot.readMapBegin();
 struct.tableMap = new HashMap(2*_map26.size);
-for (int _i27 = 0; _i27 < _map26.size; ++_i27)
+String _key27;
+TableInfo _val28;
+for (int _i29 = 0; _i29 < _map26.size; ++_i29)
 {
-  String _key28;
-  TableInfo _val29;
-  _key28 = iprot.readString();
-  _val29 = new TableInfo();
-  _val29.read(iprot);
-  struct.tableMap.put(_key28, _val29);
+  _key27 = iprot.readString();
+  _val28 = new TableInfo();
+  _val28.read(iprot);
+  struct.tableMap.put(_key27, _val28);
 }
 iprot.readMapEnd();
   }
@@ -1124,12 +1174,12 @@ import org.slf4j.LoggerFactory;
   {
 

[08/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

[ecn]

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/cpp/proxy_constants.cpp
--
diff --git a/proxy/src/main/cpp/proxy_constants.cpp 
b/proxy/src/main/cpp/proxy_constants.cpp
index 39a574e..d177867 100644
--- a/proxy/src/main/cpp/proxy_constants.cpp
+++ b/proxy/src/main/cpp/proxy_constants.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/cpp/proxy_constants.h
--
diff --git a/proxy/src/main/cpp/proxy_constants.h 
b/proxy/src/main/cpp/proxy_constants.h
index 8f789c6..c2d6fd6 100644
--- a/proxy/src/main/cpp/proxy_constants.h
+++ b/proxy/src/main/cpp/proxy_constants.h
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated

[02/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

[ecn]

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/python/AccumuloProxy.py
--
diff --git a/proxy/src/main/python/AccumuloProxy.py 
b/proxy/src/main/python/AccumuloProxy.py
index 2805fff..83c216c 100644
--- a/proxy/src/main/python/AccumuloProxy.py
+++ b/proxy/src/main/python/AccumuloProxy.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Autogenerated by Thrift Compiler (0.9.1)
+# Autogenerated by Thrift Compiler (0.9.3)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -21,6 +21,7 @@
 #
 
 from thrift.Thrift import TType, TMessageType, TException, 
TApplicationException
+import logging
 from ttypes import *
 from thrift.Thrift import TProcessor
 from thrift.transport import TTransport
@@ -736,20 +737,21 @@ class Client(Iface):
 self._oprot.trans.flush()
 
   def recv_login(self):
-(fname, mtype, rseqid) = self._iprot.readMessageBegin()
+iprot = self._iprot
+(fname, mtype, rseqid) = iprot.readMessageBegin()
 if mtype == TMessageType.EXCEPTION:
   x = TApplicationException()
-  x.read(self._iprot)
-  self._iprot.readMessageEnd()
+  x.read(iprot)
+  iprot.readMessageEnd()
   raise x
 result = login_result()
-result.read(self._iprot)
-self._iprot.readMessageEnd()
+result.read(iprot)
+iprot.readMessageEnd()
 if result.success is not None:
   return result.success
 if result.ouch2 is not None:
   raise result.ouch2
-raise TApplicationException(TApplicationException.MISSING_RESULT, "login 
failed: unknown result");
+raise TApplicationException(TApplicationException.MISSING_RESULT, "login 
failed: unknown result")
 
   def addConstraint(self, login, tableName, constraintClassName):
 """
@@ -772,15 +774,16 @@ class Client(Iface):
 self._oprot.trans.flush()
 
   def recv_addConstraint(self):
-(fname, mtype, rseqid) = self._iprot.readMessageBegin()
+iprot = self._iprot
+(fname, mtype, rseqid) = iprot.readMessageBegin()
 if mtype == TMessageType.EXCEPTION:
   x = TApplicationException()
-  x.read(self._iprot)
-  self._iprot.readMessageEnd()
+  x.read(iprot)
+  iprot.readMessageEnd()
   raise x
 result = addConstraint_result()
-result.read(self._iprot)
-self._iprot.readMessageEnd()
+result.read(iprot)
+iprot.readMessageEnd()
 if result.success is not None:
   return result.success
 if result.ouch1 is not None:
@@ -789,7 +792,7 @@ class Client(Iface):
   raise result.ouch2
 if result.ouch3 is not None:
   raise result.ouch3
-raise TApplicationException(TApplicationException.MISSING_RESULT, 
"addConstraint failed: unknown result");
+raise TApplicationException(TApplicationException.MISSING_RESULT, 
"addConstraint failed: unknown result")
 
   def addSplits(self, login, tableName, splits):
 """
@@ -812,15 +815,16 @@ class Client(Iface):
 self._oprot.trans.flush()
 
   def recv_addSplits(self):
-(fname, mtype, rseqid) = self._iprot.readMessageBegin()
+iprot = self._iprot
+(fname, mtype, rseqid) = iprot.readMessageBegin()
 if mtype == TMessageType.EXCEPTION:
   x = TApplicationException()
-  x.read(self._iprot)
-  self._iprot.readMessageEnd()
+  x.read(iprot)
+  iprot.readMessageEnd()
   raise x
 result = addSplits_result()
-result.read(self._iprot)
-self._iprot.readMessageEnd()
+result.read(iprot)
+iprot.readMessageEnd()
 if result.ouch1 is not None:
   raise result.ouch1
 if result.ouch2 is not None:
@@ -852,15 +856,16 @@ class Client(Iface):
 self._oprot.trans.flush()
 
   def recv_attachIterator(self):
-(fname, mtype, rseqid) = self._iprot.readMessageBegin()
+iprot = self._iprot
+(fname, mtype, rseqid) = iprot.readMessageBegin()
 if mtype == TMessageType.EXCEPTION:
   x = TApplicationException()
-  x.read(self._iprot)
-  self._iprot.readMessageEnd()
+  x.read(iprot)
+  iprot.readMessageEnd()
   raise x
 result = attachIterator_result()
-result.read(self._iprot)
-self._iprot.readMessageEnd()
+result.read(iprot)
+iprot.readMessageEnd()
 if result.ouch1 is not None:
   raise result.ouch1
 if result.ouch2 is not None:
@@ -892,15 +897,16 @@ class Client(Iface):
 self._oprot.trans.flush()
 
   def recv_checkIteratorConflicts(self):
-(fname, mtype, rseqid) = self._iprot.readMessageBegin()
+iprot = self._iprot
+(fname, mtype, rseqid) = iprot.readMessageBegin()
 if mtype == TMessageType.EXCEPTION:
   x = TApplicationException()
-  x.read(self._iprot)
-  self._iprot.readMessageEnd()
+  x.read(iprot)
+  iprot.readMessageEnd()
   raise x
 result = checkIteratorConflicts_result()
-result.read(self._iprot)
-self._iprot.readMessageEnd()
+

[03/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

[ecn]

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyExtent.java
--
diff --git 
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyExtent.java 
b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyExtent.java
index 1136284..d734fc6 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyExtent.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyExtent.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class 
KeyExtent implements org.apache.thrift.TBase, 
java.io.Serializable, Cloneable, Comparable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2015-12-16")
+public class KeyExtent implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("KeyExtent");
 
   private static final org.apache.thrift.protocol.TField TABLE_ID_FIELD_DESC = 
new org.apache.thrift.protocol.TField("tableId", 
org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -153,8 +156,8 @@ import org.slf4j.LoggerFactory;
   {
 this();
 this.tableId = tableId;
-this.endRow = endRow;
-this.prevEndRow = prevEndRow;
+this.endRow = org.apache.thrift.TBaseHelper.copyBinary(endRow);
+this.prevEndRow = org.apache.thrift.TBaseHelper.copyBinary(prevEndRow);
   }
 
   /**
@@ -166,11 +169,9 @@ import org.slf4j.LoggerFactory;
 }
 if (other.isSetEndRow()) {
   this.endRow = org.apache.thrift.TBaseHelper.copyBinary(other.endRow);
-;
 }
 if (other.isSetPrevEndRow()) {
   this.prevEndRow = 
org.apache.thrift.TBaseHelper.copyBinary(other.prevEndRow);
-;
 }
   }
 
@@ -215,16 +216,16 @@ import org.slf4j.LoggerFactory;
   }
 
   public ByteBuffer bufferForEndRow() {
-return endRow;
+return org.apache.thrift.TBaseHelper.copyBinary(endRow);
   }
 
   public KeyExtent setEndRow(byte[] endRow) {
-setEndRow(endRow == null ? (ByteBuffer)null : ByteBuffer.wrap(endRow));
+this.endRow = endRow == null ? (ByteBuffer)null : 
ByteBuffer.wrap(Arrays.copyOf(endRow, endRow.length));
 return this;
   }
 
   public KeyExtent setEndRow(ByteBuffer endRow) {
-this.endRow = endRow;
+this.endRow = org.apache.thrift.TBaseHelper.copyBinary(endRow);
 return this;
   }
 
@@ -249,16 +250,16 @@ import org.slf4j.LoggerFactory;
   }
 
   public ByteBuffer bufferForPrevEndRow() {
-return prevEndRow;
+return org.apache.thrift.TBaseHelper.copyBinary(prevEndRow);
   }
 
   public KeyExtent setPrevEndRow(byte[] prevEndRow) {
-setPrevEndRow(prevEndRow == null ? (ByteBuffer)null : 
ByteBuffer.wrap(prevEndRow));
+this.prevEndRow = prevEndRow == null ? (ByteBuffer)null : 
ByteBuffer.wrap(Arrays.copyOf(prevEndRow, prevEndRow.length));
 return this;
   }
 
   public KeyExtent setPrevEndRow(ByteBuffer prevEndRow) {
-this.prevEndRow = prevEndRow;
+this.prevEndRow = org.apache.thrift.TBaseHelper.copyBinary(prevEndRow);
 return this;
   }
 
@@ -383,7 +384,24 @@ import org.slf4j.LoggerFactory;
 
   @Override
   public int hashCode() {
-return 0;
+List list = new ArrayList();
+
+boolean present_tableId = true && (isSetTableId());
+list.add(present_tableId);
+if (present_tableId)
+  list.add(tableId);
+
+boolean present_endRow = true && (isSetEndRow());
+list.add(present_endRow);
+if (present_endRow)
+  list.add(endRow);
+
+boolean present_prevEndRow = true && (isSetPrevEndRow());
+list.add(present_prevEndRow);
+if (present_prevEndRow)
+  list.add(prevEndRow);
+
+return list.hashCode();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyValue.java
--
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyValue.java 
b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyValue.java
index 76d71b5..976fa4b 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyValue.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyValue.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- 

[11/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

[ecn]

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java
 
b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java
index 310d3b6..ee819ad 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class 
TabletStats implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2015-12-16")
+public class TabletStats implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("TabletStats");
 
   private static final org.apache.thrift.protocol.TField EXTENT_FIELD_DESC = 
new org.apache.thrift.protocol.TField("extent", 
org.apache.thrift.protocol.TType.STRUCT, (short)1);
@@ -526,16 +529,16 @@ import org.slf4j.LoggerFactory;
   return getSplits();
 
 case NUM_ENTRIES:
-  return Long.valueOf(getNumEntries());
+  return getNumEntries();
 
 case INGEST_RATE:
-  return Double.valueOf(getIngestRate());
+  return getIngestRate();
 
 case QUERY_RATE:
-  return Double.valueOf(getQueryRate());
+  return getQueryRate();
 
 case SPLIT_CREATION_TIME:
-  return Long.valueOf(getSplitCreationTime());
+  return getSplitCreationTime();
 
 }
 throw new IllegalStateException();
@@ -658,7 +661,49 @@ import org.slf4j.LoggerFactory;
 
   @Override
   public int hashCode() {
-return 0;
+List list = new ArrayList();
+
+boolean present_extent = true && (isSetExtent());
+list.add(present_extent);
+if (present_extent)
+  list.add(extent);
+
+boolean present_majors = true && (isSetMajors());
+list.add(present_majors);
+if (present_majors)
+  list.add(majors);
+
+boolean present_minors = true && (isSetMinors());
+list.add(present_minors);
+if (present_minors)
+  list.add(minors);
+
+boolean present_splits = true && (isSetSplits());
+list.add(present_splits);
+if (present_splits)
+  list.add(splits);
+
+boolean present_numEntries = true;
+list.add(present_numEntries);
+if (present_numEntries)
+  list.add(numEntries);
+
+boolean present_ingestRate = true;
+list.add(present_ingestRate);
+if (present_ingestRate)
+  list.add(ingestRate);
+
+boolean present_queryRate = true;
+list.add(present_queryRate);
+if (present_queryRate)
+  list.add(queryRate);
+
+boolean present_splitCreationTime = true;
+list.add(present_splitCreationTime);
+if (present_splitCreationTime)
+  list.add(splitCreationTime);
+
+return list.hashCode();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TooManyFilesException.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TooManyFilesException.java
 
b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TooManyFilesException.java
index 203597a..30399cb 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TooManyFilesException.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TooManyFilesException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class 
TooManyFilesException extends 

[12/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

[ecn]

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
 
b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
index dc964b9..3d4b0c8 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class 
TabletClientService {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2015-12-16")
+public class TabletClientService {
 
   public interface Iface extends 
org.apache.accumulo.core.client.impl.thrift.ClientService.Iface {
 
@@ -297,7 +300,7 @@ import org.slf4j.LoggerFactory;
   closeScan_args args = new closeScan_args();
   args.setTinfo(tinfo);
   args.setScanID(scanID);
-  sendBase("closeScan", args);
+  sendBaseOneway("closeScan", args);
 }
 
 public org.apache.accumulo.core.data.thrift.InitialMultiScan 
startMultiScan(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
Map
 batch, List columns, 
List ssiList, 
Map> ssio, List authorizations, boolean 
waitForWrites, TSamplerConfiguration samplerConfig, long batchTimeOut, String 
classLoaderContext) throws 
org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, 
TSampleNotPresentException, org.apache.thrift.TException
@@ -433,7 +436,7 @@ import org.slf4j.LoggerFactory;
   args.setUpdateID(updateID);
   args.setKeyExtent(keyExtent);
   args.setMutations(mutations);
-  sendBase("applyUpdates", args);
+  sendBaseOneway("applyUpdates", args);
 }
 
 public org.apache.accumulo.core.data.thrift.UpdateErrors 
closeUpdate(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long updateID) 
throws NoSuchScanIDException, org.apache.thrift.TException
@@ -587,7 +590,7 @@ import org.slf4j.LoggerFactory;
   closeConditionalUpdate_args args = new closeConditionalUpdate_args();
   args.setTinfo(tinfo);
   args.setSessID(sessID);
-  sendBase("closeConditionalUpdate", args);
+  sendBaseOneway("closeConditionalUpdate", args);
 }
 
 public List 
bulkImport(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, long tid, 
Map>
 files, boolean setTime) throws 
org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, 
org.apache.thrift.TException
@@ -661,7 +664,7 @@ import org.slf4j.LoggerFactory;
   args.setCredentials(credentials);
   args.setLock(lock);
   args.setExtent(extent);
-  sendBase("loadTablet", args);
+  sendBaseOneway("loadTablet", args);
 }
 
 public void unloadTablet(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
String lock, org.apache.accumulo.core.data.thrift.TKeyExtent extent, boolean 
save) throws org.apache.thrift.TException
@@ -677,7 +680,7 @@ import org.slf4j.LoggerFactory;
   args.setLock(lock);
   args.setExtent(extent);
   args.setSave(save);
-  sendBase("unloadTablet", args);
+  sendBaseOneway("unloadTablet", args);
 }
 
 public void flush(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, 
String tableId, ByteBuffer startRow, ByteBuffer endRow) throws 
org.apache.thrift.TException
@@ -694,7 +697,7 @@ import org.slf4j.LoggerFactory;
   args.setTableId(tableId);
   args.setStartRow(startRow);
   args.setEndRow(endRow);
-  sendBase("flush", args);
+  sendBaseOneway("flush", args);
 }
 
 public void flushTablet(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, 
org.apache.accumulo.core.data.thrift.TKeyExtent extent) throws 
org.apache.thrift.TException

[10/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

[ecn]

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/cpp/AccumuloProxy.cpp
--
diff --git a/proxy/src/main/cpp/AccumuloProxy.cpp 
b/proxy/src/main/cpp/AccumuloProxy.cpp
index b220dcb..d74ad95 100644
--- a/proxy/src/main/cpp/AccumuloProxy.cpp
+++ b/proxy/src/main/cpp/AccumuloProxy.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,8 +24,14 @@
 
 namespace accumulo {
 
+
+AccumuloProxy_login_args::~AccumuloProxy_login_args() throw() {
+}
+
+
 uint32_t AccumuloProxy_login_args::read(::apache::thrift::protocol::TProtocol* 
iprot) {
 
+  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -56,17 +62,17 @@ uint32_t 
AccumuloProxy_login_args::read(::apache::thrift::protocol::TProtocol* i
 if (ftype == ::apache::thrift::protocol::T_MAP) {
   {
 this->loginProperties.clear();
-uint32_t _size133;
-::apache::thrift::protocol::TType _ktype134;
-::apache::thrift::protocol::TType _vtype135;
-xfer += iprot->readMapBegin(_ktype134, _vtype135, _size133);
-uint32_t _i137;
-for (_i137 = 0; _i137 < _size133; ++_i137)
+uint32_t _size189;
+::apache::thrift::protocol::TType _ktype190;
+::apache::thrift::protocol::TType _vtype191;
+xfer += iprot->readMapBegin(_ktype190, _vtype191, _size189);
+uint32_t _i193;
+for (_i193 = 0; _i193 < _size189; ++_i193)
 {
-  std::string _key138;
-  xfer += iprot->readString(_key138);
-  std::string& _val139 = this->loginProperties[_key138];
-  xfer += iprot->readString(_val139);
+  std::string _key194;
+  xfer += iprot->readString(_key194);
+  std::string& _val195 = this->loginProperties[_key194];
+  xfer += iprot->readString(_val195);
 }
 xfer += iprot->readMapEnd();
   }
@@ -89,6 +95,7 @@ uint32_t 
AccumuloProxy_login_args::read(::apache::thrift::protocol::TProtocol* i
 
 uint32_t 
AccumuloProxy_login_args::write(::apache::thrift::protocol::TProtocol* oprot) 
const {
   uint32_t xfer = 0;
+  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_login_args");
 
   xfer += oprot->writeFieldBegin("principal", 
::apache::thrift::protocol::T_STRING, 1);
@@ -98,11 +105,11 @@ uint32_t 
AccumuloProxy_login_args::write(::apache::thrift::protocol::TProtocol*
   xfer += oprot->writeFieldBegin("loginProperties", 
::apache::thrift::protocol::T_MAP, 2);
   {
 xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, 
::apache::thrift::protocol::T_STRING, 
static_cast(this->loginProperties.size()));
-std::map ::const_iterator _iter140;
-for (_iter140 = this->loginProperties.begin(); _iter140 != 
this->loginProperties.end(); ++_iter140)
+std::map ::const_iterator _iter196;
+for (_iter196 = this->loginProperties.begin(); _iter196 != 
this->loginProperties.end(); ++_iter196)
 {
-  xfer += oprot->writeString(_iter140->first);
-  xfer += oprot->writeString(_iter140->second);
+  xfer += oprot->writeString(_iter196->first);
+  xfer += oprot->writeString(_iter196->second);
 }
 xfer += oprot->writeMapEnd();
   }
@@ -113,8 +120,14 @@ uint32_t 
AccumuloProxy_login_args::write(::apache::thrift::protocol::TProtocol*
   return xfer;
 }
 
+
+AccumuloProxy_login_pargs::~AccumuloProxy_login_pargs() throw() {
+}
+
+
 uint32_t 
AccumuloProxy_login_pargs::write(::apache::thrift::protocol::TProtocol* oprot) 
const {
   uint32_t xfer = 0;
+  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_login_pargs");
 
   xfer += oprot->writeFieldBegin("principal", 
::apache::thrift::protocol::T_STRING, 1);
@@ -124,11 +137,11 @@ uint32_t 
AccumuloProxy_login_pargs::write(::apache::thrift::protocol::TProtocol*
   xfer += oprot->writeFieldBegin("loginProperties", 
::apache::thrift::protocol::T_MAP, 2);
   {
 xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, 
::apache::thrift::protocol::T_STRING, 
static_cast((*(this->loginProperties)).size()));
-std::map ::const_iterator _iter141;
-for (_iter141 = (*(this->loginProperties)).begin(); _iter141 != 
(*(this->loginProperties)).end(); ++_iter141)
+std::map ::const_iterator _iter197;
+for (_iter197 = (*(this->loginProperties)).begin(); _iter197 != 
(*(this->loginProperties)).end(); 

[13/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

[ecn]

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java
 
b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java
index 86a502b..f26a581 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class 
ActionStats implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2015-12-16")
+public class ActionStats implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("ActionStats");
 
   private static final org.apache.thrift.protocol.TField STATUS_FIELD_DESC = 
new org.apache.thrift.protocol.TField("status", 
org.apache.thrift.protocol.TType.I32, (short)1);
@@ -514,28 +517,28 @@ import org.slf4j.LoggerFactory;
   public Object getFieldValue(_Fields field) {
 switch (field) {
 case STATUS:
-  return Integer.valueOf(getStatus());
+  return getStatus();
 
 case ELAPSED:
-  return Double.valueOf(getElapsed());
+  return getElapsed();
 
 case NUM:
-  return Integer.valueOf(getNum());
+  return getNum();
 
 case COUNT:
-  return Long.valueOf(getCount());
+  return getCount();
 
 case SUM_DEV:
-  return Double.valueOf(getSumDev());
+  return getSumDev();
 
 case FAIL:
-  return Integer.valueOf(getFail());
+  return getFail();
 
 case QUEUE_TIME:
-  return Double.valueOf(getQueueTime());
+  return getQueueTime();
 
 case QUEUE_SUM_DEV:
-  return Double.valueOf(getQueueSumDev());
+  return getQueueSumDev();
 
 }
 throw new IllegalStateException();
@@ -658,7 +661,49 @@ import org.slf4j.LoggerFactory;
 
   @Override
   public int hashCode() {
-return 0;
+List list = new ArrayList();
+
+boolean present_status = true;
+list.add(present_status);
+if (present_status)
+  list.add(status);
+
+boolean present_elapsed = true;
+list.add(present_elapsed);
+if (present_elapsed)
+  list.add(elapsed);
+
+boolean present_num = true;
+list.add(present_num);
+if (present_num)
+  list.add(num);
+
+boolean present_count = true;
+list.add(present_count);
+if (present_count)
+  list.add(count);
+
+boolean present_sumDev = true;
+list.add(present_sumDev);
+if (present_sumDev)
+  list.add(sumDev);
+
+boolean present_fail = true;
+list.add(present_fail);
+if (present_fail)
+  list.add(fail);
+
+boolean present_queueTime = true;
+list.add(present_queueTime);
+if (present_queueTime)
+  list.add(queueTime);
+
+boolean present_queueSumDev = true;
+list.add(present_queueSumDev);
+if (present_queueSumDev)
+  list.add(queueSumDev);
+
+return list.hashCode();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java
 
b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java
index 9c1977d..b32b38e 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import 

[17/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

[ecn]

ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3af75fc6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3af75fc6
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3af75fc6

Branch: refs/heads/master
Commit: 3af75fc685d6e2a90a9f68c204122a87ac90e781
Parents: c7b27e0
Author: Eric C. Newton 
Authored: Wed Dec 16 16:08:33 2015 -0500
Committer: Eric C. Newton 
Committed: Wed Dec 16 16:08:33 2015 -0500

--
 .../core/client/impl/thrift/ClientService.java  |  1278 +-
 .../client/impl/thrift/ConfigurationType.java   | 2 +-
 .../client/impl/thrift/SecurityErrorCode.java   | 2 +-
 .../core/client/impl/thrift/TDiskUsage.java |39 +-
 .../core/client/impl/thrift/TableOperation.java | 2 +-
 .../thrift/TableOperationExceptionType.java | 2 +-
 .../impl/thrift/ThriftSecurityException.java|25 +-
 .../thrift/ThriftTableOperationException.java   |44 +-
 .../core/client/impl/thrift/ThriftTest.java |57 +-
 .../core/data/thrift/InitialMultiScan.java  |23 +-
 .../accumulo/core/data/thrift/InitialScan.java  |23 +-
 .../accumulo/core/data/thrift/IterInfo.java |28 +-
 .../accumulo/core/data/thrift/MapFileInfo.java  |18 +-
 .../core/data/thrift/MultiScanResult.java   |   138 +-
 .../accumulo/core/data/thrift/ScanResult.java   |43 +-
 .../accumulo/core/data/thrift/TCMResult.java|27 +-
 .../accumulo/core/data/thrift/TCMStatus.java| 2 +-
 .../accumulo/core/data/thrift/TColumn.java  |53 +-
 .../accumulo/core/data/thrift/TCondition.java   |95 +-
 .../core/data/thrift/TConditionalMutation.java  |48 +-
 .../core/data/thrift/TConditionalSession.java   |30 +-
 .../thrift/TConstraintViolationSummary.java |35 +-
 .../apache/accumulo/core/data/thrift/TKey.java  |74 +-
 .../accumulo/core/data/thrift/TKeyExtent.java   |53 +-
 .../accumulo/core/data/thrift/TKeyValue.java|30 +-
 .../accumulo/core/data/thrift/TMutation.java|92 +-
 .../accumulo/core/data/thrift/TRange.java   |49 +-
 .../accumulo/core/data/thrift/UpdateErrors.java |   102 +-
 .../core/gc/thrift/GCMonitorService.java|35 +-
 .../accumulo/core/gc/thrift/GCStatus.java   |31 +-
 .../accumulo/core/gc/thrift/GcCycleStats.java   |53 +-
 .../core/master/thrift/BulkImportState.java | 2 +-
 .../core/master/thrift/BulkImportStatus.java|32 +-
 .../accumulo/core/master/thrift/Compacting.java |25 +-
 .../accumulo/core/master/thrift/DeadServer.java |28 +-
 .../core/master/thrift/FateOperation.java   | 2 +-
 .../core/master/thrift/FateService.java |   210 +-
 .../core/master/thrift/MasterClientService.java |   676 +-
 .../core/master/thrift/MasterGoalState.java | 2 +-
 .../core/master/thrift/MasterMonitorInfo.java   |   194 +-
 .../core/master/thrift/MasterState.java | 2 +-
 .../core/master/thrift/RecoveryException.java   |16 +-
 .../core/master/thrift/RecoveryStatus.java  |30 +-
 .../accumulo/core/master/thrift/TableInfo.java  |89 +-
 .../core/master/thrift/TabletLoadState.java | 2 +-
 .../core/master/thrift/TabletServerStatus.java  |   169 +-
 .../core/master/thrift/TabletSplit.java |41 +-
 .../core/replication/thrift/KeyValues.java  |36 +-
 .../thrift/RemoteReplicationErrorCode.java  | 2 +-
 .../thrift/RemoteReplicationException.java  |25 +-
 .../thrift/ReplicationCoordinator.java  |35 +-
 .../thrift/ReplicationCoordinatorErrorCode.java | 2 +-
 .../thrift/ReplicationCoordinatorException.java |25 +-
 .../replication/thrift/ReplicationServicer.java |77 +-
 .../core/replication/thrift/WalEdits.java   |34 +-
 .../security/thrift/TAuthenticationKey.java |48 +-
 .../thrift/TAuthenticationTokenIdentifier.java  |44 +-
 .../core/security/thrift/TCredentials.java  |40 +-
 .../core/security/thrift/TDelegationToken.java  |30 +-
 .../security/thrift/TDelegationTokenConfig.java |20 +-
 .../core/tabletserver/thrift/ActionStats.java   |67 +-
 .../tabletserver/thrift/ActiveCompaction.java   |   164 +-
 .../core/tabletserver/thrift/ActiveScan.java|   203 +-
 .../tabletserver/thrift/CompactionReason.java   | 2 +-
 .../tabletserver/thrift/CompactionType.java | 2 +-
 .../thrift/ConstraintViolationException.java|36 +-
 .../tabletserver/thrift/IteratorConfig.java |36 +-
 .../thrift/NoSuchScanIDException.java   |11 +-
 .../thrift/NotServingTabletException.java   |16 +-
 .../core/tabletserver/thrift/ScanState.java | 2 +-
 .../core/tabletserver/thrift/ScanType.java  | 2 +-
 .../core/tabletserver/thrift/TDurability.java   |   

[04/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

[ecn]

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloSecurityException.java
--
diff --git 
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloSecurityException.java
 
b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloSecurityException.java
index 28b1e6c..a3f9a06 100644
--- 
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloSecurityException.java
+++ 
b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloSecurityException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class 
AccumuloSecurityException extends TException implements 
org.apache.thrift.TBase, java.io.Serializable, Cloneable, 
Comparable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2015-12-16")
+public class AccumuloSecurityException extends TException implements 
org.apache.thrift.TBase, java.io.Serializable, Cloneable, 
Comparable {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("AccumuloSecurityException");
 
   private static final org.apache.thrift.protocol.TField MSG_FIELD_DESC = new 
org.apache.thrift.protocol.TField("msg", 
org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -243,7 +246,14 @@ import org.slf4j.LoggerFactory;
 
   @Override
   public int hashCode() {
-return 0;
+List list = new ArrayList();
+
+boolean present_msg = true && (isSetMsg());
+list.add(present_msg);
+if (present_msg)
+  list.add(msg);
+
+return list.hashCode();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java
--
diff --git 
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java 
b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java
index 58e1321..40f3435 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class 
ActiveCompaction implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, 
Comparable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2015-12-16")
+public class ActiveCompaction implements 
org.apache.thrift.TBase, 
java.io.Serializable, Cloneable, Comparable {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("ActiveCompaction");
 
   private static final org.apache.thrift.protocol.TField EXTENT_FIELD_DESC = 
new org.apache.thrift.protocol.TField("extent", 
org.apache.thrift.protocol.TType.STRUCT, (short)1);
@@ -676,7 +679,7 @@ import org.slf4j.LoggerFactory;
   return getExtent();
 
 case AGE:
-  return Long.valueOf(getAge());
+  return getAge();
 
 case INPUT_FILES:
   return getInputFiles();
@@ -694,10 +697,10 @@ import org.slf4j.LoggerFactory;
   return getLocalityGroup();
 
 case ENTRIES_READ:
-  return Long.valueOf(getEntriesRead());
+  return getEntriesRead();
 
 case ENTRIES_WRITTEN:
-  return Long.valueOf(getEntriesWritten());
+  return getEntriesWritten();
 
 case ITERATORS:
   return getIterators();
@@ -845,7 +848,59 @@ import org.slf4j.LoggerFactory;
 
   @Override
   public int hashCode() {
-return 0;
+List list = new ArrayList();
+
+boolean 

[2/6] accumulo git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo

[ecn]

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/139f489c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/139f489c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/139f489c

Branch: refs/heads/master
Commit: 139f489cad4afc3773f81b919d57010dc72db6d1
Parents: 8a8d674 0e136c1
Author: Eric C. Newton 
Authored: Fri Nov 13 06:45:12 2015 -0500
Committer: Eric C. Newton 
Committed: Fri Nov 13 06:45:12 2015 -0500

--
 assemble/bin/bootstrap_config.sh| 29 -
 assemble/conf/templates/accumulo-site.xml   |  9 
 .../org/apache/accumulo/core/conf/Property.java | 11 +++--
 .../iterators/system/TimeSettingIterator.java   |  2 +-
 .../system/TimeSettingIteratorTest.java | 31 --
 .../master/balancer/ChaoticLoadBalancer.java| 17 
 .../accumulo/gc/GarbageCollectionAlgorithm.java |  5 +--
 .../org/apache/accumulo/monitor/Monitor.java|  3 --
 .../apache/accumulo/tserver/TabletServer.java   | 16 +--
 .../tserver/log/TabletServerLogger.java | 44 +++-
 .../accumulo/test/TabletServerGivesUpIT.java|  2 +
 11 files changed, 141 insertions(+), 28 deletions(-)
--

[4/6] accumulo git commit: ACCUMULO-4041 memoize isSensitive for faster lookups in getSiteConfiguration

[ecn]

ACCUMULO-4041 memoize isSensitive for faster lookups in getSiteConfiguration


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/81b6d5b9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/81b6d5b9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/81b6d5b9

Branch: refs/heads/master
Commit: 81b6d5b94d4e99d68fd0fcc07433e25219cecd94
Parents: b8ffe4c 78522c4
Author: Eric C. Newton 
Authored: Fri Nov 13 06:57:34 2015 -0500
Committer: Eric C. Newton 
Committed: Fri Nov 13 06:57:34 2015 -0500

--
 .../src/main/java/org/apache/accumulo/core/conf/Property.java | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/81b6d5b9/core/src/main/java/org/apache/accumulo/core/conf/Property.java
--
diff --cc core/src/main/java/org/apache/accumulo/core/conf/Property.java
index 055e7dd,6d1f043..df53791
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@@ -668,23 -523,15 +668,28 @@@ public enum Property 
  return hasAnnotation(Deprecated.class) || 
hasPrefixWithAnnotation(getKey(), Deprecated.class);
}
  
+   private volatile Boolean isSensitive = null;
+ 
 +  /**
 +   * Checks if this property is sensitive.
 +   *
 +   * @return true if this property is sensitive
 +   */
public boolean isSensitive() {
- return hasAnnotation(Sensitive.class) || 
hasPrefixWithAnnotation(getKey(), Sensitive.class);
+ if (isSensitive == null) {
+   isSensitive = hasAnnotation(Sensitive.class) || 
hasPrefixWithAnnotation(getKey(), Sensitive.class);
+ }
+ return isSensitive.booleanValue();
}
  
 +  /**
 +   * Checks if a property with the given key is sensitive. The key must be 
for a valid property, and must either itself be annotated as sensitive or have a
 +   * prefix annotated as sensitive.
 +   *
 +   * @param key
 +   *  property key
 +   * @return true if property is sensitive
 +   */
public static boolean isSensitive(String key) {
  return hasPrefixWithAnnotation(key, Sensitive.class);
}

[1/2] accumulo git commit: ACCUMULO-4041 memoize isSensitive for faster lookups in getSiteConfiguration

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/1.7 b8ffe4c76 -> 81b6d5b94


ACCUMULO-4041 memoize isSensitive for faster lookups in getSiteConfiguration


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/78522c4c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/78522c4c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/78522c4c

Branch: refs/heads/1.7
Commit: 78522c4cd4432ee2ab78c4b585fa040ff4e1c365
Parents: 1619ae4
Author: Eric C. Newton 
Authored: Fri Nov 13 06:53:56 2015 -0500
Committer: Eric C. Newton 
Committed: Fri Nov 13 06:53:56 2015 -0500

--
 .../src/main/java/org/apache/accumulo/core/conf/Property.java | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/78522c4c/core/src/main/java/org/apache/accumulo/core/conf/Property.java
--
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/Property.java 
b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
index d17b8aa..6d1f043 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@ -523,8 +523,13 @@ public enum Property {
 return hasAnnotation(Deprecated.class) || 
hasPrefixWithAnnotation(getKey(), Deprecated.class);
   }
 
+  private volatile Boolean isSensitive = null;
+
   public boolean isSensitive() {
-return hasAnnotation(Sensitive.class) || hasPrefixWithAnnotation(getKey(), 
Sensitive.class);
+if (isSensitive == null) {
+  isSensitive = hasAnnotation(Sensitive.class) || 
hasPrefixWithAnnotation(getKey(), Sensitive.class);
+}
+return isSensitive.booleanValue();
   }
 
   public static boolean isSensitive(String key) {

[5/6] accumulo git commit: Merge branch '1.7'

[ecn]

Merge branch '1.7'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/58911cc8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/58911cc8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/58911cc8

Branch: refs/heads/master
Commit: 58911cc8e2277a4b192673217aaf996216a0898c
Parents: 139f489 81b6d5b
Author: Eric C. Newton 
Authored: Fri Nov 13 06:57:46 2015 -0500
Committer: Eric C. Newton 
Committed: Fri Nov 13 06:57:46 2015 -0500

--
 .../src/main/java/org/apache/accumulo/core/conf/Property.java | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/58911cc8/core/src/main/java/org/apache/accumulo/core/conf/Property.java
--

[1/6] accumulo git commit: ACCUMULO-4034 pester the gc and secondarynamenode, too

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/master 0e136c1f4 -> 35cc52e94


ACCUMULO-4034 pester the gc and secondarynamenode, too


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8a8d674b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8a8d674b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8a8d674b

Branch: refs/heads/master
Commit: 8a8d674b2c4352a03e945f06272b7c06216a9c13
Parents: 8f52ab2
Author: Eric C. Newton 
Authored: Fri Oct 23 16:00:04 2015 -0400
Committer: Eric C. Newton 
Committed: Fri Oct 23 16:00:04 2015 -0400

--
 test/system/agitator/agitator.py | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/8a8d674b/test/system/agitator/agitator.py
--
diff --git a/test/system/agitator/agitator.py b/test/system/agitator/agitator.py
index e458016..cfab019 100755
--- a/test/system/agitator/agitator.py
+++ b/test/system/agitator/agitator.py
@@ -190,10 +190,12 @@ def main():
parser = argparse.ArgumentParser(description='Kill random processes')
parser.add_argument('--log', help='set the log level', default='INFO')
parser.add_argument('--namenodes', help='randomly kill namenodes', 
action="store_true")
+   parser.add_argument('--secondary', help='randomly kill secondary namenode', 
action="store_true")
parser.add_argument('--datanodes', help='randomly kill datanodes', 
action="store_true")
parser.add_argument('--tservers', help='randomly kill tservers', 
action="store_true")
parser.add_argument('--masters', help='randomly kill masters', 
action="store_true")
parser.add_argument('--zookeepers', help='randomly kill zookeepers', 
action="store_true")
+   parser.add_argument('--gc', help='randomly kill the file garbage 
collector', action="store_true")
parser.add_argument('--all', 
help='kill any of the tservers, masters, datanodes, 
namenodes or zookeepers', 
action='store_true')
@@ -214,8 +216,10 @@ def main():
 
addIf(args.namenodes,  Hadoop('namenode'))
addIf(args.datanodes,  Hadoop('datanode'))
+   addIf(args.secondary,  Hadoop('secondarynamenode'))
addIf(args.tservers,   Accumulo('tserver'))
addIf(args.masters,Accumulo('master'))
+   addIf(args.gc, Accumulo('gc'))
addIf(args.zookeepers, Zookeeper())
if len(procs) == 0:
fail("No processes to agitate!\n")

[3/6] accumulo git commit: ACCUMULO-4041 memoize isSensitive for faster lookups in getSiteConfiguration

[ecn]

ACCUMULO-4041 memoize isSensitive for faster lookups in getSiteConfiguration


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/78522c4c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/78522c4c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/78522c4c

Branch: refs/heads/master
Commit: 78522c4cd4432ee2ab78c4b585fa040ff4e1c365
Parents: 1619ae4
Author: Eric C. Newton 
Authored: Fri Nov 13 06:53:56 2015 -0500
Committer: Eric C. Newton 
Committed: Fri Nov 13 06:53:56 2015 -0500

--
 .../src/main/java/org/apache/accumulo/core/conf/Property.java | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/78522c4c/core/src/main/java/org/apache/accumulo/core/conf/Property.java
--
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/Property.java 
b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
index d17b8aa..6d1f043 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@ -523,8 +523,13 @@ public enum Property {
 return hasAnnotation(Deprecated.class) || 
hasPrefixWithAnnotation(getKey(), Deprecated.class);
   }
 
+  private volatile Boolean isSensitive = null;
+
   public boolean isSensitive() {
-return hasAnnotation(Sensitive.class) || hasPrefixWithAnnotation(getKey(), 
Sensitive.class);
+if (isSensitive == null) {
+  isSensitive = hasAnnotation(Sensitive.class) || 
hasPrefixWithAnnotation(getKey(), Sensitive.class);
+}
+return isSensitive.booleanValue();
   }
 
   public static boolean isSensitive(String key) {

[6/6] accumulo git commit: ACCUMULO-4034 agitate secondary NN and gc, too

[ecn]

ACCUMULO-4034 agitate secondary NN and gc, too


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/35cc52e9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/35cc52e9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/35cc52e9

Branch: refs/heads/master
Commit: 35cc52e9473ba25b990a5a02731cee11d9301e76
Parents: 58911cc
Author: Eric C. Newton 
Authored: Fri Nov 13 07:04:03 2015 -0500
Committer: Eric C. Newton 
Committed: Fri Nov 13 07:04:03 2015 -0500

--
 test/system/agitator/agitator.ini.example | 8 
 test/system/agitator/agitator.py  | 9 ++---
 2 files changed, 14 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/35cc52e9/test/system/agitator/agitator.ini.example
--
diff --git a/test/system/agitator/agitator.ini.example 
b/test/system/agitator/agitator.ini.example
index c6f16c7..3512561 100644
--- a/test/system/agitator/agitator.ini.example
+++ b/test/system/agitator/agitator.ini.example
@@ -29,10 +29,15 @@ home=%(install)s/accumulo
 tserver.kill.min=1
 tserver.kill.max=1
 tserver.frequency=0.8
+
 master.kill.min=1
 master.kill.max=1
 master.frequency=0.1
 
+gc.kill.min=1
+gc.kill.max=1
+gc.frequency=0.1
+
 [hadoop]
 home=%(install)s/hadoop
 bin=%(home)s/bin
@@ -42,6 +47,9 @@ datanode.kill.max=1
 namenode.frequency=0.05
 namenode.kill.min=1
 namenode.kill.max=1
+secondarynamenode.frequency=0.05
+secondarynamenode.kill.min=1
+secondarynamenode.kill.max=1
 
 [zookeeper]
 home=%(install)s/zookeeper

http://git-wip-us.apache.org/repos/asf/accumulo/blob/35cc52e9/test/system/agitator/agitator.py
--
diff --git a/test/system/agitator/agitator.py b/test/system/agitator/agitator.py
index cfab019..db94546 100755
--- a/test/system/agitator/agitator.py
+++ b/test/system/agitator/agitator.py
@@ -158,10 +158,13 @@ def agitate(hosts, procs):
  if random.random() < p.frequencyToKill():
 
 # find them
-# TODO: in parallel
+from multiprocessing import Pool
+def finder(host):
+   return host, p.find(host)
+with Pool(5) as pool:
+   result = pool.map(finder, hosts)
 candidates = {}
-for host in hosts:
-   pids = p.find(host)
+for host, pids in result:
if pids:
   candidates[host] = pids
 

[2/2] accumulo git commit: ACCUMULO-4041 memoize isSensitive for faster lookups in getSiteConfiguration

[ecn]

ACCUMULO-4041 memoize isSensitive for faster lookups in getSiteConfiguration


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/81b6d5b9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/81b6d5b9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/81b6d5b9

Branch: refs/heads/1.7
Commit: 81b6d5b94d4e99d68fd0fcc07433e25219cecd94
Parents: b8ffe4c 78522c4
Author: Eric C. Newton 
Authored: Fri Nov 13 06:57:34 2015 -0500
Committer: Eric C. Newton 
Committed: Fri Nov 13 06:57:34 2015 -0500

--
 .../src/main/java/org/apache/accumulo/core/conf/Property.java | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/81b6d5b9/core/src/main/java/org/apache/accumulo/core/conf/Property.java
--
diff --cc core/src/main/java/org/apache/accumulo/core/conf/Property.java
index 055e7dd,6d1f043..df53791
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@@ -668,23 -523,15 +668,28 @@@ public enum Property 
  return hasAnnotation(Deprecated.class) || 
hasPrefixWithAnnotation(getKey(), Deprecated.class);
}
  
+   private volatile Boolean isSensitive = null;
+ 
 +  /**
 +   * Checks if this property is sensitive.
 +   *
 +   * @return true if this property is sensitive
 +   */
public boolean isSensitive() {
- return hasAnnotation(Sensitive.class) || 
hasPrefixWithAnnotation(getKey(), Sensitive.class);
+ if (isSensitive == null) {
+   isSensitive = hasAnnotation(Sensitive.class) || 
hasPrefixWithAnnotation(getKey(), Sensitive.class);
+ }
+ return isSensitive.booleanValue();
}
  
 +  /**
 +   * Checks if a property with the given key is sensitive. The key must be 
for a valid property, and must either itself be annotated as sensitive or have a
 +   * prefix annotated as sensitive.
 +   *
 +   * @param key
 +   *  property key
 +   * @return true if property is sensitive
 +   */
public static boolean isSensitive(String key) {
  return hasPrefixWithAnnotation(key, Sensitive.class);
}

accumulo git commit: ACCUMULO-4041 memoize isSensitive for faster lookups in getSiteConfiguration

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/1.6 1619ae409 -> 78522c4cd


ACCUMULO-4041 memoize isSensitive for faster lookups in getSiteConfiguration


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/78522c4c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/78522c4c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/78522c4c

Branch: refs/heads/1.6
Commit: 78522c4cd4432ee2ab78c4b585fa040ff4e1c365
Parents: 1619ae4
Author: Eric C. Newton 
Authored: Fri Nov 13 06:53:56 2015 -0500
Committer: Eric C. Newton 
Committed: Fri Nov 13 06:53:56 2015 -0500

--
 .../src/main/java/org/apache/accumulo/core/conf/Property.java | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/78522c4c/core/src/main/java/org/apache/accumulo/core/conf/Property.java
--
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/Property.java 
b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
index d17b8aa..6d1f043 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@ -523,8 +523,13 @@ public enum Property {
 return hasAnnotation(Deprecated.class) || 
hasPrefixWithAnnotation(getKey(), Deprecated.class);
   }
 
+  private volatile Boolean isSensitive = null;
+
   public boolean isSensitive() {
-return hasAnnotation(Sensitive.class) || hasPrefixWithAnnotation(getKey(), 
Sensitive.class);
+if (isSensitive == null) {
+  isSensitive = hasAnnotation(Sensitive.class) || 
hasPrefixWithAnnotation(getKey(), Sensitive.class);
+}
+return isSensitive.booleanValue();
   }
 
   public static boolean isSensitive(String key) {

[2/2] accumulo git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo

[ecn]

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/93e7a04b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/93e7a04b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/93e7a04b

Branch: refs/heads/master
Commit: 93e7a04bdf4403b2d1b103d5dce73eb2f50127b5
Parents: 7086bd2 a81b966
Author: Eric C. Newton 
Authored: Fri Oct 23 12:48:40 2015 -0400
Committer: Eric C. Newton 
Committed: Fri Oct 23 12:48:40 2015 -0400

--
 .../org/apache/accumulo/test/NamespacesIT.java  | 99 +++-
 1 file changed, 77 insertions(+), 22 deletions(-)
--

[1/2] accumulo git commit: ACCUMULO-4034 fixes from testing

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/master a81b966a7 -> 93e7a04bd


ACCUMULO-4034 fixes from testing


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7086bd2b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7086bd2b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7086bd2b

Branch: refs/heads/master
Commit: 7086bd2b8ad09f6493e1ebc53ca1affd8c2ba997
Parents: 43f4464
Author: Eric C. Newton 
Authored: Fri Oct 23 12:48:28 2015 -0400
Committer: Eric C. Newton 
Committed: Fri Oct 23 12:48:28 2015 -0400

--
 test/system/agitator/agitator.ini.example | 2 +-
 test/system/agitator/agitator.py  | 8 
 2 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/7086bd2b/test/system/agitator/agitator.ini.example
--
diff --git a/test/system/agitator/agitator.ini.example 
b/test/system/agitator/agitator.ini.example
index 825f0ed..c6f16c7 100644
--- a/test/system/agitator/agitator.ini.example
+++ b/test/system/agitator/agitator.ini.example
@@ -19,7 +19,7 @@ user=%(env.user)s
 
 [agitator]
 kill=kill -9
-ssh=ssh -q -t -A -o StrictHostKeyChecking=no
+ssh=ssh -q -A -o StrictHostKeyChecking=no
 sleep=300
 sleep.restart=30
 sleep.jitter=30

http://git-wip-us.apache.org/repos/asf/accumulo/blob/7086bd2b/test/system/agitator/agitator.py
--
diff --git a/test/system/agitator/agitator.py b/test/system/agitator/agitator.py
index 92b0b28..e458016 100755
--- a/test/system/agitator/agitator.py
+++ b/test/system/agitator/agitator.py
@@ -74,7 +74,7 @@ class Proc:
 class Zookeeper(Proc):
program = 'zookeeper'
def __init__(self):
-  _frequencyToKill = config.get(self.program, 'frequency')
+  self._frequencyToKill = config.getfloat(self.program, 'frequency')
 
def start(self, host):
   self.runOn(host, [config.get(self.program, 'home') + '/bin/zkServer.sh 
start'])
@@ -93,7 +93,7 @@ class Hadoop(Proc):
 
def start(self, host):
   binDir = config.get(self.section, 'bin')
-  self.runOn(host, ['nohup', binDir + "/hdfs", self.program, '&'])
+  self.runOn(host, ['nohup %s/hdfs %s < /dev/null >/dev/null 2>&1 &' 
%(binDir, self.program)])
  
def find(self, host):
   code, stdout, stderr = self.runOn(host, ["pgrep -f 'proc[_]%s' || true" 
% (self.program,)])
@@ -109,7 +109,7 @@ class Accumulo(Hadoop):
section = 'accumulo'
def start(self, host):
   home = config.get(self.section, 'home')
-  self.runOn(host, ['nohup', home + '/bin/accumulo', self.program, '&'])
+  self.runOn(host, ['nohup %s/bin/accumulo %s /dev/null 2>&1 & 
' %(home, self.program)])
 
def find(self, host):
   code, stdout, stderr = self.runOn(host, ["pgrep -f 'app[=]%s' || true" % 
self.program])
@@ -180,7 +180,7 @@ def agitate(hosts, procs):
   logging.error("Unable to kill any %s on %s: no processes of 
that type are running", p, doomedHost)
else:
   pid = random.choice(pids)
-  logging.info("Killing %s (%d) on %s", p, pid, host)
+  logging.debug("Killing %s (%d) on %s", p, pid, doomedHost)
   p.kill(doomedHost, pid)
   # remember to restart them later
   starters.append((doomedHost, p))

accumulo git commit: ACCUMULO-4038 assume a missing WAL node means the server had no logs

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/master 93e7a04bd -> feff4f9ac


ACCUMULO-4038 assume a missing WAL node means the server had no logs


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/feff4f9a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/feff4f9a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/feff4f9a

Branch: refs/heads/master
Commit: feff4f9aca7334ac0b01771f29a4696f9ff97a11
Parents: 93e7a04
Author: Eric C. Newton 
Authored: Fri Oct 23 15:21:41 2015 -0400
Committer: Eric C. Newton 
Committed: Fri Oct 23 15:21:41 2015 -0400

--
 .../main/java/org/apache/accumulo/server/log/WalStateManager.java  | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/feff4f9a/server/base/src/main/java/org/apache/accumulo/server/log/WalStateManager.java
--
diff --git 
a/server/base/src/main/java/org/apache/accumulo/server/log/WalStateManager.java 
b/server/base/src/main/java/org/apache/accumulo/server/log/WalStateManager.java
index 52844c1..1516176 100644
--- 
a/server/base/src/main/java/org/apache/accumulo/server/log/WalStateManager.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/log/WalStateManager.java
@@ -146,6 +146,8 @@ public class WalStateManager {
   result.add(parts.getSecond());
 }
   }
+} catch (KeeperException.NodeExistsException e) {
+  log.debug("{} has no wal entry in zookeeper, assuming no logs", tsi);
 } catch (KeeperException | InterruptedException e) {
   throw new WalMarkerException(e);
 }

accumulo git commit: ACCUMULO-4038 helps to check the right exception

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/master feff4f9ac -> 8f52ab250


ACCUMULO-4038 helps to check the right exception


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8f52ab25
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8f52ab25
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8f52ab25

Branch: refs/heads/master
Commit: 8f52ab2506deb98563e4acab1349c18f3eba9871
Parents: feff4f9
Author: Eric C. Newton 
Authored: Fri Oct 23 15:40:41 2015 -0400
Committer: Eric C. Newton 
Committed: Fri Oct 23 15:40:41 2015 -0400

--
 .../main/java/org/apache/accumulo/server/log/WalStateManager.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/8f52ab25/server/base/src/main/java/org/apache/accumulo/server/log/WalStateManager.java
--
diff --git 
a/server/base/src/main/java/org/apache/accumulo/server/log/WalStateManager.java 
b/server/base/src/main/java/org/apache/accumulo/server/log/WalStateManager.java
index 1516176..25d9168 100644
--- 
a/server/base/src/main/java/org/apache/accumulo/server/log/WalStateManager.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/log/WalStateManager.java
@@ -146,7 +146,7 @@ public class WalStateManager {
   result.add(parts.getSecond());
 }
   }
-} catch (KeeperException.NodeExistsException e) {
+} catch (KeeperException.NoNodeException e) {
   log.debug("{} has no wal entry in zookeeper, assuming no logs", tsi);
 } catch (KeeperException | InterruptedException e) {
   throw new WalMarkerException(e);

[1/3] accumulo git commit: ACCUMULO-4021 explicitly return a value that marks the end of GC

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/master 52ba24e32 -> 39f14472b


ACCUMULO-4021 explicitly return a value that marks the end of GC


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/deef5352
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/deef5352
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/deef5352

Branch: refs/heads/master
Commit: deef5352db0bec4b1578568c3da84220c43038a0
Parents: 5ca779a
Author: Eric C. Newton 
Authored: Tue Oct 20 16:14:35 2015 -0400
Committer: Eric C. Newton 
Committed: Tue Oct 20 16:14:35 2015 -0400

--
 .../accumulo/gc/GarbageCollectionAlgorithm.java | 16 +---
 .../accumulo/gc/GarbageCollectionEnvironment.java   |  6 --
 .../apache/accumulo/gc/SimpleGarbageCollector.java  | 10 --
 .../apache/accumulo/gc/GarbageCollectionTest.java   |  5 ++---
 4 files changed, 19 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/deef5352/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
--
diff --git 
a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
 
b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
index 0e016d5..a8cde31 100644
--- 
a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
+++ 
b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
@@ -113,7 +113,7 @@ public class GarbageCollectionAlgorithm {
   try {
 relPath = makeRelative(candidate, 0);
   } catch (IllegalArgumentException iae) {
-log.warn("Ingoring invalid deletion candidate " + candidate);
+log.warn("Ignoring invalid deletion candidate " + candidate);
 continue;
   }
   ret.put(relPath, candidate);
@@ -230,16 +230,15 @@ public class GarbageCollectionAlgorithm {
 
   }
 
-  private List getCandidates(GarbageCollectionEnvironment gce, String 
lastCandidate) throws TableNotFoundException, AccumuloException,
+  private boolean getCandidates(GarbageCollectionEnvironment gce, String 
lastCandidate, List candidates)
+  throws TableNotFoundException, AccumuloException,
   AccumuloSecurityException {
 Span candidatesSpan = Trace.start("getCandidates");
-List candidates;
 try {
-  candidates = gce.getCandidates(lastCandidate);
+  return gce.getCandidates(lastCandidate, candidates);
 } finally {
   candidatesSpan.stop();
 }
-return candidates;
   }
 
   private void confirmDeletesTrace(GarbageCollectionEnvironment gce, 
SortedMap candidateMap) throws TableNotFoundException, 
AccumuloException,
@@ -268,8 +267,11 @@ public class GarbageCollectionAlgorithm {
 
 String lastCandidate = "";
 
-while (true) {
-  List candidates = getCandidates(gce, lastCandidate);
+boolean outOfMemory = true;
+while (outOfMemory) {
+  List candidates = new ArrayList();
+
+  outOfMemory = getCandidates(gce, lastCandidate, candidates);
 
   if (candidates.size() == 0)
 break;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/deef5352/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java
--
diff --git 
a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java
 
b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java
index cca2411..4eab25a 100644
--- 
a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java
+++ 
b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java
@@ -45,9 +45,11 @@ public interface GarbageCollectionEnvironment {
* @param continuePoint
*  A row to resume from if a previous invocation was stopped due to 
finding an extremely large number of candidates to remove which would have
*  exceeded memory limitations
-   * @return A collection of candidates files for deletion, may not be the 
complete collection of files for deletion at this point in time
+   * @param candidates
+   *  A collection of candidates files for deletion, may not be the 
complete collection of files for deletion at this point in time
+   * @return true if the results are short due to insufficient memory, 
otherwise false
*/
-  List getCandidates(String continuePoint) throws 
TableNotFoundException, AccumuloException, AccumuloSecurityException;
+  boolean getCandidates(String continuePoint, List candidates) throws 
TableNotFoundException, AccumuloException, AccumuloSecurityException;
 
   /**
* Fetch a list of paths for all 

[1/2] accumulo git commit: ACCUMULO-4021 explicitly return a value that marks the end of GC

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/1.7 1f28ee760 -> 89d69f60c


ACCUMULO-4021 explicitly return a value that marks the end of GC


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/deef5352
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/deef5352
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/deef5352

Branch: refs/heads/1.7
Commit: deef5352db0bec4b1578568c3da84220c43038a0
Parents: 5ca779a
Author: Eric C. Newton 
Authored: Tue Oct 20 16:14:35 2015 -0400
Committer: Eric C. Newton 
Committed: Tue Oct 20 16:14:35 2015 -0400

--
 .../accumulo/gc/GarbageCollectionAlgorithm.java | 16 +---
 .../accumulo/gc/GarbageCollectionEnvironment.java   |  6 --
 .../apache/accumulo/gc/SimpleGarbageCollector.java  | 10 --
 .../apache/accumulo/gc/GarbageCollectionTest.java   |  5 ++---
 4 files changed, 19 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/deef5352/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
--
diff --git 
a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
 
b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
index 0e016d5..a8cde31 100644
--- 
a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
+++ 
b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
@@ -113,7 +113,7 @@ public class GarbageCollectionAlgorithm {
   try {
 relPath = makeRelative(candidate, 0);
   } catch (IllegalArgumentException iae) {
-log.warn("Ingoring invalid deletion candidate " + candidate);
+log.warn("Ignoring invalid deletion candidate " + candidate);
 continue;
   }
   ret.put(relPath, candidate);
@@ -230,16 +230,15 @@ public class GarbageCollectionAlgorithm {
 
   }
 
-  private List getCandidates(GarbageCollectionEnvironment gce, String 
lastCandidate) throws TableNotFoundException, AccumuloException,
+  private boolean getCandidates(GarbageCollectionEnvironment gce, String 
lastCandidate, List candidates)
+  throws TableNotFoundException, AccumuloException,
   AccumuloSecurityException {
 Span candidatesSpan = Trace.start("getCandidates");
-List candidates;
 try {
-  candidates = gce.getCandidates(lastCandidate);
+  return gce.getCandidates(lastCandidate, candidates);
 } finally {
   candidatesSpan.stop();
 }
-return candidates;
   }
 
   private void confirmDeletesTrace(GarbageCollectionEnvironment gce, 
SortedMap candidateMap) throws TableNotFoundException, 
AccumuloException,
@@ -268,8 +267,11 @@ public class GarbageCollectionAlgorithm {
 
 String lastCandidate = "";
 
-while (true) {
-  List candidates = getCandidates(gce, lastCandidate);
+boolean outOfMemory = true;
+while (outOfMemory) {
+  List candidates = new ArrayList();
+
+  outOfMemory = getCandidates(gce, lastCandidate, candidates);
 
   if (candidates.size() == 0)
 break;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/deef5352/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java
--
diff --git 
a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java
 
b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java
index cca2411..4eab25a 100644
--- 
a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java
+++ 
b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java
@@ -45,9 +45,11 @@ public interface GarbageCollectionEnvironment {
* @param continuePoint
*  A row to resume from if a previous invocation was stopped due to 
finding an extremely large number of candidates to remove which would have
*  exceeded memory limitations
-   * @return A collection of candidates files for deletion, may not be the 
complete collection of files for deletion at this point in time
+   * @param candidates
+   *  A collection of candidates files for deletion, may not be the 
complete collection of files for deletion at this point in time
+   * @return true if the results are short due to insufficient memory, 
otherwise false
*/
-  List getCandidates(String continuePoint) throws 
TableNotFoundException, AccumuloException, AccumuloSecurityException;
+  boolean getCandidates(String continuePoint, List candidates) throws 
TableNotFoundException, AccumuloException, AccumuloSecurityException;
 
   /**
* Fetch a list of paths for all bulk 

accumulo git commit: ACCUMULO-4034 re-write the agitator to include zookeeper stop/start

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/master 39f14472b -> 43f4464b3


ACCUMULO-4034 re-write the agitator to include zookeeper stop/start


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/43f4464b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/43f4464b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/43f4464b

Branch: refs/heads/master
Commit: 43f4464b38d9c380ed882069da0e76579b0db7a4
Parents: 39f1447
Author: Eric C. Newton 
Authored: Tue Oct 20 17:03:05 2015 -0400
Committer: Eric C. Newton 
Committed: Tue Oct 20 17:03:05 2015 -0400

--
 test/system/agitator/.gitignore   |   3 +
 test/system/agitator/README.md|  39 +
 test/system/agitator/agitator.ini.example |  48 +
 test/system/agitator/agitator.py  | 234 +
 test/system/agitator/hosts.example|  16 ++
 5 files changed, 340 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/43f4464b/test/system/agitator/.gitignore
--
diff --git a/test/system/agitator/.gitignore b/test/system/agitator/.gitignore
new file mode 100644
index 000..3429b01
--- /dev/null
+++ b/test/system/agitator/.gitignore
@@ -0,0 +1,3 @@
+*~
+*.ini
+*.pyc

http://git-wip-us.apache.org/repos/asf/accumulo/blob/43f4464b/test/system/agitator/README.md
--
diff --git a/test/system/agitator/README.md b/test/system/agitator/README.md
new file mode 100644
index 000..fdff65b
--- /dev/null
+++ b/test/system/agitator/README.md
@@ -0,0 +1,39 @@
+
+
+Agitator: randomly kill processes
+===
+
+The agitator is used to randomly select processes for termination during
+system test.
+
+Configure the agitator using the example agitator.ini file provided.
+
+Create a list of hosts to be agitated:
+
+   $ cp ../../../conf/slaves hosts
+   $ echo master >> hosts
+   $ echo namenode >> hosts
+
+The agitator can be used to kill and restart any part of the accumulo
+ecosystem: zookeepers, namenode, datanodes, tablet servers and master.
+You can choose to agitate them all with "--all"
+
+   $ ./agitator.py --all --hosts=hosts --config=agitator.ini --log DEBUG
+
+You will need to be able to ssh, without passwords, to all your hosts as 
+the user that can kill and start the services.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/43f4464b/test/system/agitator/agitator.ini.example
--
diff --git a/test/system/agitator/agitator.ini.example 
b/test/system/agitator/agitator.ini.example
new file mode 100644
index 000..825f0ed
--- /dev/null
+++ b/test/system/agitator/agitator.ini.example
@@ -0,0 +1,48 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+[DEFAULT]
+install=%(env.pwd)s/../../../..
+user=%(env.user)s
+
+[agitator]
+kill=kill -9
+ssh=ssh -q -t -A -o StrictHostKeyChecking=no
+sleep=300
+sleep.restart=30
+sleep.jitter=30
+
+[accumulo]
+home=%(install)s/accumulo
+tserver.kill.min=1
+tserver.kill.max=1
+tserver.frequency=0.8
+master.kill.min=1
+master.kill.max=1
+master.frequency=0.1
+
+[hadoop]
+home=%(install)s/hadoop
+bin=%(home)s/bin
+datanode.frequency=0.8
+datanode.kill.min=1
+datanode.kill.max=1
+namenode.frequency=0.05
+namenode.kill.min=1
+namenode.kill.max=1
+
+[zookeeper]
+home=%(install)s/zookeeper
+frequency=0.05

http://git-wip-us.apache.org/repos/asf/accumulo/blob/43f4464b/test/system/agitator/agitator.py
--
diff --git a/test/system/agitator/agitator.py b/test/system/agitator/agitator.py
new file mode 100755
index 000..92b0b28
--- /dev/null
+++ b/test/system/agitator/agitator.py
@@ -0,0 +1,234 @@
+#! /usr/bin/python
+
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this 

accumulo git commit: ACCUMULO-4021 explicitly return a value that marks the end of GC

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/1.6 5ca779a0e -> deef5352d


ACCUMULO-4021 explicitly return a value that marks the end of GC


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/deef5352
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/deef5352
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/deef5352

Branch: refs/heads/1.6
Commit: deef5352db0bec4b1578568c3da84220c43038a0
Parents: 5ca779a
Author: Eric C. Newton 
Authored: Tue Oct 20 16:14:35 2015 -0400
Committer: Eric C. Newton 
Committed: Tue Oct 20 16:14:35 2015 -0400

--
 .../accumulo/gc/GarbageCollectionAlgorithm.java | 16 +---
 .../accumulo/gc/GarbageCollectionEnvironment.java   |  6 --
 .../apache/accumulo/gc/SimpleGarbageCollector.java  | 10 --
 .../apache/accumulo/gc/GarbageCollectionTest.java   |  5 ++---
 4 files changed, 19 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/deef5352/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
--
diff --git 
a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
 
b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
index 0e016d5..a8cde31 100644
--- 
a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
+++ 
b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
@@ -113,7 +113,7 @@ public class GarbageCollectionAlgorithm {
   try {
 relPath = makeRelative(candidate, 0);
   } catch (IllegalArgumentException iae) {
-log.warn("Ingoring invalid deletion candidate " + candidate);
+log.warn("Ignoring invalid deletion candidate " + candidate);
 continue;
   }
   ret.put(relPath, candidate);
@@ -230,16 +230,15 @@ public class GarbageCollectionAlgorithm {
 
   }
 
-  private List getCandidates(GarbageCollectionEnvironment gce, String 
lastCandidate) throws TableNotFoundException, AccumuloException,
+  private boolean getCandidates(GarbageCollectionEnvironment gce, String 
lastCandidate, List candidates)
+  throws TableNotFoundException, AccumuloException,
   AccumuloSecurityException {
 Span candidatesSpan = Trace.start("getCandidates");
-List candidates;
 try {
-  candidates = gce.getCandidates(lastCandidate);
+  return gce.getCandidates(lastCandidate, candidates);
 } finally {
   candidatesSpan.stop();
 }
-return candidates;
   }
 
   private void confirmDeletesTrace(GarbageCollectionEnvironment gce, 
SortedMap candidateMap) throws TableNotFoundException, 
AccumuloException,
@@ -268,8 +267,11 @@ public class GarbageCollectionAlgorithm {
 
 String lastCandidate = "";
 
-while (true) {
-  List candidates = getCandidates(gce, lastCandidate);
+boolean outOfMemory = true;
+while (outOfMemory) {
+  List candidates = new ArrayList();
+
+  outOfMemory = getCandidates(gce, lastCandidate, candidates);
 
   if (candidates.size() == 0)
 break;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/deef5352/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java
--
diff --git 
a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java
 
b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java
index cca2411..4eab25a 100644
--- 
a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java
+++ 
b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java
@@ -45,9 +45,11 @@ public interface GarbageCollectionEnvironment {
* @param continuePoint
*  A row to resume from if a previous invocation was stopped due to 
finding an extremely large number of candidates to remove which would have
*  exceeded memory limitations
-   * @return A collection of candidates files for deletion, may not be the 
complete collection of files for deletion at this point in time
+   * @param candidates
+   *  A collection of candidates files for deletion, may not be the 
complete collection of files for deletion at this point in time
+   * @return true if the results are short due to insufficient memory, 
otherwise false
*/
-  List getCandidates(String continuePoint) throws 
TableNotFoundException, AccumuloException, AccumuloSecurityException;
+  boolean getCandidates(String continuePoint, List candidates) throws 
TableNotFoundException, AccumuloException, AccumuloSecurityException;
 
   /**
* Fetch a list of paths for all bulk 

[3/3] accumulo git commit: Merge branch '1.7'

[ecn]

Merge branch '1.7'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/39f14472
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/39f14472
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/39f14472

Branch: refs/heads/master
Commit: 39f14472b109170c8434de0b7d4cadf7473dbd1f
Parents: 52ba24e 89d69f6
Author: Eric C. Newton 
Authored: Tue Oct 20 16:15:07 2015 -0400
Committer: Eric C. Newton 
Committed: Tue Oct 20 16:15:07 2015 -0400

--
 .../accumulo/gc/GarbageCollectionAlgorithm.java | 16 +---
 .../accumulo/gc/GarbageCollectionEnvironment.java   |  6 --
 .../apache/accumulo/gc/SimpleGarbageCollector.java  | 10 --
 .../apache/accumulo/gc/GarbageCollectionTest.java   |  5 ++---
 4 files changed, 19 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/39f14472/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
--

[2/3] accumulo git commit: Merge branch '1.6' into 1.7

[ecn]

Merge branch '1.6' into 1.7


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/89d69f60
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/89d69f60
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/89d69f60

Branch: refs/heads/master
Commit: 89d69f60ce78f910158995fbe1c9eb89a47090e4
Parents: 1f28ee7 deef535
Author: Eric C. Newton 
Authored: Tue Oct 20 16:14:56 2015 -0400
Committer: Eric C. Newton 
Committed: Tue Oct 20 16:14:56 2015 -0400

--
 .../accumulo/gc/GarbageCollectionAlgorithm.java | 16 +---
 .../accumulo/gc/GarbageCollectionEnvironment.java   |  6 --
 .../apache/accumulo/gc/SimpleGarbageCollector.java  | 10 --
 .../apache/accumulo/gc/GarbageCollectionTest.java   |  5 ++---
 4 files changed, 19 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/89d69f60/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/89d69f60/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/89d69f60/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
--
diff --cc 
server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
index 037023a,3ab95a7..1daafcb
--- a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
@@@ -248,9 -277,9 +247,9 @@@ public class SimpleGarbageCollector ext
  range = new Range(new Key(continueRow).followingKey(PartialKey.ROW), 
true, range.getEndKey(), range.isEndKeyInclusive());
}
  
 -  Scanner scanner = instance.getConnector(credentials.getPrincipal(), 
credentials.getToken()).createScanner(tableName, Authorizations.EMPTY);
 +  Scanner scanner = getConnector().createScanner(tableName, 
Authorizations.EMPTY);
scanner.setRange(range);
-   List result = new ArrayList();
+   result.clear();
// find candidates for deletion; chop off the prefix
for (Entry entry : scanner) {
  String cand = 
entry.getKey().getRow().toString().substring(MetadataSchema.DeletesSection.getRowPrefix().length());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/89d69f60/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java
--
diff --cc 
server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java
index 544bd69,2953d07..1548fa1
--- a/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java
+++ b/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java
@@@ -53,12 -49,10 +53,11 @@@ public class GarbageCollectionTest 
  
  ArrayList deletes = new ArrayList();
  ArrayList tablesDirsToDelete = new ArrayList();
 +TreeMap filesToReplicate = new TreeMap();
  
  @Override
- public List getCandidates(String continuePoint) {
+ public boolean getCandidates(String continuePoint, List ret) {
Iterator iter = candidates.tailSet(continuePoint, 
false).iterator();
-   ArrayList ret = new ArrayList();
while (iter.hasNext() && ret.size() < 3) {
  ret.add(iter.next());
}

accumulo git commit: ACCUMULO-3999 use a threadpool to fetch status from tablet servers

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/master 642b7a95f -> aaaca5240


ACCUMULO-3999 use a threadpool to fetch status from tablet servers


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/aaaca524
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/aaaca524
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/aaaca524

Branch: refs/heads/master
Commit: aaaca5240b13f4ba029c8202a3c2f446f81fb8c5
Parents: 642b7a9
Author: Eric C. Newton 
Authored: Mon Oct 19 10:38:51 2015 -0400
Committer: Eric C. Newton 
Committed: Mon Oct 19 10:38:51 2015 -0400

--
 .../org/apache/accumulo/core/conf/Property.java |  2 +
 .../java/org/apache/accumulo/master/Master.java | 74 
 2 files changed, 47 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/aaaca524/core/src/main/java/org/apache/accumulo/core/conf/Property.java
--
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/Property.java 
b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
index 400577c..ab5c6d2 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@ -222,6 +222,8 @@ public enum Property {
   "Minimum number of threads dedicated to answering coordinator requests"),
   
MASTER_REPLICATION_COORDINATOR_THREADCHECK("master.replication.coordinator.threadcheck.time",
 "5s", PropertyType.TIMEDURATION,
   "The time between adjustments of the coordinator thread pool"),
+  MASTER_STATUS_THREAD_POOL_SIZE("master.status.threadpool.size", "1", 
PropertyType.COUNT,
+  "The number of threads to use when fetching the tablet server status for 
balancing."),
 
   // properties that are specific to tablet server behavior
   TSERV_PREFIX("tserver.", null, PropertyType.PREFIX, "Properties in this 
category affect the behavior of the tablet servers"),

http://git-wip-us.apache.org/repos/asf/accumulo/blob/aaaca524/server/master/src/main/java/org/apache/accumulo/master/Master.java
--
diff --git a/server/master/src/main/java/org/apache/accumulo/master/Master.java 
b/server/master/src/main/java/org/apache/accumulo/master/Master.java
index ff4705e..152831d 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/Master.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java
@@ -33,6 +33,8 @@ import java.util.Set;
 import java.util.SortedMap;
 import java.util.TreeMap;
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -1049,40 +1051,54 @@ public class Master extends AccumuloServerContext 
implements LiveTServerSet.List
 
   private SortedMap 
gatherTableInformation() {
 long start = System.currentTimeMillis();
-SortedMap result = new 
TreeMap();
+int threads = 
Math.max(getConfiguration().getCount(Property.MASTER_STATUS_THREAD_POOL_SIZE), 
1);
+ExecutorService tp = Executors.newFixedThreadPool(threads);
+final SortedMap result = new 
TreeMap();
 Set currentServers = tserverSet.getCurrentServers();
-for (TServerInstance server : currentServers) {
-  try {
-Thread t = Thread.currentThread();
-String oldName = t.getName();
-try {
-  t.setName("Getting status from " + server);
-  TServerConnection connection = tserverSet.getConnection(server);
-  if (connection == null)
-throw new IOException("No connection to " + server);
-  TabletServerStatus status = connection.getTableMap(false);
-  result.put(server, status);
-} finally {
-  t.setName(oldName);
-}
-  } catch (Exception ex) {
-log.error("unable to get tablet server status " + server + " " + 
ex.toString());
-log.debug("unable to get tablet server status " + server, ex);
-if (badServers.get(server).incrementAndGet() > MAX_BAD_STATUS_COUNT) {
-  log.warn("attempting to stop " + server);
+for (TServerInstance serverInstance : currentServers) {
+  final TServerInstance server = serverInstance;
+  tp.submit(new Runnable() {
+@Override
+public void run() {
   try {
-TServerConnection connection = 

accumulo git commit: ACCUMULO-4029 more better hashCode

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/1.6 3f1346c5f -> 5ca779a0e


ACCUMULO-4029 more better hashCode


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5ca779a0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5ca779a0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5ca779a0

Branch: refs/heads/1.6
Commit: 5ca779a0e5c33f83a3215c0a0211d01747a0a19f
Parents: 3f1346c
Author: Eric C. Newton 
Authored: Mon Oct 19 10:47:48 2015 -0400
Committer: Eric C. Newton 
Committed: Mon Oct 19 10:47:48 2015 -0400

--
 core/src/main/java/org/apache/accumulo/core/data/Mutation.java | 2 +-
 core/src/test/java/org/apache/accumulo/core/data/MutationTest.java | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/5ca779a0/core/src/main/java/org/apache/accumulo/core/data/Mutation.java
--
diff --git a/core/src/main/java/org/apache/accumulo/core/data/Mutation.java 
b/core/src/main/java/org/apache/accumulo/core/data/Mutation.java
index 5b052c3..e4e229c 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/Mutation.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/Mutation.java
@@ -598,7 +598,7 @@ public class Mutation implements Writable {
 
   @Override
   public int hashCode() {
-return toThrift(false).hashCode();
+return serializedSnapshot().hashCode();
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5ca779a0/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java
--
diff --git a/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java 
b/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java
index 740baa7..21272ff 100644
--- a/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java
@@ -580,6 +580,8 @@ public class MutationTest {
 assertEquals(m1, m1);
 assertEquals(m1, m2);
 assertEquals(m2, m1);
+assertEquals(m2.hashCode(), m1.hashCode());
+assertFalse(0 == m1.hashCode());
 assertFalse(m1.equals(m3));
 assertFalse(m3.equals(m1));
 assertFalse(m1.equals(m4));

[2/2] accumulo git commit: Merge branch '1.6' into 1.7

[ecn]

Merge branch '1.6' into 1.7


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1f28ee76
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1f28ee76
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1f28ee76

Branch: refs/heads/1.7
Commit: 1f28ee760f774e2453abde93dd912af3d01c5fa5
Parents: 6b73330 5ca779a
Author: Eric C. Newton 
Authored: Mon Oct 19 10:47:59 2015 -0400
Committer: Eric C. Newton 
Committed: Mon Oct 19 10:47:59 2015 -0400

--
 core/src/main/java/org/apache/accumulo/core/data/Mutation.java | 2 +-
 core/src/test/java/org/apache/accumulo/core/data/MutationTest.java | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/1f28ee76/core/src/main/java/org/apache/accumulo/core/data/Mutation.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/1f28ee76/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java
--

[1/3] accumulo git commit: ACCUMULO-4029 more better hashCode

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/master a80138315 -> 52ba24e32


ACCUMULO-4029 more better hashCode


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5ca779a0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5ca779a0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5ca779a0

Branch: refs/heads/master
Commit: 5ca779a0e5c33f83a3215c0a0211d01747a0a19f
Parents: 3f1346c
Author: Eric C. Newton 
Authored: Mon Oct 19 10:47:48 2015 -0400
Committer: Eric C. Newton 
Committed: Mon Oct 19 10:47:48 2015 -0400

--
 core/src/main/java/org/apache/accumulo/core/data/Mutation.java | 2 +-
 core/src/test/java/org/apache/accumulo/core/data/MutationTest.java | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/5ca779a0/core/src/main/java/org/apache/accumulo/core/data/Mutation.java
--
diff --git a/core/src/main/java/org/apache/accumulo/core/data/Mutation.java 
b/core/src/main/java/org/apache/accumulo/core/data/Mutation.java
index 5b052c3..e4e229c 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/Mutation.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/Mutation.java
@@ -598,7 +598,7 @@ public class Mutation implements Writable {
 
   @Override
   public int hashCode() {
-return toThrift(false).hashCode();
+return serializedSnapshot().hashCode();
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5ca779a0/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java
--
diff --git a/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java 
b/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java
index 740baa7..21272ff 100644
--- a/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java
@@ -580,6 +580,8 @@ public class MutationTest {
 assertEquals(m1, m1);
 assertEquals(m1, m2);
 assertEquals(m2, m1);
+assertEquals(m2.hashCode(), m1.hashCode());
+assertFalse(0 == m1.hashCode());
 assertFalse(m1.equals(m3));
 assertFalse(m3.equals(m1));
 assertFalse(m1.equals(m4));

accumulo git commit: ACCUMULO-3999 use a reasonable timeout for the threadpool shutdown

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/master aaaca5240 -> a80138315


ACCUMULO-3999 use a reasonable timeout for the threadpool shutdown


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a8013831
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a8013831
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a8013831

Branch: refs/heads/master
Commit: a801383150cfc40fd684c36fc24c97aa40b1dab9
Parents: aaaca52
Author: Eric C. Newton 
Authored: Mon Oct 19 10:42:18 2015 -0400
Committer: Eric C. Newton 
Committed: Mon Oct 19 10:42:18 2015 -0400

--
 server/master/src/main/java/org/apache/accumulo/master/Master.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a8013831/server/master/src/main/java/org/apache/accumulo/master/Master.java
--
diff --git a/server/master/src/main/java/org/apache/accumulo/master/Master.java 
b/server/master/src/main/java/org/apache/accumulo/master/Master.java
index 152831d..fbfcf5b 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/Master.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java
@@ -1096,7 +1096,7 @@ public class Master extends AccumuloServerContext 
implements LiveTServerSet.List
 }
 tp.shutdown();
 try {
-  tp.awaitTermination(5, TimeUnit.MINUTES);
+  
tp.awaitTermination(getConfiguration().getTimeInMillis(Property.TSERV_CLIENT_TIMEOUT)
 * 2, TimeUnit.MILLISECONDS);
 } catch (InterruptedException e) {
   log.debug("Interrupted while fetching status");
 }

[2/3] accumulo git commit: Merge branch '1.6' into 1.7

[ecn]

Merge branch '1.6' into 1.7


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1f28ee76
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1f28ee76
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1f28ee76

Branch: refs/heads/master
Commit: 1f28ee760f774e2453abde93dd912af3d01c5fa5
Parents: 6b73330 5ca779a
Author: Eric C. Newton 
Authored: Mon Oct 19 10:47:59 2015 -0400
Committer: Eric C. Newton 
Committed: Mon Oct 19 10:47:59 2015 -0400

--
 core/src/main/java/org/apache/accumulo/core/data/Mutation.java | 2 +-
 core/src/test/java/org/apache/accumulo/core/data/MutationTest.java | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/1f28ee76/core/src/main/java/org/apache/accumulo/core/data/Mutation.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/1f28ee76/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java
--

[3/3] accumulo git commit: Merge branch '1.7'

[ecn]

Merge branch '1.7'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/52ba24e3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/52ba24e3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/52ba24e3

Branch: refs/heads/master
Commit: 52ba24e32a4559d5ae36874d15da7c72fb799da3
Parents: a801383 1f28ee7
Author: Eric C. Newton 
Authored: Mon Oct 19 10:48:07 2015 -0400
Committer: Eric C. Newton 
Committed: Mon Oct 19 10:48:07 2015 -0400

--
 core/src/main/java/org/apache/accumulo/core/data/Mutation.java | 2 +-
 core/src/test/java/org/apache/accumulo/core/data/MutationTest.java | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
--

[1/2] accumulo git commit: ACCUMULO-4029 more better hashCode

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/1.7 6b7333098 -> 1f28ee760


ACCUMULO-4029 more better hashCode


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5ca779a0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5ca779a0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5ca779a0

Branch: refs/heads/1.7
Commit: 5ca779a0e5c33f83a3215c0a0211d01747a0a19f
Parents: 3f1346c
Author: Eric C. Newton 
Authored: Mon Oct 19 10:47:48 2015 -0400
Committer: Eric C. Newton 
Committed: Mon Oct 19 10:47:48 2015 -0400

--
 core/src/main/java/org/apache/accumulo/core/data/Mutation.java | 2 +-
 core/src/test/java/org/apache/accumulo/core/data/MutationTest.java | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/5ca779a0/core/src/main/java/org/apache/accumulo/core/data/Mutation.java
--
diff --git a/core/src/main/java/org/apache/accumulo/core/data/Mutation.java 
b/core/src/main/java/org/apache/accumulo/core/data/Mutation.java
index 5b052c3..e4e229c 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/Mutation.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/Mutation.java
@@ -598,7 +598,7 @@ public class Mutation implements Writable {
 
   @Override
   public int hashCode() {
-return toThrift(false).hashCode();
+return serializedSnapshot().hashCode();
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5ca779a0/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java
--
diff --git a/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java 
b/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java
index 740baa7..21272ff 100644
--- a/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java
@@ -580,6 +580,8 @@ public class MutationTest {
 assertEquals(m1, m1);
 assertEquals(m1, m2);
 assertEquals(m2, m1);
+assertEquals(m2.hashCode(), m1.hashCode());
+assertFalse(0 == m1.hashCode());
 assertFalse(m1.equals(m3));
 assertFalse(m3.equals(m1));
 assertFalse(m1.equals(m4));

[2/2] accumulo git commit: ACCUMULO-4028 use known information to pick a random server, merge to 1.7

[ecn]

ACCUMULO-4028 use known information to pick a random server, merge to 1.7


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/78e2c65e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/78e2c65e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/78e2c65e

Branch: refs/heads/1.7
Commit: 78e2c65e282abbf36fdd502688a8eabf96f6a9a2
Parents: 91b161a 0212f2f
Author: Eric C. Newton 
Authored: Wed Oct 14 13:57:12 2015 -0400
Committer: Eric C. Newton 
Committed: Wed Oct 14 13:57:12 2015 -0400

--
 .../accumulo/master/tableOps/BulkImport.java|  1 +
 .../accumulo/master/tableOps/LoadFiles.java | 24 
 2 files changed, 15 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/78e2c65e/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
--
diff --cc 
server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
index ad20473,5320aae..7001fdd
--- 
a/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
+++ 
b/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
@@@ -266,3 -286,337 +266,4 @@@ public class BulkImport extends MasterR
  ZooArbitrator.cleanup(Constants.BULK_ARBITRATOR_TYPE, tid);
}
  }
+ 
 -class CleanUpBulkImport extends MasterRepo {
 -
 -  private static final long serialVersionUID = 1L;
 -
 -  private static final Logger log = Logger.getLogger(CleanUpBulkImport.class);
 -
 -  private String tableId;
 -  private String source;
 -  private String bulk;
 -  private String error;
 -
 -  public CleanUpBulkImport(String tableId, String source, String bulk, String 
error) {
 -this.tableId = tableId;
 -this.source = source;
 -this.bulk = bulk;
 -this.error = error;
 -  }
 -
 -  @Override
 -  public Repo call(long tid, Master master) throws Exception {
 -log.debug("removing the bulk processing flag file in " + bulk);
 -Path bulkDir = new Path(bulk);
 -MetadataTableUtil.removeBulkLoadInProgressFlag("/" + 
bulkDir.getParent().getName() + "/" + bulkDir.getName());
 -MetadataTableUtil.addDeleteEntry(tableId, bulkDir.toString());
 -log.debug("removing the metadata table markers for loaded files");
 -Connector conn = master.getConnector();
 -MetadataTableUtil.removeBulkLoadEntries(conn, tableId, tid);
 -log.debug("releasing HDFS reservations for " + source + " and " + error);
 -Utils.unreserveHdfsDirectory(source, tid);
 -Utils.unreserveHdfsDirectory(error, tid);
 -Utils.getReadLock(tableId, tid).unlock();
 -log.debug("completing bulk import transaction " + tid);
 -ZooArbitrator.cleanup(Constants.BULK_ARBITRATOR_TYPE, tid);
 -return null;
 -  }
 -}
 -
 -class CompleteBulkImport extends MasterRepo {
 -
 -  private static final long serialVersionUID = 1L;
 -
 -  private String tableId;
 -  private String source;
 -  private String bulk;
 -  private String error;
 -
 -  public CompleteBulkImport(String tableId, String source, String bulk, 
String error) {
 -this.tableId = tableId;
 -this.source = source;
 -this.bulk = bulk;
 -this.error = error;
 -  }
 -
 -  @Override
 -  public Repo call(long tid, Master master) throws Exception {
 -ZooArbitrator.stop(Constants.BULK_ARBITRATOR_TYPE, tid);
 -return new CopyFailed(tableId, source, bulk, error);
 -  }
 -}
 -
 -class CopyFailed extends MasterRepo {
 -
 -  private static final long serialVersionUID = 1L;
 -
 -  private String tableId;
 -  private String source;
 -  private String bulk;
 -  private String error;
 -
 -  public CopyFailed(String tableId, String source, String bulk, String error) 
{
 -this.tableId = tableId;
 -this.source = source;
 -this.bulk = bulk;
 -this.error = error;
 -  }
 -
 -  @Override
 -  public long isReady(long tid, Master master) throws Exception {
 -Set finished = new HashSet();
 -Set running = master.onlineTabletServers();
 -for (TServerInstance server : running) {
 -  try {
 -TServerConnection client = master.getConnection(server);
 -if (client != null && !client.isActive(tid))
 -  finished.add(server);
 -  } catch (TException ex) {
 -log.info("Ignoring error trying to check on tid " + tid + " from 
server " + server + ": " + ex);
 -  }
 -}
 -if (finished.containsAll(running))
 -  return 0;
 -return 500;
 -  }
 -
 -  @Override
 -  public Repo call(long tid, Master master) throws Exception {
 -// This needs to execute after the arbiter is stopped
 -
 -VolumeManager fs = master.getFileSystem();
 -
 -if (!fs.exists(new Path(error, BulkImport.FAILURES_TXT)))
 - 

[1/2] accumulo git commit: ACCUMULO-4028 use known information to pick a random server

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/1.7 91b161a93 -> 78e2c65e2


ACCUMULO-4028 use known information to pick a random server


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0212f2ff
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0212f2ff
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0212f2ff

Branch: refs/heads/1.7
Commit: 0212f2ff2f304fb7d7261113882e28c1270968f3
Parents: 4deaf73
Author: Eric C. Newton 
Authored: Wed Oct 14 12:54:24 2015 -0400
Committer: Eric C. Newton 
Committed: Wed Oct 14 12:54:24 2015 -0400

--
 .../accumulo/master/tableOps/BulkImport.java| 22 +++-
 1 file changed, 12 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/0212f2ff/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
--
diff --git 
a/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
 
b/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
index e661968..5320aae 100644
--- 
a/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
+++ 
b/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
@@ -31,6 +31,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map.Entry;
+import java.util.Random;
 import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
@@ -42,10 +43,7 @@ import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.Instance;
 import org.apache.accumulo.core.client.IsolatedScanner;
 import org.apache.accumulo.core.client.Scanner;
-import org.apache.accumulo.core.client.impl.ServerClient;
 import org.apache.accumulo.core.client.impl.Tables;
-import org.apache.accumulo.core.client.impl.thrift.ClientService;
-import org.apache.accumulo.core.client.impl.thrift.ClientService.Client;
 import org.apache.accumulo.core.client.impl.thrift.TableOperation;
 import org.apache.accumulo.core.client.impl.thrift.TableOperationExceptionType;
 import 
org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException;
@@ -59,8 +57,9 @@ import 
org.apache.accumulo.core.master.state.tables.TableState;
 import org.apache.accumulo.core.metadata.MetadataTable;
 import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection;
 import org.apache.accumulo.core.security.Authorizations;
-import org.apache.accumulo.core.util.Pair;
+import org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Client;
 import org.apache.accumulo.core.util.SimpleThreadPool;
+import org.apache.accumulo.core.util.ThriftUtil;
 import org.apache.accumulo.core.util.UtilWaitThread;
 import org.apache.accumulo.fate.Repo;
 import org.apache.accumulo.master.Master;
@@ -539,23 +538,24 @@ class LoadFiles extends MasterRepo {
 
   // Use the threadpool to assign files one-at-a-time to the server
   final List loaded = Collections.synchronizedList(new 
ArrayList());
+  final Random random = new Random();
   for (final String file : filesToLoad) {
 results.add(executor.submit(new Callable() {
   @Override
   public List call() {
 List failures = new ArrayList();
-ClientService.Client client = null;
+Client client = null;
 String server = null;
 try {
   // get a connection to a random tablet server, do not prefer 
cached connections because
   // this is running on the master and there are lots of 
connections to tablet servers
   // serving the metadata tablets
   long timeInMillis = 
master.getConfiguration().getConfiguration().getTimeInMillis(Property.MASTER_BULK_TIMEOUT);
-  Pair pair = 
ServerClient.getConnection(master.getInstance(), false, timeInMillis);
-  client = pair.getSecond();
-  server = pair.getFirst();
+  TServerInstance servers[] = 
master.onlineTabletServers().toArray(new TServerInstance[0]);
+  server = 
servers[random.nextInt(servers.length)].getLocation().toString();
+  client = ThriftUtil.getTServerClient(server, 
master.getConfiguration().getConfiguration(), timeInMillis);
   List attempt = Collections.singletonList(file);
-  log.debug("Asking " + pair.getFirst() + " to bulk import " + 
file);
+  log.debug("Asking " + server + " to bulk import " + file);
   List fail = client.bulkImportFiles(Tracer.traceInfo(), 

[1/3] accumulo git commit: ACCUMULO-4028 use known information to pick a random server

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/master c30e558ae -> 10cafac94


ACCUMULO-4028 use known information to pick a random server


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0212f2ff
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0212f2ff
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0212f2ff

Branch: refs/heads/master
Commit: 0212f2ff2f304fb7d7261113882e28c1270968f3
Parents: 4deaf73
Author: Eric C. Newton 
Authored: Wed Oct 14 12:54:24 2015 -0400
Committer: Eric C. Newton 
Committed: Wed Oct 14 12:54:24 2015 -0400

--
 .../accumulo/master/tableOps/BulkImport.java| 22 +++-
 1 file changed, 12 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/0212f2ff/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
--
diff --git 
a/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
 
b/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
index e661968..5320aae 100644
--- 
a/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
+++ 
b/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
@@ -31,6 +31,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map.Entry;
+import java.util.Random;
 import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
@@ -42,10 +43,7 @@ import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.Instance;
 import org.apache.accumulo.core.client.IsolatedScanner;
 import org.apache.accumulo.core.client.Scanner;
-import org.apache.accumulo.core.client.impl.ServerClient;
 import org.apache.accumulo.core.client.impl.Tables;
-import org.apache.accumulo.core.client.impl.thrift.ClientService;
-import org.apache.accumulo.core.client.impl.thrift.ClientService.Client;
 import org.apache.accumulo.core.client.impl.thrift.TableOperation;
 import org.apache.accumulo.core.client.impl.thrift.TableOperationExceptionType;
 import 
org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException;
@@ -59,8 +57,9 @@ import 
org.apache.accumulo.core.master.state.tables.TableState;
 import org.apache.accumulo.core.metadata.MetadataTable;
 import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection;
 import org.apache.accumulo.core.security.Authorizations;
-import org.apache.accumulo.core.util.Pair;
+import org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Client;
 import org.apache.accumulo.core.util.SimpleThreadPool;
+import org.apache.accumulo.core.util.ThriftUtil;
 import org.apache.accumulo.core.util.UtilWaitThread;
 import org.apache.accumulo.fate.Repo;
 import org.apache.accumulo.master.Master;
@@ -539,23 +538,24 @@ class LoadFiles extends MasterRepo {
 
   // Use the threadpool to assign files one-at-a-time to the server
   final List loaded = Collections.synchronizedList(new 
ArrayList());
+  final Random random = new Random();
   for (final String file : filesToLoad) {
 results.add(executor.submit(new Callable() {
   @Override
   public List call() {
 List failures = new ArrayList();
-ClientService.Client client = null;
+Client client = null;
 String server = null;
 try {
   // get a connection to a random tablet server, do not prefer 
cached connections because
   // this is running on the master and there are lots of 
connections to tablet servers
   // serving the metadata tablets
   long timeInMillis = 
master.getConfiguration().getConfiguration().getTimeInMillis(Property.MASTER_BULK_TIMEOUT);
-  Pair pair = 
ServerClient.getConnection(master.getInstance(), false, timeInMillis);
-  client = pair.getSecond();
-  server = pair.getFirst();
+  TServerInstance servers[] = 
master.onlineTabletServers().toArray(new TServerInstance[0]);
+  server = 
servers[random.nextInt(servers.length)].getLocation().toString();
+  client = ThriftUtil.getTServerClient(server, 
master.getConfiguration().getConfiguration(), timeInMillis);
   List attempt = Collections.singletonList(file);
-  log.debug("Asking " + pair.getFirst() + " to bulk import " + 
file);
+  log.debug("Asking " + server + " to bulk import " + file);
   List fail = client.bulkImportFiles(Tracer.traceInfo(), 

[3/3] accumulo git commit: ACCUMULO-4028 use known information to pick a random server, merge to master

[ecn]

ACCUMULO-4028 use known information to pick a random server, merge to master


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/10cafac9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/10cafac9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/10cafac9

Branch: refs/heads/master
Commit: 10cafac9476eb8890df585da7901d02592b26640
Parents: c30e558 78e2c65
Author: Eric C. Newton 
Authored: Wed Oct 14 13:58:26 2015 -0400
Committer: Eric C. Newton 
Committed: Wed Oct 14 13:58:26 2015 -0400

--
 .../accumulo/master/tableOps/BulkImport.java|  1 +
 .../accumulo/master/tableOps/LoadFiles.java | 22 
 2 files changed, 14 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/10cafac9/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/10cafac9/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java
--
diff --cc 
server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java
index 48cbaa5,a80e1ff..75b66da
--- 
a/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java
+++ 
b/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java
@@@ -31,20 -31,17 +32,18 @@@ import java.util.concurrent.Callable
  import java.util.concurrent.ExecutorService;
  import java.util.concurrent.Future;
  import java.util.concurrent.ThreadPoolExecutor;
 +import java.util.concurrent.TimeUnit;
  
 +import 
org.apache.accumulo.core.client.impl.AcceptableThriftTableOperationException;
- import org.apache.accumulo.core.client.impl.ServerClient;
  import org.apache.accumulo.core.client.impl.thrift.ClientService;
- import org.apache.accumulo.core.client.impl.thrift.ClientService.Client;
  import org.apache.accumulo.core.client.impl.thrift.TableOperation;
  import 
org.apache.accumulo.core.client.impl.thrift.TableOperationExceptionType;
 -import 
org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException;
  import org.apache.accumulo.core.conf.AccumuloConfiguration;
  import org.apache.accumulo.core.conf.Property;
 +import org.apache.accumulo.core.master.thrift.BulkImportState;
+ import org.apache.accumulo.core.rpc.ThriftUtil;
  import org.apache.accumulo.core.trace.Tracer;
- import org.apache.accumulo.core.util.Pair;
  import org.apache.accumulo.core.util.SimpleThreadPool;
 -import org.apache.accumulo.core.util.UtilWaitThread;
  import org.apache.accumulo.fate.Repo;
  import org.apache.accumulo.master.Master;
  import org.apache.accumulo.server.fs.VolumeManager;

accumulo git commit: ACCUMULO-4028 use known information to pick a random server

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/1.6 4deaf73c0 -> 0212f2ff2


ACCUMULO-4028 use known information to pick a random server


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0212f2ff
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0212f2ff
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0212f2ff

Branch: refs/heads/1.6
Commit: 0212f2ff2f304fb7d7261113882e28c1270968f3
Parents: 4deaf73
Author: Eric C. Newton 
Authored: Wed Oct 14 12:54:24 2015 -0400
Committer: Eric C. Newton 
Committed: Wed Oct 14 12:54:24 2015 -0400

--
 .../accumulo/master/tableOps/BulkImport.java| 22 +++-
 1 file changed, 12 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/0212f2ff/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
--
diff --git 
a/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
 
b/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
index e661968..5320aae 100644
--- 
a/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
+++ 
b/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
@@ -31,6 +31,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map.Entry;
+import java.util.Random;
 import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
@@ -42,10 +43,7 @@ import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.Instance;
 import org.apache.accumulo.core.client.IsolatedScanner;
 import org.apache.accumulo.core.client.Scanner;
-import org.apache.accumulo.core.client.impl.ServerClient;
 import org.apache.accumulo.core.client.impl.Tables;
-import org.apache.accumulo.core.client.impl.thrift.ClientService;
-import org.apache.accumulo.core.client.impl.thrift.ClientService.Client;
 import org.apache.accumulo.core.client.impl.thrift.TableOperation;
 import org.apache.accumulo.core.client.impl.thrift.TableOperationExceptionType;
 import 
org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException;
@@ -59,8 +57,9 @@ import 
org.apache.accumulo.core.master.state.tables.TableState;
 import org.apache.accumulo.core.metadata.MetadataTable;
 import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection;
 import org.apache.accumulo.core.security.Authorizations;
-import org.apache.accumulo.core.util.Pair;
+import org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Client;
 import org.apache.accumulo.core.util.SimpleThreadPool;
+import org.apache.accumulo.core.util.ThriftUtil;
 import org.apache.accumulo.core.util.UtilWaitThread;
 import org.apache.accumulo.fate.Repo;
 import org.apache.accumulo.master.Master;
@@ -539,23 +538,24 @@ class LoadFiles extends MasterRepo {
 
   // Use the threadpool to assign files one-at-a-time to the server
   final List loaded = Collections.synchronizedList(new 
ArrayList());
+  final Random random = new Random();
   for (final String file : filesToLoad) {
 results.add(executor.submit(new Callable() {
   @Override
   public List call() {
 List failures = new ArrayList();
-ClientService.Client client = null;
+Client client = null;
 String server = null;
 try {
   // get a connection to a random tablet server, do not prefer 
cached connections because
   // this is running on the master and there are lots of 
connections to tablet servers
   // serving the metadata tablets
   long timeInMillis = 
master.getConfiguration().getConfiguration().getTimeInMillis(Property.MASTER_BULK_TIMEOUT);
-  Pair pair = 
ServerClient.getConnection(master.getInstance(), false, timeInMillis);
-  client = pair.getSecond();
-  server = pair.getFirst();
+  TServerInstance servers[] = 
master.onlineTabletServers().toArray(new TServerInstance[0]);
+  server = 
servers[random.nextInt(servers.length)].getLocation().toString();
+  client = ThriftUtil.getTServerClient(server, 
master.getConfiguration().getConfiguration(), timeInMillis);
   List attempt = Collections.singletonList(file);
-  log.debug("Asking " + pair.getFirst() + " to bulk import " + 
file);
+  log.debug("Asking " + server + " to bulk import " + file);
   List fail = client.bulkImportFiles(Tracer.traceInfo(), 

[2/3] accumulo git commit: ACCUMULO-4028 use known information to pick a random server, merge to 1.7

[ecn]

ACCUMULO-4028 use known information to pick a random server, merge to 1.7


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/78e2c65e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/78e2c65e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/78e2c65e

Branch: refs/heads/master
Commit: 78e2c65e282abbf36fdd502688a8eabf96f6a9a2
Parents: 91b161a 0212f2f
Author: Eric C. Newton 
Authored: Wed Oct 14 13:57:12 2015 -0400
Committer: Eric C. Newton 
Committed: Wed Oct 14 13:57:12 2015 -0400

--
 .../accumulo/master/tableOps/BulkImport.java|  1 +
 .../accumulo/master/tableOps/LoadFiles.java | 24 
 2 files changed, 15 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/78e2c65e/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
--
diff --cc 
server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
index ad20473,5320aae..7001fdd
--- 
a/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
+++ 
b/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
@@@ -266,3 -286,337 +266,4 @@@ public class BulkImport extends MasterR
  ZooArbitrator.cleanup(Constants.BULK_ARBITRATOR_TYPE, tid);
}
  }
+ 
 -class CleanUpBulkImport extends MasterRepo {
 -
 -  private static final long serialVersionUID = 1L;
 -
 -  private static final Logger log = Logger.getLogger(CleanUpBulkImport.class);
 -
 -  private String tableId;
 -  private String source;
 -  private String bulk;
 -  private String error;
 -
 -  public CleanUpBulkImport(String tableId, String source, String bulk, String 
error) {
 -this.tableId = tableId;
 -this.source = source;
 -this.bulk = bulk;
 -this.error = error;
 -  }
 -
 -  @Override
 -  public Repo call(long tid, Master master) throws Exception {
 -log.debug("removing the bulk processing flag file in " + bulk);
 -Path bulkDir = new Path(bulk);
 -MetadataTableUtil.removeBulkLoadInProgressFlag("/" + 
bulkDir.getParent().getName() + "/" + bulkDir.getName());
 -MetadataTableUtil.addDeleteEntry(tableId, bulkDir.toString());
 -log.debug("removing the metadata table markers for loaded files");
 -Connector conn = master.getConnector();
 -MetadataTableUtil.removeBulkLoadEntries(conn, tableId, tid);
 -log.debug("releasing HDFS reservations for " + source + " and " + error);
 -Utils.unreserveHdfsDirectory(source, tid);
 -Utils.unreserveHdfsDirectory(error, tid);
 -Utils.getReadLock(tableId, tid).unlock();
 -log.debug("completing bulk import transaction " + tid);
 -ZooArbitrator.cleanup(Constants.BULK_ARBITRATOR_TYPE, tid);
 -return null;
 -  }
 -}
 -
 -class CompleteBulkImport extends MasterRepo {
 -
 -  private static final long serialVersionUID = 1L;
 -
 -  private String tableId;
 -  private String source;
 -  private String bulk;
 -  private String error;
 -
 -  public CompleteBulkImport(String tableId, String source, String bulk, 
String error) {
 -this.tableId = tableId;
 -this.source = source;
 -this.bulk = bulk;
 -this.error = error;
 -  }
 -
 -  @Override
 -  public Repo call(long tid, Master master) throws Exception {
 -ZooArbitrator.stop(Constants.BULK_ARBITRATOR_TYPE, tid);
 -return new CopyFailed(tableId, source, bulk, error);
 -  }
 -}
 -
 -class CopyFailed extends MasterRepo {
 -
 -  private static final long serialVersionUID = 1L;
 -
 -  private String tableId;
 -  private String source;
 -  private String bulk;
 -  private String error;
 -
 -  public CopyFailed(String tableId, String source, String bulk, String error) 
{
 -this.tableId = tableId;
 -this.source = source;
 -this.bulk = bulk;
 -this.error = error;
 -  }
 -
 -  @Override
 -  public long isReady(long tid, Master master) throws Exception {
 -Set finished = new HashSet();
 -Set running = master.onlineTabletServers();
 -for (TServerInstance server : running) {
 -  try {
 -TServerConnection client = master.getConnection(server);
 -if (client != null && !client.isActive(tid))
 -  finished.add(server);
 -  } catch (TException ex) {
 -log.info("Ignoring error trying to check on tid " + tid + " from 
server " + server + ": " + ex);
 -  }
 -}
 -if (finished.containsAll(running))
 -  return 0;
 -return 500;
 -  }
 -
 -  @Override
 -  public Repo call(long tid, Master master) throws Exception {
 -// This needs to execute after the arbiter is stopped
 -
 -VolumeManager fs = master.getFileSystem();
 -
 -if (!fs.exists(new Path(error, BulkImport.FAILURES_TXT)))

accumulo git commit: ACCUMULO-4028 copy the list of online servers once

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/1.6 0212f2ff2 -> eacc27ac4


ACCUMULO-4028 copy the list of online servers once


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/eacc27ac
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/eacc27ac
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/eacc27ac

Branch: refs/heads/1.6
Commit: eacc27ac47db3417a9ae405a96f7da6db2e0955b
Parents: 0212f2f
Author: Eric C. Newton 
Authored: Wed Oct 14 15:32:58 2015 -0400
Committer: Eric C. Newton 
Committed: Wed Oct 14 15:32:58 2015 -0400

--
 .../java/org/apache/accumulo/master/tableOps/BulkImport.java   | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/eacc27ac/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
--
diff --git 
a/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
 
b/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
index 5320aae..37edbc9 100644
--- 
a/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
+++ 
b/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
@@ -538,6 +538,7 @@ class LoadFiles extends MasterRepo {
 
   // Use the threadpool to assign files one-at-a-time to the server
   final List loaded = Collections.synchronizedList(new 
ArrayList());
+  final TServerInstance servers[] = 
master.onlineTabletServers().toArray(new TServerInstance[0]);
   final Random random = new Random();
   for (final String file : filesToLoad) {
 results.add(executor.submit(new Callable() {
@@ -551,7 +552,6 @@ class LoadFiles extends MasterRepo {
   // this is running on the master and there are lots of 
connections to tablet servers
   // serving the metadata tablets
   long timeInMillis = 
master.getConfiguration().getConfiguration().getTimeInMillis(Property.MASTER_BULK_TIMEOUT);
-  TServerInstance servers[] = 
master.onlineTabletServers().toArray(new TServerInstance[0]);
   server = 
servers[random.nextInt(servers.length)].getLocation().toString();
   client = ThriftUtil.getTServerClient(server, 
master.getConfiguration().getConfiguration(), timeInMillis);
   List attempt = Collections.singletonList(file);
@@ -566,9 +566,7 @@ class LoadFiles extends MasterRepo {
 } catch (Exception ex) {
   log.error("rpc failed server:" + server + ", tid:" + tid + " " + 
ex);
 } finally {
-  if (client != null) {
-ThriftUtil.returnClient(client);
-  }
+  ThriftUtil.returnClient(client);
 }
 return failures;
   }

[2/3] accumulo git commit: ACCUMULO-4028 copy the list of online servers once

[ecn]

ACCUMULO-4028 copy the list of online servers once


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d7e7c643
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d7e7c643
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d7e7c643

Branch: refs/heads/master
Commit: d7e7c643c0f52c04175947955b59b173e0f62f58
Parents: 78e2c65 eacc27a
Author: Eric C. Newton 
Authored: Wed Oct 14 15:37:58 2015 -0400
Committer: Eric C. Newton 
Committed: Wed Oct 14 15:37:58 2015 -0400

--
 .../main/java/org/apache/accumulo/master/tableOps/LoadFiles.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/d7e7c643/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java
--
diff --cc 
server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java
index a80e1ff,000..af5262a
mode 100644,00..100644
--- 
a/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java
+++ 
b/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java
@@@ -1,213 -1,0 +1,213 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one or more
 + * contributor license agreements.  See the NOTICE file distributed with
 + * this work for additional information regarding copyright ownership.
 + * The ASF licenses this file to You under the Apache License, Version 2.0
 + * (the "License"); you may not use this file except in compliance with
 + * the License.  You may obtain a copy of the License at
 + *
 + * http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an "AS IS" BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + */
 +package org.apache.accumulo.master.tableOps;
 +
 +import static java.nio.charset.StandardCharsets.UTF_8;
 +
 +import java.io.BufferedWriter;
 +import java.io.OutputStreamWriter;
 +import java.util.ArrayList;
 +import java.util.Collection;
 +import java.util.Collections;
 +import java.util.HashSet;
 +import java.util.List;
 +import java.util.Random;
 +import java.util.Set;
 +import java.util.concurrent.Callable;
 +import java.util.concurrent.ExecutorService;
 +import java.util.concurrent.Future;
 +import java.util.concurrent.ThreadPoolExecutor;
 +
 +import org.apache.accumulo.core.client.impl.thrift.ClientService;
 +import org.apache.accumulo.core.client.impl.thrift.TableOperation;
 +import 
org.apache.accumulo.core.client.impl.thrift.TableOperationExceptionType;
 +import 
org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException;
 +import org.apache.accumulo.core.conf.AccumuloConfiguration;
 +import org.apache.accumulo.core.conf.Property;
 +import org.apache.accumulo.core.rpc.ThriftUtil;
 +import org.apache.accumulo.core.trace.Tracer;
 +import org.apache.accumulo.core.util.SimpleThreadPool;
 +import org.apache.accumulo.core.util.UtilWaitThread;
 +import org.apache.accumulo.fate.Repo;
 +import org.apache.accumulo.master.Master;
 +import org.apache.accumulo.server.fs.VolumeManager;
 +import org.apache.accumulo.server.master.state.TServerInstance;
 +import org.apache.hadoop.fs.FSDataOutputStream;
 +import org.apache.hadoop.fs.FileStatus;
 +import org.apache.hadoop.fs.Path;
 +import org.apache.htrace.wrappers.TraceExecutorService;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
 +
 +import com.google.common.net.HostAndPort;
 +
 +class LoadFiles extends MasterRepo {
 +
 +  private static final long serialVersionUID = 1L;
 +
 +  private static ExecutorService threadPool = null;
 +  private static final Logger log = LoggerFactory.getLogger(LoadFiles.class);
 +
 +  private String tableId;
 +  private String source;
 +  private String bulk;
 +  private String errorDir;
 +  private boolean setTime;
 +
 +  public LoadFiles(String tableId, String source, String bulk, String 
errorDir, boolean setTime) {
 +this.tableId = tableId;
 +this.source = source;
 +this.bulk = bulk;
 +this.errorDir = errorDir;
 +this.setTime = setTime;
 +  }
 +
 +  @Override
 +  public long isReady(long tid, Master master) throws Exception {
 +if (master.onlineTabletServers().size() == 0)
 +  return 500;
 +return 0;
 +  }
 +
 +  private static synchronized ExecutorService getThreadPool(Master master) {
 +if (threadPool == null) {
 +  int threadPoolSize = 
master.getConfiguration().getCount(Property.MASTER_BULK_THREADPOOL_SIZE);
 +  ThreadPoolExecutor 

[2/2] accumulo git commit: ACCUMULO-4028 copy the list of online servers once

[ecn]

ACCUMULO-4028 copy the list of online servers once


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d7e7c643
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d7e7c643
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d7e7c643

Branch: refs/heads/1.7
Commit: d7e7c643c0f52c04175947955b59b173e0f62f58
Parents: 78e2c65 eacc27a
Author: Eric C. Newton 
Authored: Wed Oct 14 15:37:58 2015 -0400
Committer: Eric C. Newton 
Committed: Wed Oct 14 15:37:58 2015 -0400

--
 .../main/java/org/apache/accumulo/master/tableOps/LoadFiles.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/d7e7c643/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java
--
diff --cc 
server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java
index a80e1ff,000..af5262a
mode 100644,00..100644
--- 
a/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java
+++ 
b/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java
@@@ -1,213 -1,0 +1,213 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one or more
 + * contributor license agreements.  See the NOTICE file distributed with
 + * this work for additional information regarding copyright ownership.
 + * The ASF licenses this file to You under the Apache License, Version 2.0
 + * (the "License"); you may not use this file except in compliance with
 + * the License.  You may obtain a copy of the License at
 + *
 + * http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an "AS IS" BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + */
 +package org.apache.accumulo.master.tableOps;
 +
 +import static java.nio.charset.StandardCharsets.UTF_8;
 +
 +import java.io.BufferedWriter;
 +import java.io.OutputStreamWriter;
 +import java.util.ArrayList;
 +import java.util.Collection;
 +import java.util.Collections;
 +import java.util.HashSet;
 +import java.util.List;
 +import java.util.Random;
 +import java.util.Set;
 +import java.util.concurrent.Callable;
 +import java.util.concurrent.ExecutorService;
 +import java.util.concurrent.Future;
 +import java.util.concurrent.ThreadPoolExecutor;
 +
 +import org.apache.accumulo.core.client.impl.thrift.ClientService;
 +import org.apache.accumulo.core.client.impl.thrift.TableOperation;
 +import 
org.apache.accumulo.core.client.impl.thrift.TableOperationExceptionType;
 +import 
org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException;
 +import org.apache.accumulo.core.conf.AccumuloConfiguration;
 +import org.apache.accumulo.core.conf.Property;
 +import org.apache.accumulo.core.rpc.ThriftUtil;
 +import org.apache.accumulo.core.trace.Tracer;
 +import org.apache.accumulo.core.util.SimpleThreadPool;
 +import org.apache.accumulo.core.util.UtilWaitThread;
 +import org.apache.accumulo.fate.Repo;
 +import org.apache.accumulo.master.Master;
 +import org.apache.accumulo.server.fs.VolumeManager;
 +import org.apache.accumulo.server.master.state.TServerInstance;
 +import org.apache.hadoop.fs.FSDataOutputStream;
 +import org.apache.hadoop.fs.FileStatus;
 +import org.apache.hadoop.fs.Path;
 +import org.apache.htrace.wrappers.TraceExecutorService;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
 +
 +import com.google.common.net.HostAndPort;
 +
 +class LoadFiles extends MasterRepo {
 +
 +  private static final long serialVersionUID = 1L;
 +
 +  private static ExecutorService threadPool = null;
 +  private static final Logger log = LoggerFactory.getLogger(LoadFiles.class);
 +
 +  private String tableId;
 +  private String source;
 +  private String bulk;
 +  private String errorDir;
 +  private boolean setTime;
 +
 +  public LoadFiles(String tableId, String source, String bulk, String 
errorDir, boolean setTime) {
 +this.tableId = tableId;
 +this.source = source;
 +this.bulk = bulk;
 +this.errorDir = errorDir;
 +this.setTime = setTime;
 +  }
 +
 +  @Override
 +  public long isReady(long tid, Master master) throws Exception {
 +if (master.onlineTabletServers().size() == 0)
 +  return 500;
 +return 0;
 +  }
 +
 +  private static synchronized ExecutorService getThreadPool(Master master) {
 +if (threadPool == null) {
 +  int threadPoolSize = 
master.getConfiguration().getCount(Property.MASTER_BULK_THREADPOOL_SIZE);
 +  ThreadPoolExecutor 

[3/3] accumulo git commit: Merge branch '1.7'

[ecn]

Merge branch '1.7'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b34df1ab
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b34df1ab
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b34df1ab

Branch: refs/heads/master
Commit: b34df1abaf5a1df88c8e3f53e61242b41a752231
Parents: dd420f6 d7e7c64
Author: Eric C. Newton 
Authored: Wed Oct 14 15:38:13 2015 -0400
Committer: Eric C. Newton 
Committed: Wed Oct 14 15:38:13 2015 -0400

--
 .../main/java/org/apache/accumulo/master/tableOps/LoadFiles.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/b34df1ab/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java
--

[1/3] accumulo git commit: ACCUMULO-4028 copy the list of online servers once

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/master dd420f631 -> b34df1aba


ACCUMULO-4028 copy the list of online servers once


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/eacc27ac
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/eacc27ac
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/eacc27ac

Branch: refs/heads/master
Commit: eacc27ac47db3417a9ae405a96f7da6db2e0955b
Parents: 0212f2f
Author: Eric C. Newton 
Authored: Wed Oct 14 15:32:58 2015 -0400
Committer: Eric C. Newton 
Committed: Wed Oct 14 15:32:58 2015 -0400

--
 .../java/org/apache/accumulo/master/tableOps/BulkImport.java   | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/eacc27ac/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
--
diff --git 
a/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
 
b/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
index 5320aae..37edbc9 100644
--- 
a/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
+++ 
b/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
@@ -538,6 +538,7 @@ class LoadFiles extends MasterRepo {
 
   // Use the threadpool to assign files one-at-a-time to the server
   final List loaded = Collections.synchronizedList(new 
ArrayList());
+  final TServerInstance servers[] = 
master.onlineTabletServers().toArray(new TServerInstance[0]);
   final Random random = new Random();
   for (final String file : filesToLoad) {
 results.add(executor.submit(new Callable() {
@@ -551,7 +552,6 @@ class LoadFiles extends MasterRepo {
   // this is running on the master and there are lots of 
connections to tablet servers
   // serving the metadata tablets
   long timeInMillis = 
master.getConfiguration().getConfiguration().getTimeInMillis(Property.MASTER_BULK_TIMEOUT);
-  TServerInstance servers[] = 
master.onlineTabletServers().toArray(new TServerInstance[0]);
   server = 
servers[random.nextInt(servers.length)].getLocation().toString();
   client = ThriftUtil.getTServerClient(server, 
master.getConfiguration().getConfiguration(), timeInMillis);
   List attempt = Collections.singletonList(file);
@@ -566,9 +566,7 @@ class LoadFiles extends MasterRepo {
 } catch (Exception ex) {
   log.error("rpc failed server:" + server + ", tid:" + tid + " " + 
ex);
 } finally {
-  if (client != null) {
-ThriftUtil.returnClient(client);
-  }
+  ThriftUtil.returnClient(client);
 }
 return failures;
   }

[1/2] accumulo git commit: ACCUMULO-4028 copy the list of online servers once

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/1.7 78e2c65e2 -> d7e7c643c


ACCUMULO-4028 copy the list of online servers once


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/eacc27ac
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/eacc27ac
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/eacc27ac

Branch: refs/heads/1.7
Commit: eacc27ac47db3417a9ae405a96f7da6db2e0955b
Parents: 0212f2f
Author: Eric C. Newton 
Authored: Wed Oct 14 15:32:58 2015 -0400
Committer: Eric C. Newton 
Committed: Wed Oct 14 15:32:58 2015 -0400

--
 .../java/org/apache/accumulo/master/tableOps/BulkImport.java   | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/eacc27ac/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
--
diff --git 
a/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
 
b/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
index 5320aae..37edbc9 100644
--- 
a/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
+++ 
b/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
@@ -538,6 +538,7 @@ class LoadFiles extends MasterRepo {
 
   // Use the threadpool to assign files one-at-a-time to the server
   final List loaded = Collections.synchronizedList(new 
ArrayList());
+  final TServerInstance servers[] = 
master.onlineTabletServers().toArray(new TServerInstance[0]);
   final Random random = new Random();
   for (final String file : filesToLoad) {
 results.add(executor.submit(new Callable() {
@@ -551,7 +552,6 @@ class LoadFiles extends MasterRepo {
   // this is running on the master and there are lots of 
connections to tablet servers
   // serving the metadata tablets
   long timeInMillis = 
master.getConfiguration().getConfiguration().getTimeInMillis(Property.MASTER_BULK_TIMEOUT);
-  TServerInstance servers[] = 
master.onlineTabletServers().toArray(new TServerInstance[0]);
   server = 
servers[random.nextInt(servers.length)].getLocation().toString();
   client = ThriftUtil.getTServerClient(server, 
master.getConfiguration().getConfiguration(), timeInMillis);
   List attempt = Collections.singletonList(file);
@@ -566,9 +566,7 @@ class LoadFiles extends MasterRepo {
 } catch (Exception ex) {
   log.error("rpc failed server:" + server + ", tid:" + tid + " " + 
ex);
 } finally {
-  if (client != null) {
-ThriftUtil.returnClient(client);
-  }
+  ThriftUtil.returnClient(client);
 }
 return failures;
   }

accumulo git commit: ACCUMULO-3508 added read-write lock to ZooCache

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/master 10cafac94 -> dd420f631


ACCUMULO-3508 added read-write lock to ZooCache


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dd420f63
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dd420f63
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dd420f63

Branch: refs/heads/master
Commit: dd420f6312322d13b814a177fc87fabb0576dc04
Parents: 10cafac
Author: Eric C. Newton 
Authored: Wed Oct 14 15:12:23 2015 -0400
Committer: Eric C. Newton 
Committed: Wed Oct 14 15:13:42 2015 -0400

--
 .../accumulo/fate/zookeeper/ZooCache.java   | 325 +++
 1 file changed, 195 insertions(+), 130 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/dd420f63/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
--
diff --git 
a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java 
b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
index f043d83..8c9f80d 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
@@ -28,6 +28,10 @@ import java.util.ConcurrentModificationException;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.LockSupport;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.KeeperException.Code;
@@ -46,14 +50,18 @@ import com.google.common.annotations.VisibleForTesting;
 public class ZooCache {
   private static final Logger log = LoggerFactory.getLogger(ZooCache.class);
 
-  private ZCacheWatcher watcher = new ZCacheWatcher();
-  private Watcher externalWatcher = null;
+  private final ZCacheWatcher watcher = new ZCacheWatcher();
+  private final Watcher externalWatcher;
 
-  private HashMap cache;
-  private HashMap statCache;
-  private HashMap childrenCache;
+  private final ReadWriteLock cacheLock = new ReentrantReadWriteLock(false);
+  private final Lock cacheWriteLock = cacheLock.writeLock();
+  private final Lock cacheReadLock = cacheLock.readLock();
 
-  private ZooReader zReader;
+  private final HashMap cache;
+  private final HashMap statCache;
+  private final HashMap childrenCache;
+
+  private final ZooReader zReader;
 
   private ZooKeeper getZooKeeper() {
 return zReader.getZooKeeper();
@@ -63,8 +71,9 @@ public class ZooCache {
 @Override
 public void process(WatchedEvent event) {
 
-  if (log.isTraceEnabled())
+  if (log.isTraceEnabled()) {
 log.trace("{}", event);
+  }
 
   switch (event.getType()) {
 case NodeDataChanged:
@@ -89,10 +98,12 @@ public class ZooCache {
   break;
 default:
   log.warn("Unhandled: " + event);
+  break;
   }
   break;
 default:
   log.warn("Unhandled: " + event);
+  break;
   }
 
   if (externalWatcher != null) {
@@ -143,50 +154,50 @@ public class ZooCache {
 this.externalWatcher = watcher;
   }
 
-  private interface ZooRunnable {
+  private abstract class ZooRunnable {
 /**
  * Runs an operation against ZooKeeper, automatically retrying in the face 
of KeeperExceptions
  */
-void run(ZooKeeper zooKeeper) throws KeeperException, InterruptedException;
-  }
+abstract T run(ZooKeeper zooKeeper) throws KeeperException, 
InterruptedException;
 
-  private synchronized void retry(ZooRunnable op) {
+public T retry() {
 
-int sleepTime = 100;
+  int sleepTime = 100;
 
-while (true) {
+  while (true) {
 
-  ZooKeeper zooKeeper = getZooKeeper();
+ZooKeeper zooKeeper = getZooKeeper();
 
-  try {
-op.run(zooKeeper);
-return;
-
-  } catch (KeeperException e) {
-final Code code = e.code();
-if (code == Code.NONODE) {
-  log.error("Looked up non-existent node in cache " + e.getPath(), e);
-} else if (code == Code.CONNECTIONLOSS || code == 
Code.OPERATIONTIMEOUT || code == Code.SESSIONEXPIRED) {
-  log.warn("Saw (possibly) transient exception communicating with 
ZooKeeper, will retry", e);
-} else {
-  log.warn("Zookeeper error, will retry", e);
+try {
+  return run(zooKeeper);
+} catch (KeeperException e) {
+  final Code code = e.code();
+  if (code == Code.NONODE) {
+

svn commit: r1708400 - /accumulo/site/trunk/content/downloads/index.mdtext

[ecn]

Author: ecn
Date: Tue Oct 13 14:13:13 2015
New Revision: 1708400

URL: http://svn.apache.org/viewvc?rev=1708400=rev
Log:
Fix version in the directory path

Modified:
accumulo/site/trunk/content/downloads/index.mdtext

Modified: accumulo/site/trunk/content/downloads/index.mdtext
URL: 
http://svn.apache.org/viewvc/accumulo/site/trunk/content/downloads/index.mdtext?rev=1708400=1708399=1708400=diff
==
--- accumulo/site/trunk/content/downloads/index.mdtext (original)
+++ accumulo/site/trunk/content/downloads/index.mdtext Tue Oct 13 14:13:13 2015
@@ -137,12 +137,12 @@ For convenience, [MD5][MD5SUM_16] and [S
 
 
 Generic Binaries
-https://www.apache.org/dyn/closer.lua/accumulo/1.6.4/accumulo-1.6.4-bin.tar.gz;
 link-suffix="/accumulo/1.6.3/accumulo-1.6.4-bin.tar.gz" 
class="download_external" 
id="/downloads/accumulo-1.6.4-bin.tar.gz">accumulo-1.6.4-bin.tar.gz
+https://www.apache.org/dyn/closer.lua/accumulo/1.6.4/accumulo-1.6.4-bin.tar.gz;
 link-suffix="/accumulo/1.6.4/accumulo-1.6.4-bin.tar.gz" 
class="download_external" 
id="/downloads/accumulo-1.6.4-bin.tar.gz">accumulo-1.6.4-bin.tar.gz
 https://www.apache.org/dist/accumulo/1.6.4/accumulo-1.6.4-bin.tar.gz.asc;>ASC
 
 
 Source
-https://www.apache.org/dyn/closer.lua/accumulo/1.6.4/accumulo-1.6.4-src.tar.gz;
 link-suffix="/accumulo/1.6.3/accumulo-1.6.4-src.tar.gz" 
class="download_external" 
id="/downloads/accumulo-1.6.4-src.tar.gz">accumulo-1.6.4-src.tar.gz
+https://www.apache.org/dyn/closer.lua/accumulo/1.6.4/accumulo-1.6.4-src.tar.gz;
 link-suffix="/accumulo/1.6.4/accumulo-1.6.4-src.tar.gz" 
class="download_external" 
id="/downloads/accumulo-1.6.4-src.tar.gz">accumulo-1.6.4-src.tar.gz
 https://www.apache.org/dist/accumulo/1.6.4/accumulo-1.6.4-src.tar.gz.asc;>ASC
 
 

svn commit: r968793 - in /websites/production/accumulo/content: ./ 1.4/apidocs/ 1.5/apidocs/ 1.6/apidocs/ 1.7/apidocs/

[ecn]

Author: ecn
Date: Tue Oct 13 14:14:02 2015
New Revision: 968793

Log:
Publishing svnmucc operation to accumulo site by ecn

Added:
websites/production/accumulo/content/
  - copied from r968792, websites/staging/accumulo/trunk/content/
websites/production/accumulo/content/1.4/apidocs/
  - copied from r968792, websites/production/accumulo/content/1.4/apidocs/
websites/production/accumulo/content/1.5/apidocs/
  - copied from r968792, websites/production/accumulo/content/1.5/apidocs/
websites/production/accumulo/content/1.6/apidocs/
  - copied from r968792, websites/production/accumulo/content/1.6/apidocs/
websites/production/accumulo/content/1.7/apidocs/
  - copied from r968792, websites/production/accumulo/content/1.7/apidocs/

[1/2] accumulo git commit: ACCUMULO-4017 prevent bit extension from making byte values negative indexes

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/master 40a874341 -> 036e739ba


ACCUMULO-4017 prevent bit extension from making byte values negative indexes


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a689f3ac
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a689f3ac
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a689f3ac

Branch: refs/heads/master
Commit: a689f3ac0a89f628741e1eb1ae01d76bac2ebb72
Parents: 29c7eeb
Author: Eric C. Newton 
Authored: Tue Oct 13 15:48:35 2015 -0400
Committer: Eric C. Newton 
Committed: Tue Oct 13 15:48:35 2015 -0400

--
 .../java/org/apache/accumulo/core/iterators/user/GrepIterator.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a689f3ac/core/src/main/java/org/apache/accumulo/core/iterators/user/GrepIterator.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/iterators/user/GrepIterator.java 
b/core/src/main/java/org/apache/accumulo/core/iterators/user/GrepIterator.java
index d3efe2f..30d27ae 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/iterators/user/GrepIterator.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/iterators/user/GrepIterator.java
@@ -59,7 +59,7 @@ public class GrepIterator extends Filter {
   skip = 0;
   for (int j = M - 1; j >= 0; j--) {
 if (term[j] != value[i + j]) {
-  skip = Math.max(1, j - right[value[i + j]]);
+  skip = Math.max(1, j - right[value[i + j] & 0xff]);
 }
   }
   if (skip == 0) {

[2/2] accumulo git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo

[ecn]

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/036e739b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/036e739b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/036e739b

Branch: refs/heads/master
Commit: 036e739ba6d6fb498277f3a67c73aee7094a49cc
Parents: a689f3a 40a8743
Author: Eric C. Newton 
Authored: Tue Oct 13 15:48:54 2015 -0400
Committer: Eric C. Newton 
Committed: Tue Oct 13 15:48:54 2015 -0400

--
 proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)
--

[2/2] accumulo git commit: Merge branch '1.6' into 1.7

[ecn]

Merge branch '1.6' into 1.7


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/91b161a9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/91b161a9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/91b161a9

Branch: refs/heads/1.7
Commit: 91b161a932307e2d16845a0c0f6304f123a140b9
Parents: 62821a0 4deaf73
Author: Eric C. Newton 
Authored: Tue Oct 13 16:50:18 2015 -0400
Committer: Eric C. Newton 
Committed: Tue Oct 13 16:50:18 2015 -0400

--
 .../main/java/org/apache/accumulo/master/tableOps/BulkImport.java   | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/91b161a9/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
--
diff --cc 
server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
index 031a80c,e661968..ad20473
--- 
a/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
+++ 
b/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
@@@ -263,5 -284,337 +263,6 @@@ public class BulkImport extends MasterR
  Utils.unreserveHdfsDirectory(sourceDir, tid);
  Utils.unreserveHdfsDirectory(errorDir, tid);
  Utils.getReadLock(tableId, tid).unlock();
+ ZooArbitrator.cleanup(Constants.BULK_ARBITRATOR_TYPE, tid);
}
  }
 -
 -class CleanUpBulkImport extends MasterRepo {
 -
 -  private static final long serialVersionUID = 1L;
 -
 -  private static final Logger log = Logger.getLogger(CleanUpBulkImport.class);
 -
 -  private String tableId;
 -  private String source;
 -  private String bulk;
 -  private String error;
 -
 -  public CleanUpBulkImport(String tableId, String source, String bulk, String 
error) {
 -this.tableId = tableId;
 -this.source = source;
 -this.bulk = bulk;
 -this.error = error;
 -  }
 -
 -  @Override
 -  public Repo call(long tid, Master master) throws Exception {
 -log.debug("removing the bulk processing flag file in " + bulk);
 -Path bulkDir = new Path(bulk);
 -MetadataTableUtil.removeBulkLoadInProgressFlag("/" + 
bulkDir.getParent().getName() + "/" + bulkDir.getName());
 -MetadataTableUtil.addDeleteEntry(tableId, bulkDir.toString());
 -log.debug("removing the metadata table markers for loaded files");
 -Connector conn = master.getConnector();
 -MetadataTableUtil.removeBulkLoadEntries(conn, tableId, tid);
 -log.debug("releasing HDFS reservations for " + source + " and " + error);
 -Utils.unreserveHdfsDirectory(source, tid);
 -Utils.unreserveHdfsDirectory(error, tid);
 -Utils.getReadLock(tableId, tid).unlock();
 -log.debug("completing bulk import transaction " + tid);
 -ZooArbitrator.cleanup(Constants.BULK_ARBITRATOR_TYPE, tid);
 -return null;
 -  }
 -}
 -
 -class CompleteBulkImport extends MasterRepo {
 -
 -  private static final long serialVersionUID = 1L;
 -
 -  private String tableId;
 -  private String source;
 -  private String bulk;
 -  private String error;
 -
 -  public CompleteBulkImport(String tableId, String source, String bulk, 
String error) {
 -this.tableId = tableId;
 -this.source = source;
 -this.bulk = bulk;
 -this.error = error;
 -  }
 -
 -  @Override
 -  public Repo call(long tid, Master master) throws Exception {
 -ZooArbitrator.stop(Constants.BULK_ARBITRATOR_TYPE, tid);
 -return new CopyFailed(tableId, source, bulk, error);
 -  }
 -}
 -
 -class CopyFailed extends MasterRepo {
 -
 -  private static final long serialVersionUID = 1L;
 -
 -  private String tableId;
 -  private String source;
 -  private String bulk;
 -  private String error;
 -
 -  public CopyFailed(String tableId, String source, String bulk, String error) 
{
 -this.tableId = tableId;
 -this.source = source;
 -this.bulk = bulk;
 -this.error = error;
 -  }
 -
 -  @Override
 -  public long isReady(long tid, Master master) throws Exception {
 -Set finished = new HashSet();
 -Set running = master.onlineTabletServers();
 -for (TServerInstance server : running) {
 -  try {
 -TServerConnection client = master.getConnection(server);
 -if (client != null && !client.isActive(tid))
 -  finished.add(server);
 -  } catch (TException ex) {
 -log.info("Ignoring error trying to check on tid " + tid + " from 
server " + server + ": " + ex);
 -  }
 -}
 -if (finished.containsAll(running))
 -  return 0;
 -return 500;
 -  }
 -
 -  @Override
 -  public Repo call(long tid, Master master) throws Exception {
 -// This needs to execute after the arbiter is stopped
 -
 -VolumeManager fs = master.getFileSystem();
 -
 -if (!fs.exists(new Path(error, 

[1/2] accumulo git commit: ACCUMULO-4025 canceling a FATE transaction should remove the arbitrator entry

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/1.7 62821a03c -> 91b161a93


ACCUMULO-4025 canceling a FATE transaction should remove the arbitrator entry


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4deaf73c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4deaf73c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4deaf73c

Branch: refs/heads/1.7
Commit: 4deaf73c03e0d166e321719bd9ff3cddc607b336
Parents: c869751
Author: Eric C. Newton 
Authored: Tue Oct 13 16:50:05 2015 -0400
Committer: Eric C. Newton 
Committed: Tue Oct 13 16:50:05 2015 -0400

--
 .../main/java/org/apache/accumulo/master/tableOps/BulkImport.java   | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4deaf73c/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
--
diff --git 
a/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
 
b/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
index 8273421..e661968 100644
--- 
a/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
+++ 
b/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
@@ -284,6 +284,7 @@ public class BulkImport extends MasterRepo {
 Utils.unreserveHdfsDirectory(sourceDir, tid);
 Utils.unreserveHdfsDirectory(errorDir, tid);
 Utils.getReadLock(tableId, tid).unlock();
+ZooArbitrator.cleanup(Constants.BULK_ARBITRATOR_TYPE, tid);
   }
 }
 

[2/3] accumulo git commit: Merge branch '1.6' into 1.7

[ecn]

Merge branch '1.6' into 1.7


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/91b161a9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/91b161a9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/91b161a9

Branch: refs/heads/master
Commit: 91b161a932307e2d16845a0c0f6304f123a140b9
Parents: 62821a0 4deaf73
Author: Eric C. Newton 
Authored: Tue Oct 13 16:50:18 2015 -0400
Committer: Eric C. Newton 
Committed: Tue Oct 13 16:50:18 2015 -0400

--
 .../main/java/org/apache/accumulo/master/tableOps/BulkImport.java   | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/91b161a9/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
--
diff --cc 
server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
index 031a80c,e661968..ad20473
--- 
a/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
+++ 
b/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
@@@ -263,5 -284,337 +263,6 @@@ public class BulkImport extends MasterR
  Utils.unreserveHdfsDirectory(sourceDir, tid);
  Utils.unreserveHdfsDirectory(errorDir, tid);
  Utils.getReadLock(tableId, tid).unlock();
+ ZooArbitrator.cleanup(Constants.BULK_ARBITRATOR_TYPE, tid);
}
  }
 -
 -class CleanUpBulkImport extends MasterRepo {
 -
 -  private static final long serialVersionUID = 1L;
 -
 -  private static final Logger log = Logger.getLogger(CleanUpBulkImport.class);
 -
 -  private String tableId;
 -  private String source;
 -  private String bulk;
 -  private String error;
 -
 -  public CleanUpBulkImport(String tableId, String source, String bulk, String 
error) {
 -this.tableId = tableId;
 -this.source = source;
 -this.bulk = bulk;
 -this.error = error;
 -  }
 -
 -  @Override
 -  public Repo call(long tid, Master master) throws Exception {
 -log.debug("removing the bulk processing flag file in " + bulk);
 -Path bulkDir = new Path(bulk);
 -MetadataTableUtil.removeBulkLoadInProgressFlag("/" + 
bulkDir.getParent().getName() + "/" + bulkDir.getName());
 -MetadataTableUtil.addDeleteEntry(tableId, bulkDir.toString());
 -log.debug("removing the metadata table markers for loaded files");
 -Connector conn = master.getConnector();
 -MetadataTableUtil.removeBulkLoadEntries(conn, tableId, tid);
 -log.debug("releasing HDFS reservations for " + source + " and " + error);
 -Utils.unreserveHdfsDirectory(source, tid);
 -Utils.unreserveHdfsDirectory(error, tid);
 -Utils.getReadLock(tableId, tid).unlock();
 -log.debug("completing bulk import transaction " + tid);
 -ZooArbitrator.cleanup(Constants.BULK_ARBITRATOR_TYPE, tid);
 -return null;
 -  }
 -}
 -
 -class CompleteBulkImport extends MasterRepo {
 -
 -  private static final long serialVersionUID = 1L;
 -
 -  private String tableId;
 -  private String source;
 -  private String bulk;
 -  private String error;
 -
 -  public CompleteBulkImport(String tableId, String source, String bulk, 
String error) {
 -this.tableId = tableId;
 -this.source = source;
 -this.bulk = bulk;
 -this.error = error;
 -  }
 -
 -  @Override
 -  public Repo call(long tid, Master master) throws Exception {
 -ZooArbitrator.stop(Constants.BULK_ARBITRATOR_TYPE, tid);
 -return new CopyFailed(tableId, source, bulk, error);
 -  }
 -}
 -
 -class CopyFailed extends MasterRepo {
 -
 -  private static final long serialVersionUID = 1L;
 -
 -  private String tableId;
 -  private String source;
 -  private String bulk;
 -  private String error;
 -
 -  public CopyFailed(String tableId, String source, String bulk, String error) 
{
 -this.tableId = tableId;
 -this.source = source;
 -this.bulk = bulk;
 -this.error = error;
 -  }
 -
 -  @Override
 -  public long isReady(long tid, Master master) throws Exception {
 -Set finished = new HashSet();
 -Set running = master.onlineTabletServers();
 -for (TServerInstance server : running) {
 -  try {
 -TServerConnection client = master.getConnection(server);
 -if (client != null && !client.isActive(tid))
 -  finished.add(server);
 -  } catch (TException ex) {
 -log.info("Ignoring error trying to check on tid " + tid + " from 
server " + server + ": " + ex);
 -  }
 -}
 -if (finished.containsAll(running))
 -  return 0;
 -return 500;
 -  }
 -
 -  @Override
 -  public Repo call(long tid, Master master) throws Exception {
 -// This needs to execute after the arbiter is stopped
 -
 -VolumeManager fs = master.getFileSystem();
 -
 -if (!fs.exists(new 

[1/3] accumulo git commit: ACCUMULO-4025 canceling a FATE transaction should remove the arbitrator entry

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/master 036e739ba -> c30e558ae


ACCUMULO-4025 canceling a FATE transaction should remove the arbitrator entry


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4deaf73c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4deaf73c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4deaf73c

Branch: refs/heads/master
Commit: 4deaf73c03e0d166e321719bd9ff3cddc607b336
Parents: c869751
Author: Eric C. Newton 
Authored: Tue Oct 13 16:50:05 2015 -0400
Committer: Eric C. Newton 
Committed: Tue Oct 13 16:50:05 2015 -0400

--
 .../main/java/org/apache/accumulo/master/tableOps/BulkImport.java   | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4deaf73c/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
--
diff --git 
a/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
 
b/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
index 8273421..e661968 100644
--- 
a/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
+++ 
b/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
@@ -284,6 +284,7 @@ public class BulkImport extends MasterRepo {
 Utils.unreserveHdfsDirectory(sourceDir, tid);
 Utils.unreserveHdfsDirectory(errorDir, tid);
 Utils.getReadLock(tableId, tid).unlock();
+ZooArbitrator.cleanup(Constants.BULK_ARBITRATOR_TYPE, tid);
   }
 }
 

[3/3] accumulo git commit: Merge branch '1.7'

[ecn]

Merge branch '1.7'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c30e558a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c30e558a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c30e558a

Branch: refs/heads/master
Commit: c30e558ae92e80ffdd268c13b7def4148ecbe116
Parents: 036e739 91b161a
Author: Eric C. Newton 
Authored: Tue Oct 13 16:50:37 2015 -0400
Committer: Eric C. Newton 
Committed: Tue Oct 13 16:50:37 2015 -0400

--
 .../main/java/org/apache/accumulo/master/tableOps/BulkImport.java   | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/c30e558a/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
--

[3/7] accumulo git commit: Merge branch '1.6' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6

[ecn]

Merge branch '1.6' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a922ed79
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a922ed79
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a922ed79

Branch: refs/heads/master
Commit: a922ed791acbda208529230c4c161bab285cbb91
Parents: fbb082d 4b5ea53
Author: Eric C. Newton 
Authored: Fri Oct 2 14:22:04 2015 -0400
Committer: Eric C. Newton 
Committed: Fri Oct 2 14:22:04 2015 -0400

--

--

[1/7] accumulo git commit: ACCUMULO-4016 use object reference equality to remove the minimum object queued

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/master 8f6ab6d3e -> 49b44e4eb


ACCUMULO-4016 use object reference equality to remove the minimum object queued


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fbb082d9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fbb082d9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fbb082d9

Branch: refs/heads/master
Commit: fbb082d962aa472240ffccce753c5b4309fd5a46
Parents: 7a1d6d9
Author: Eric C. Newton 
Authored: Fri Oct 2 13:09:57 2015 -0400
Committer: Eric C. Newton 
Committed: Fri Oct 2 14:20:32 2015 -0400

--
 .../java/org/apache/accumulo/tserver/CompactionQueue.java | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/fbb082d9/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java
--
diff --git 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java
index 0cb04a7..1e7c086 100644
--- 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java
+++ 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java
@@ -36,8 +36,14 @@ public class CompactionQueue extends AbstractQueue 
implements Blocking
   return null;
 
 Comparable min = Collections.min(task);
-task.remove(min);
-return (Runnable) min;
+Iterator iterator = task.iterator();
+while (iterator.hasNext()) {
+  if (iterator.next() == min) {
+iterator.remove();
+return (Runnable) min;
+  }
+}
+throw new IllegalStateException("Minimum object found, but not there when 
removing");
   }
 
   @Override

[1/2] accumulo git commit: Merge branch '1.7'

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/master 17ae2f919 -> 8f6ab6d3e


Merge branch '1.7'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/32907df8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/32907df8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/32907df8

Branch: refs/heads/master
Commit: 32907df8fd14cbf2e34400c46bdabb9a634fa0c2
Parents: 18e834e 0013e46
Author: Eric C. Newton 
Authored: Fri Oct 2 13:15:30 2015 -0400
Committer: Eric C. Newton 
Committed: Fri Oct 2 14:21:40 2015 -0400

--
 .../accumulo/core/iterators/Combiner.java   |  97 ++-
 .../core/iterators/CombinerTestUtil.java|  23 +++
 .../iterators/user/BigDecimalCombinerTest.java  |   6 +-
 .../core/iterators/user/CombinerTest.java   | 170 ---
 .../accumulo/tserver/CompactionQueue.java   |  10 +-
 5 files changed, 280 insertions(+), 26 deletions(-)
--

[1/2] accumulo git commit: ACCUMULO-4016 use object reference equality to remove the minimum object queued

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/1.6 4b5ea5355 -> a922ed791


ACCUMULO-4016 use object reference equality to remove the minimum object queued


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fbb082d9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fbb082d9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fbb082d9

Branch: refs/heads/1.6
Commit: fbb082d962aa472240ffccce753c5b4309fd5a46
Parents: 7a1d6d9
Author: Eric C. Newton 
Authored: Fri Oct 2 13:09:57 2015 -0400
Committer: Eric C. Newton 
Committed: Fri Oct 2 14:20:32 2015 -0400

--
 .../java/org/apache/accumulo/tserver/CompactionQueue.java | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/fbb082d9/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java
--
diff --git 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java
index 0cb04a7..1e7c086 100644
--- 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java
+++ 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java
@@ -36,8 +36,14 @@ public class CompactionQueue extends AbstractQueue 
implements Blocking
   return null;
 
 Comparable min = Collections.min(task);
-task.remove(min);
-return (Runnable) min;
+Iterator iterator = task.iterator();
+while (iterator.hasNext()) {
+  if (iterator.next() == min) {
+iterator.remove();
+return (Runnable) min;
+  }
+}
+throw new IllegalStateException("Minimum object found, but not there when 
removing");
   }
 
   @Override

[2/2] accumulo git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo

[ecn]

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/8f6ab6d3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8f6ab6d3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8f6ab6d3

Branch: refs/heads/master
Commit: 8f6ab6d3e9d63dcc3b8447cf3a7ac0c6e7e80a94
Parents: 32907df 17ae2f9
Author: Eric C. Newton 
Authored: Fri Oct 2 14:22:23 2015 -0400
Committer: Eric C. Newton 
Committed: Fri Oct 2 14:22:23 2015 -0400

--

--

[1/2] accumulo git commit: ACCUMULO-3462 use object reference equality to remove the minimum object queued

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/1.7 f50db38f7 -> 0013e46e6


ACCUMULO-3462 use object reference equality to remove the minimum object queued


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4b5ea535
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4b5ea535
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4b5ea535

Branch: refs/heads/1.7
Commit: 4b5ea535516d98ac482e33e210a6c48fb8f12c43
Parents: 7a1d6d9
Author: Eric C. Newton 
Authored: Fri Oct 2 13:09:57 2015 -0400
Committer: Eric C. Newton 
Committed: Fri Oct 2 13:09:57 2015 -0400

--
 .../java/org/apache/accumulo/tserver/CompactionQueue.java | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4b5ea535/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java
--
diff --git 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java
index 0cb04a7..1e7c086 100644
--- 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java
+++ 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java
@@ -36,8 +36,14 @@ public class CompactionQueue extends AbstractQueue 
implements Blocking
   return null;
 
 Comparable min = Collections.min(task);
-task.remove(min);
-return (Runnable) min;
+Iterator iterator = task.iterator();
+while (iterator.hasNext()) {
+  if (iterator.next() == min) {
+iterator.remove();
+return (Runnable) min;
+  }
+}
+throw new IllegalStateException("Minimum object found, but not there when 
removing");
   }
 
   @Override

[5/5] accumulo git commit: Merge branch '1.7'

[ecn]

Merge branch '1.7'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/17ae2f91
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/17ae2f91
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/17ae2f91

Branch: refs/heads/master
Commit: 17ae2f919024daef4a6b4dff7ac92aefd8805de2
Parents: 18e834e 0013e46
Author: Eric C. Newton 
Authored: Fri Oct 2 13:15:30 2015 -0400
Committer: Eric C. Newton 
Committed: Fri Oct 2 13:15:30 2015 -0400

--
 .../accumulo/core/iterators/Combiner.java   |  97 ++-
 .../core/iterators/CombinerTestUtil.java|  23 +++
 .../iterators/user/BigDecimalCombinerTest.java  |   6 +-
 .../core/iterators/user/CombinerTest.java   | 170 ---
 .../accumulo/tserver/CompactionQueue.java   |  10 +-
 5 files changed, 280 insertions(+), 26 deletions(-)
--

[1/5] accumulo git commit: ACCUMULO-2232 Added options to Combiner for handling deletes

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/master 18e834ec2 -> 17ae2f919


ACCUMULO-2232 Added options to Combiner for handling deletes


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7a1d6d92
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7a1d6d92
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7a1d6d92

Branch: refs/heads/master
Commit: 7a1d6d921ba81c7f92eab8d3b20aae461a46066a
Parents: e24bd36
Author: Keith Turner 
Authored: Fri Oct 2 10:19:37 2015 -0400
Committer: Keith Turner 
Committed: Fri Oct 2 11:10:00 2015 -0400

--
 .../accumulo/core/iterators/Combiner.java   |  93 +-
 .../core/iterators/CombinerTestUtil.java|  23 +++
 .../iterators/user/BigDecimalCombinerTest.java  |   6 +-
 .../core/iterators/user/CombinerTest.java   | 175 ---
 4 files changed, 270 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a1d6d92/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java 
b/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
index 97d0ce3..091803b 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
@@ -22,6 +22,9 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
 
 import org.apache.accumulo.core.client.IteratorSetting;
 import org.apache.accumulo.core.client.IteratorSetting.Column;
@@ -31,11 +34,15 @@ import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.PartialKey;
 import org.apache.accumulo.core.data.Range;
 import org.apache.accumulo.core.data.Value;
+import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
 import org.apache.accumulo.core.iterators.conf.ColumnSet;
 import org.apache.hadoop.io.Text;
 import org.apache.log4j.Logger;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Splitter;
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
 import com.google.common.collect.Lists;
 
 /**
@@ -45,18 +52,28 @@ import com.google.common.collect.Lists;
  * will combine all Keys in column family and qualifier individually. 
Combination is only ever performed on multiple versions and not across column 
qualifiers
  * or column visibilities.
  *
+ * 
  * Implementations must provide a reduce method: {@code public Value 
reduce(Key key, Iterator iter)}.
  *
+ * 
  * This reduce method will be passed the most recent Key and an iterator over 
the Values for all non-deleted versions of that Key. A combiner will not combine
  * keys that differ by more than the timestamp.
  *
+ * 
  * This class and its implementations do not automatically filter out unwanted 
columns from those being combined, thus it is generally recommended to use a
  * {@link Combiner} implementation with the {@link 
ScannerBase#fetchColumnFamily(Text)} or {@link ScannerBase#fetchColumn(Text, 
Text)} methods.
+ *
+ * 
+ * WARNING : Using deletes with Combiners may not work as intended. See {@link 
#setReduceOnFullCompactionOnly(IteratorSetting, boolean)}
  */
 public abstract class Combiner extends WrappingIterator implements 
OptionDescriber {
-  static final Logger log = Logger.getLogger(Combiner.class);
+  static final Logger sawDeleteLog = 
Logger.getLogger(Combiner.class.getName()+".SawDelete");
   protected static final String COLUMNS_OPTION = "columns";
   protected static final String ALL_OPTION = "all";
+  protected static final String REDUCE_ON_FULL_COMPACTION_ONLY_OPTION = 
"reduceOnFullCompactionOnly";
+
+  private boolean isMajorCompaction;
+  private boolean reduceOnFullCompactionOnly;
 
   /**
* A Java Iterator that iterates over the Values for a given Key from a 
source SortedKeyValueIterator.
@@ -149,6 +166,27 @@ public abstract class Combiner extends WrappingIterator 
implements OptionDescrib
 
   private Key workKey = new Key();
 
+  @VisibleForTesting
+  static final Cache loggedMsgCache = 
CacheBuilder.newBuilder().expireAfterWrite(1, 
TimeUnit.HOURS).maximumSize(1).build();
+
+  private void sawDelete() {
+if (isMajorCompaction && !reduceOnFullCompactionOnly) {
+  try {
+loggedMsgCache.get(this.getClass().getName(), new Callable() {
+  @Override
+  public Boolean call() throws Exception {
+

[3/5] accumulo git commit: ACCUMULO-3462 use object reference equality to remove the minimum object queued

[ecn]

ACCUMULO-3462 use object reference equality to remove the minimum object queued


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4b5ea535
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4b5ea535
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4b5ea535

Branch: refs/heads/master
Commit: 4b5ea535516d98ac482e33e210a6c48fb8f12c43
Parents: 7a1d6d9
Author: Eric C. Newton 
Authored: Fri Oct 2 13:09:57 2015 -0400
Committer: Eric C. Newton 
Committed: Fri Oct 2 13:09:57 2015 -0400

--
 .../java/org/apache/accumulo/tserver/CompactionQueue.java | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4b5ea535/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java
--
diff --git 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java
index 0cb04a7..1e7c086 100644
--- 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java
+++ 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java
@@ -36,8 +36,14 @@ public class CompactionQueue extends AbstractQueue 
implements Blocking
   return null;
 
 Comparable min = Collections.min(task);
-task.remove(min);
-return (Runnable) min;
+Iterator iterator = task.iterator();
+while (iterator.hasNext()) {
+  if (iterator.next() == min) {
+iterator.remove();
+return (Runnable) min;
+  }
+}
+throw new IllegalStateException("Minimum object found, but not there when 
removing");
   }
 
   @Override

accumulo git commit: ACCUMULO-4016 wrapper classes should forward to underlying methods

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/1.6 a922ed791 -> a39b3f6be


ACCUMULO-4016 wrapper classes should forward to underlying methods


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a39b3f6b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a39b3f6b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a39b3f6b

Branch: refs/heads/1.6
Commit: a39b3f6be7eace0c8980517800ce068bb6cc1afc
Parents: a922ed7
Author: Eric C. Newton 
Authored: Fri Oct 2 14:40:48 2015 -0400
Committer: Eric C. Newton 
Committed: Fri Oct 2 14:40:48 2015 -0400

--
 .../java/org/apache/accumulo/trace/instrument/TraceRunnable.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a39b3f6b/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceRunnable.java
--
diff --git 
a/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceRunnable.java 
b/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceRunnable.java
index 3b7d4f6..45df0fe 100644
--- 
a/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceRunnable.java
+++ 
b/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceRunnable.java
@@ -51,7 +51,7 @@ public class TraceRunnable implements Runnable, 
Comparable {
   @Override
   public boolean equals(Object o) {
 if (o instanceof TraceRunnable) {
-  return 0 == this.compareTo((TraceRunnable) o);
+  return runnable.equals(((TraceRunnable) o).runnable);
 }
 
 return false;