[accumulo] 01/01: Merge branch '1.8'

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit e95873343840c72196097bedfa487251cf50c284
Merge: 0338b93 82d8368
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Thu Mar 1 14:01:28 2018 -0500

Merge branch '1.8'

 .../java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java | 3 +++
 1 file changed, 3 insertions(+)

diff --cc 
core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
index e4b34b5,aea8740..2518f8c
--- 
a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
@@@ -457,7 -425,10 +457,10 @@@ public class TableOperationsImpl extend
// user would only have the stack trace for the background thread.
if (excep instanceof TableNotFoundException) {
  TableNotFoundException tnfe = (TableNotFoundException) excep;
 -throw new TableNotFoundException(tableId, tableName, "Table not 
found by background thread", tnfe);
 +throw new TableNotFoundException(tableId.canonicalID(), 
tableName, "Table not found by background thread", tnfe);
+   } else if (excep instanceof TableOfflineException) {
+ log.debug("TableOfflineException occurred in background thread. 
Throwing new exception", excep);
 -throw new TableOfflineException(context.getInstance(), tableId);
++throw new TableOfflineException(context.getInstance(), 
tableId.canonicalID());
} else if (excep instanceof AccumuloSecurityException) {
  // base == background accumulo security exception
  AccumuloSecurityException base = (AccumuloSecurityException) 
excep;

-- 
To stop receiving notification emails like this one, please contact
mmil...@apache.org.

[accumulo] 01/01: Merge branch '1.7' into 1.8

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch 1.8
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 82d836831059ace3e5de65d61fe43b17fda9ecd0
Merge: c9ead78 93a1a1f
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Thu Mar 1 13:22:28 2018 -0500

Merge branch '1.7' into 1.8

 .../java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java | 3 +++
 1 file changed, 3 insertions(+)


-- 
To stop receiving notification emails like this one, please contact
mmil...@apache.org.

[accumulo] branch 1.8 updated (c9ead78 -> 82d8368)

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a change to branch 1.8
in repository https://gitbox.apache.org/repos/asf/accumulo.git.


from c9ead78  Merge branch '1.7' into 1.8
 add bcd2dc5  Fix false positive in rw concurrent/AddSplits
 add 93a1a1f  Add TableOfflineException to TableOps.addSplits (#393)
 new 82d8368  Merge branch '1.7' into 1.8

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java | 3 +++
 1 file changed, 3 insertions(+)

-- 
To stop receiving notification emails like this one, please contact
mmil...@apache.org.

[accumulo] branch 1.7 updated: Add TableOfflineException to TableOps.addSplits (#393)

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch 1.7
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/1.7 by this push:
 new 93a1a1f  Add TableOfflineException to TableOps.addSplits (#393)
93a1a1f is described below

commit 93a1a1f4ac881a6701567cee96dcaf6b831f1185
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Thu Mar 1 10:32:45 2018 -0500

Add TableOfflineException to TableOps.addSplits (#393)

Also revert commit bcd2dc51 which was hiding this error
---
 .../org/apache/accumulo/core/client/impl/TableOperationsImpl.java  | 3 +++
 .../org/apache/accumulo/test/randomwalk/concurrent/AddSplits.java  | 7 ---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
 
b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
index 0c3e0e6..3015b1d 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
@@ -394,6 +394,9 @@ public class TableOperationsImpl extends 
TableOperationsHelper {
   if (excep instanceof TableNotFoundException) {
 TableNotFoundException tnfe = (TableNotFoundException) excep;
 throw new TableNotFoundException(tableId, tableName, "Table not 
found by background thread", tnfe);
+  } else if (excep instanceof TableOfflineException) {
+log.debug("TableOfflineException occurred in background thread. 
Throwing new exception", excep);
+throw new TableOfflineException(context.getInstance(), tableId);
   } else if (excep instanceof AccumuloSecurityException) {
 // base == background accumulo security exception
 AccumuloSecurityException base = (AccumuloSecurityException) excep;
diff --git 
a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/AddSplits.java
 
b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/AddSplits.java
index e026299..dc040a6 100644
--- 
a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/AddSplits.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/AddSplits.java
@@ -22,7 +22,6 @@ import java.util.Properties;
 import java.util.Random;
 import java.util.TreeSet;
 
-import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.client.TableOfflineException;
@@ -58,12 +57,6 @@ public class AddSplits extends Test {
   log.debug("AddSplits " + tableName + " failed, doesnt exist");
 } catch (TableOfflineException e) {
   log.debug("AddSplits " + tableName + " failed, offline");
-} catch (AccumuloException ae) {
-  Throwable cause = ae.getCause();
-  if (cause != null && cause instanceof TableOfflineException)
-log.debug("AddSplits " + tableName + " failed, offline");
-  else
-throw ae;
 }
   }
 }

-- 
To stop receiving notification emails like this one, please contact
mmil...@apache.org.

[accumulo] branch 1.7 updated: Fix false positive in rw concurrent/AddSplits

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch 1.7
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/1.7 by this push:
 new bcd2dc5  Fix false positive in rw concurrent/AddSplits
bcd2dc5 is described below

commit bcd2dc51427a92474b9675cd03c156861308d365
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Wed Feb 28 13:24:00 2018 -0500

Fix false positive in rw concurrent/AddSplits
---
 .../org/apache/accumulo/test/randomwalk/concurrent/AddSplits.java  | 7 +++
 1 file changed, 7 insertions(+)

diff --git 
a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/AddSplits.java
 
b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/AddSplits.java
index dc040a6..e026299 100644
--- 
a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/AddSplits.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/AddSplits.java
@@ -22,6 +22,7 @@ import java.util.Properties;
 import java.util.Random;
 import java.util.TreeSet;
 
+import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.client.TableOfflineException;
@@ -57,6 +58,12 @@ public class AddSplits extends Test {
   log.debug("AddSplits " + tableName + " failed, doesnt exist");
 } catch (TableOfflineException e) {
   log.debug("AddSplits " + tableName + " failed, offline");
+} catch (AccumuloException ae) {
+  Throwable cause = ae.getCause();
+  if (cause != null && cause instanceof TableOfflineException)
+log.debug("AddSplits " + tableName + " failed, offline");
+  else
+throw ae;
 }
   }
 }

-- 
To stop receiving notification emails like this one, please contact
mmil...@apache.org.

[accumulo-examples] branch master updated: ACCUMULO-4804 Fix ChunkInput ITs

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo-examples.git


The following commit(s) were added to refs/heads/master by this push:
 new 5b37ccf  ACCUMULO-4804 Fix ChunkInput ITs
5b37ccf is described below

commit 5b37ccf0929e254b275ea80730f0f1db8ec6c60f
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Thu Feb 22 13:51:03 2018 -0500

ACCUMULO-4804 Fix ChunkInput ITs
---
 .../org/apache/accumulo/examples/filedata/ChunkInputFormatIT.java  | 6 ++
 .../org/apache/accumulo/examples/filedata/ChunkInputStreamIT.java  | 7 +++
 2 files changed, 13 insertions(+)

diff --git 
a/src/test/java/org/apache/accumulo/examples/filedata/ChunkInputFormatIT.java 
b/src/test/java/org/apache/accumulo/examples/filedata/ChunkInputFormatIT.java
index aa56c1b..5ed7d5d 100644
--- 
a/src/test/java/org/apache/accumulo/examples/filedata/ChunkInputFormatIT.java
+++ 
b/src/test/java/org/apache/accumulo/examples/filedata/ChunkInputFormatIT.java
@@ -32,12 +32,14 @@ import java.util.Map.Entry;
 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.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.security.Authorizations;
 import org.apache.accumulo.core.security.ColumnVisibility;
 import org.apache.accumulo.harness.AccumuloClusterHarness;
+import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.conf.Configured;
 import org.apache.hadoop.mapreduce.Job;
@@ -53,6 +55,10 @@ import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
 
 public class ChunkInputFormatIT extends AccumuloClusterHarness {
+  @Override
+  public void configureMiniCluster(MiniAccumuloConfigImpl cfg, Configuration 
hadoopCoreSite) {
+cfg.setProperty(Property.TSERV_NATIVEMAP_ENABLED, "false");
+  }
 
   // track errors in the map reduce job; jobs insert a dummy error for the map 
and cleanup tasks (to ensure test correctness),
   // so error tests should check to see if there is at least one error (could 
be more depending on the test) rather than zero
diff --git 
a/src/test/java/org/apache/accumulo/examples/filedata/ChunkInputStreamIT.java 
b/src/test/java/org/apache/accumulo/examples/filedata/ChunkInputStreamIT.java
index 69b8f48..e45762a 100644
--- 
a/src/test/java/org/apache/accumulo/examples/filedata/ChunkInputStreamIT.java
+++ 
b/src/test/java/org/apache/accumulo/examples/filedata/ChunkInputStreamIT.java
@@ -33,6 +33,7 @@ import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.Scanner;
 import org.apache.accumulo.core.client.TableExistsException;
 import org.apache.accumulo.core.client.TableNotFoundException;
+import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.KeyValue;
 import org.apache.accumulo.core.data.Mutation;
@@ -41,11 +42,17 @@ import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.core.security.ColumnVisibility;
 import org.apache.accumulo.core.util.PeekingIterator;
 import org.apache.accumulo.harness.AccumuloClusterHarness;
+import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl;
+import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.io.Text;
 import org.junit.Before;
 import org.junit.Test;
 
 public class ChunkInputStreamIT extends AccumuloClusterHarness {
+  @Override
+  public void configureMiniCluster(MiniAccumuloConfigImpl cfg, Configuration 
hadoopCoreSite) {
+cfg.setProperty(Property.TSERV_NATIVEMAP_ENABLED, "false");
+  }
 
   private static final Authorizations AUTHS = new Authorizations("A", "B", 
"C", "D");
 

-- 
To stop receiving notification emails like this one, please contact
mmil...@apache.org.

[accumulo-examples] branch master updated (e3616c4 -> 599536e)

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo-examples.git.


from e3616c4  ACCUMULO-4814 Added links to Java classes (#9)
 add 752c623  ACCUMULO-4804 Fixes to work with 2.0
 new 599536e  ACCUMULO-4804 Fixes to work with 2.0

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 docs/bulkIngest.md |  4 +--
 pom.xml|  2 +-
 .../apache/accumulo/examples/cli/ClientOpts.java   | 29 +++---
 .../apache/accumulo/examples/reservations/ARS.java |  2 +-
 .../org/apache/accumulo/examples/ExamplesIT.java   |  1 +
 .../apache/accumulo/examples/dirlist/CountIT.java  |  8 ++
 .../accumulo/examples/mapreduce/MapReduceIT.java   |  8 ++
 7 files changed, 41 insertions(+), 13 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
mmil...@apache.org.

[accumulo-examples] 01/01: ACCUMULO-4804 Fixes to work with 2.0

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo-examples.git

commit 599536eb6f2e3e4f0280b166d60a60c6914f6c19
Merge: e3616c4 752c623
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Wed Feb 14 15:43:27 2018 -0500

ACCUMULO-4804 Fixes to work with 2.0

 docs/bulkIngest.md |  4 +--
 pom.xml|  2 +-
 .../apache/accumulo/examples/cli/ClientOpts.java   | 29 +++---
 .../apache/accumulo/examples/reservations/ARS.java |  2 +-
 .../org/apache/accumulo/examples/ExamplesIT.java   |  1 +
 .../apache/accumulo/examples/dirlist/CountIT.java  |  8 ++
 .../accumulo/examples/mapreduce/MapReduceIT.java   |  8 ++
 7 files changed, 41 insertions(+), 13 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
mmil...@apache.org.

[accumulo] branch master updated: ACCUMULO-4778 Fix findbugs failure

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
 new 05c165b  ACCUMULO-4778 Fix findbugs failure
05c165b is described below

commit 05c165b5f61427b22024f1c78a4295c06a93aad6
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Wed Jan 31 12:09:23 2018 -0500

ACCUMULO-4778 Fix findbugs failure
---
 .../org/apache/accumulo/core/client/mapred/AbstractInputFormat.java   | 4 ++--
 .../apache/accumulo/core/client/mapreduce/AbstractInputFormat.java| 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
 
b/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
index b2f0ed7..28a3355 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
@@ -656,7 +656,7 @@ public abstract class AbstractInputFormat<K,V> implements 
InputFormat<K,V> {
   Table.ID tableId;
   // resolve table name to id once, and use id from this point forward
   if (DeprecationUtil.isMockInstance(instance)) {
-tableId = null;
+tableId = Table.ID.of("");
   } else {
 try {
   tableId = Tables.getTableId(instance, tableName);
@@ -705,7 +705,7 @@ public abstract class AbstractInputFormat<K,V> implements 
InputFormat<K,V> {
   getClientConfiguration(job));
   while (!tl.binRanges(context, ranges, binnedRanges).isEmpty()) {
 if (!DeprecationUtil.isMockInstance(instance)) {
-  String tableIdStr = tableId != null ? tableId.canonicalID() : 
null;
+  String tableIdStr = tableId.canonicalID();
   if (!Tables.exists(instance, tableId))
 throw new TableDeletedException(tableIdStr);
   if (Tables.getTableState(instance, tableId) == 
TableState.OFFLINE)
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
 
b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
index 72a9c92..fb36282 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
@@ -701,7 +701,7 @@ public abstract class AbstractInputFormat<K,V> extends 
InputFormat<K,V> {
   Table.ID tableId;
   // resolve table name to id once, and use id from this point forward
   if (DeprecationUtil.isMockInstance(instance)) {
-tableId = null;
+tableId = Table.ID.of("");
   } else {
 try {
   tableId = Tables.getTableId(instance, tableName);
@@ -751,7 +751,7 @@ public abstract class AbstractInputFormat<K,V> extends 
InputFormat<K,V> {
   getClientConfiguration(context));
   while (!tl.binRanges(clientContext, ranges, binnedRanges).isEmpty()) 
{
 if (!DeprecationUtil.isMockInstance(instance)) {
-  String tableIdStr = tableId != null ? tableId.canonicalID() : 
null;
+  String tableIdStr = tableId.canonicalID();
   if (!Tables.exists(instance, tableId))
 throw new TableDeletedException(tableIdStr);
   if (Tables.getTableState(instance, tableId) == 
TableState.OFFLINE)

-- 
To stop receiving notification emails like this one, please contact
mmil...@apache.org.

[accumulo] 01/01: Merge branch '1.8'

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 0cb58c519cb058d6a1029f2fe39f6071ca6b5ab8
Merge: 19f819d d6d8a7d
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Tue Jan 30 19:02:46 2018 -0500

Merge branch '1.8'

 Conflicts:

core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java
core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java

 .../client/impl/MultiTableBatchWriterImpl.java |  76 +
 .../apache/accumulo/core/client/impl/TableMap.java | 101 
 .../apache/accumulo/core/client/impl/Tables.java   | 174 -
 .../server/util/VerifyTabletAssignments.java   |   2 +-
 .../org/apache/accumulo/master/tableOps/Utils.java |   2 +-
 .../accumulo/test/MultiTableBatchWriterIT.java | 119 +-
 6 files changed, 173 insertions(+), 301 deletions(-)

diff --cc 
core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java
index aa0d469,a4a5b2f..255aa01
--- 
a/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java
@@@ -82,37 -71,13 +71,13 @@@ public class MultiTableBatchWriterImpl 
  
}
  
-   /**
-* CacheLoader which will look up the internal table ID for a given table 
name.
-*/
-   private class TableNameToIdLoader extends CacheLoader<String,Table.ID> {
- 
- @Override
- public Table.ID load(String tableName) throws Exception {
-   Instance instance = context.getInstance();
-   Table.ID tableId = Tables.getTableId(instance, tableName);
- 
-   if (Tables.getTableState(instance, tableId) == TableState.OFFLINE)
- throw new TableOfflineException(instance, tableId.canonicalID());
- 
-   return tableId;
- }
- 
-   }
- 
private TabletServerBatchWriter bw;
 -  private ConcurrentHashMap<String,BatchWriter> tableWriters;
 +  private ConcurrentHashMap<Table.ID,BatchWriter> tableWriters;
private final ClientContext context;
-   private final LoadingCache<String,Table.ID> nameToIdCache;
  
public MultiTableBatchWriterImpl(ClientContext context, BatchWriterConfig 
config) {
- this(context, config, DEFAULT_CACHE_TIME, DEFAULT_CACHE_TIME_UNIT);
-   }
- 
-   public MultiTableBatchWriterImpl(ClientContext context, BatchWriterConfig 
config, long cacheTime, TimeUnit cacheTimeUnit) {
  checkArgument(context != null, "context is null");
  checkArgument(config != null, "config is null");
- checkArgument(cacheTimeUnit != null, "cacheTimeUnit is null");
  this.context = context;
  this.bw = new TabletServerBatchWriter(context, config);
  tableWriters = new ConcurrentHashMap<>();
@@@ -156,9 -116,9 +116,9 @@@
 *  The name of the table which to find the ID for
 * @return The table ID, or null if the table name doesn't exist
 */
 -  private String getId(String tableName) throws TableNotFoundException {
 +  private Table.ID getId(String tableName) throws TableNotFoundException {
  try {
-   return nameToIdCache.get(tableName);
+   return Tables.getTableId(context.inst, tableName);
  } catch (UncheckedExecutionException e) {
Throwable cause = e.getCause();
  
@@@ -194,27 -140,7 +140,7 @@@
public BatchWriter getBatchWriter(String tableName) throws 
AccumuloException, AccumuloSecurityException, TableNotFoundException {
  checkArgument(tableName != null, "tableName is null");
  
- while (true) {
-   long cacheResetCount = Tables.getCacheResetCount();
- 
-   // cacheResetCount could change after this point in time, but I think 
thats ok because just want to ensure this methods sees changes
-   // made before it was called.
- 
-   long internalResetCount = cacheLastState.get();
- 
-   if (cacheResetCount > internalResetCount) {
- if (!cacheLastState.compareAndSet(internalResetCount, 
cacheResetCount)) {
-   continue; // concurrent operation, lets not possibly move 
cacheLastState backwards in the case where a thread pauses for along time
- }
- 
- nameToIdCache.invalidateAll();
- break;
-   }
- 
-   break;
- }
- 
 -String tableId = getId(tableName);
 +Table.ID tableId = getId(tableName);
  
  BatchWriter tbw = tableWriters.get(tableId);
  if (tbw == null) {
diff --cc core/src/main/java/org/apache/accumulo/core/client/impl/TableMap.java
index 000,3f3d90c..9f17fde
mode 00,100644..100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/TableMap.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TableMap.java
@@@ -1,0 -1,100 +1,101 @@@
+ /*
+  * Licensed to the Apache Software Foundation (ASF) under on

[accumulo] branch master updated (19f819d -> 0cb58c5)

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git.


from 19f819d  Merge branch '1.8'
 add 5adeb4b  ACCUMULO-4778 Cache table name to id map (#364)
 add d6d8a7d  Merge branch '1.7' into 1.8
 new 0cb58c5  Merge branch '1.8'

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../client/impl/MultiTableBatchWriterImpl.java |  76 +
 .../apache/accumulo/core/client/impl/TableMap.java | 101 
 .../apache/accumulo/core/client/impl/Tables.java   | 174 -
 .../server/util/VerifyTabletAssignments.java   |   2 +-
 .../org/apache/accumulo/master/tableOps/Utils.java |   2 +-
 .../accumulo/test/MultiTableBatchWriterIT.java | 119 +-
 6 files changed, 173 insertions(+), 301 deletions(-)
 create mode 100644 
core/src/main/java/org/apache/accumulo/core/client/impl/TableMap.java

-- 
To stop receiving notification emails like this one, please contact
mmil...@apache.org.

[accumulo] 01/01: Merge branch '1.7' into 1.8

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch 1.8
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit d6d8a7dbad07f5b17e572eb79d9daa9ad7ece4fa
Merge: a3b8930 5adeb4b
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Tue Jan 30 16:24:53 2018 -0500

Merge branch '1.7' into 1.8

 .../client/impl/MultiTableBatchWriterImpl.java |  79 +
 .../apache/accumulo/core/client/impl/TableMap.java | 100 +
 .../apache/accumulo/core/client/impl/Tables.java   | 123 ++---
 .../accumulo/test/MultiTableBatchWriterIT.java | 119 +---
 4 files changed, 162 insertions(+), 259 deletions(-)

diff --cc 
test/src/main/java/org/apache/accumulo/test/MultiTableBatchWriterIT.java
index d33b12c,000..cb5c1b2
mode 100644,00..100644
--- a/test/src/main/java/org/apache/accumulo/test/MultiTableBatchWriterIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/MultiTableBatchWriterIT.java
@@@ -1,518 -1,0 +1,407 @@@
 +/*
 + * 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;
 +
 +import java.util.Arrays;
 +import java.util.HashMap;
 +import java.util.Map;
 +import java.util.Map.Entry;
- import java.util.concurrent.TimeUnit;
 +
 +import org.apache.accumulo.core.client.AccumuloException;
 +import org.apache.accumulo.core.client.AccumuloSecurityException;
 +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.MultiTableBatchWriter;
 +import org.apache.accumulo.core.client.MutationsRejectedException;
 +import org.apache.accumulo.core.client.Scanner;
 +import org.apache.accumulo.core.client.TableNotFoundException;
- import org.apache.accumulo.core.client.TableOfflineException;
 +import org.apache.accumulo.core.client.admin.TableOperations;
 +import org.apache.accumulo.core.client.impl.ClientContext;
 +import org.apache.accumulo.core.client.impl.Credentials;
 +import org.apache.accumulo.core.client.impl.MultiTableBatchWriterImpl;
 +import org.apache.accumulo.core.data.Key;
 +import org.apache.accumulo.core.data.Mutation;
 +import org.apache.accumulo.core.data.Range;
 +import org.apache.accumulo.core.data.Value;
 +import org.apache.accumulo.core.security.Authorizations;
 +import org.apache.accumulo.harness.AccumuloClusterHarness;
 +import org.junit.Assert;
 +import org.junit.Before;
 +import org.junit.Test;
 +
 +import com.google.common.collect.Maps;
 +
 +public class MultiTableBatchWriterIT extends AccumuloClusterHarness {
 +
 +  private Connector connector;
 +  private MultiTableBatchWriter mtbw;
 +
 +  @Override
 +  public int defaultTimeoutSeconds() {
 +return 5 * 60;
 +  }
 +
 +  @Before
 +  public void setUpArgs() throws AccumuloException, AccumuloSecurityException 
{
 +connector = getConnector();
- mtbw = getMultiTableBatchWriter(60);
++mtbw = getMultiTableBatchWriter();
 +  }
 +
-   public MultiTableBatchWriter getMultiTableBatchWriter(long 
cacheTimeoutInSeconds) {
++  public MultiTableBatchWriter getMultiTableBatchWriter() {
 +ClientContext context = new ClientContext(connector.getInstance(), new 
Credentials(getAdminPrincipal(), getAdminToken()), 
getCluster().getClientConfig());
- return new MultiTableBatchWriterImpl(context, new BatchWriterConfig(), 
cacheTimeoutInSeconds, TimeUnit.SECONDS);
++return new MultiTableBatchWriterImpl(context, new BatchWriterConfig());
 +  }
 +
 +  @Test
 +  public void testTableRenameDataValidation() throws Exception {
 +
 +try {
 +  final String[] names = getUniqueNames(2);
 +  final String table1 = names[0], table2 = names[1];
 +
 +  TableOperations tops = connector.tableOperations();
 +  tops.create(table1);
 +
 +  BatchWriter bw1 = mtbw.getBatchWriter(table1);
 +
 +  Mutation m1 = new Mutation("foo");
 +  m1.put("col1", "", "val1");
 +
 +  bw1.addMutation(m1);
 +
 +  tops.rename(table1, table2);
 +  tops.create(table1);
 +
 +  BatchWriter bw2 = mtbw.getBatchWriter

[accumulo] branch 1.8 updated (a3b8930 -> d6d8a7d)

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a change to branch 1.8
in repository https://gitbox.apache.org/repos/asf/accumulo.git.


from a3b8930  Merge branch '1.7' into 1.8
 add 5adeb4b  ACCUMULO-4778 Cache table name to id map (#364)
 new d6d8a7d  Merge branch '1.7' into 1.8

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../client/impl/MultiTableBatchWriterImpl.java |  79 +
 .../apache/accumulo/core/client/impl/TableMap.java | 100 +
 .../apache/accumulo/core/client/impl/Tables.java   | 123 ++---
 .../accumulo/test/MultiTableBatchWriterIT.java | 119 +---
 4 files changed, 162 insertions(+), 259 deletions(-)
 create mode 100644 
core/src/main/java/org/apache/accumulo/core/client/impl/TableMap.java

-- 
To stop receiving notification emails like this one, please contact
mmil...@apache.org.

[accumulo] branch 1.7 updated: ACCUMULO-4778 Cache table name to id map (#364)

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch 1.7
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/1.7 by this push:
 new 5adeb4b  ACCUMULO-4778 Cache table name to id map (#364)
5adeb4b is described below

commit 5adeb4b7ed561a0bcea1a1def17835310831662f
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Tue Jan 30 16:21:13 2018 -0500

ACCUMULO-4778 Cache table name to id map (#364)

* Improved performance anytime tableIdMap is accessed (by the API or 
internally)
* New class TableMap is cached per instance using Guava Cache
* Added watcher on Tables ZooCache that will refresh the TableMap on any ZK 
table updates
* Removed now obsolete internal cache from MultiTableBatchWriter
---
 .../client/impl/MultiTableBatchWriterImpl.java |  79 +
 .../apache/accumulo/core/client/impl/TableMap.java | 100 +
 .../apache/accumulo/core/client/impl/Tables.java   | 123 ++---
 .../accumulo/test/MultiTableBatchWriterIT.java | 119 +---
 4 files changed, 162 insertions(+), 259 deletions(-)

diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java
 
b/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java
index f5e1fa0..e7a6d73 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java
@@ -19,37 +19,26 @@ package org.apache.accumulo.core.client.impl;
 import static com.google.common.base.Preconditions.checkArgument;
 
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicLong;
 
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.BatchWriter;
 import org.apache.accumulo.core.client.BatchWriterConfig;
-import org.apache.accumulo.core.client.Instance;
 import org.apache.accumulo.core.client.MultiTableBatchWriter;
 import org.apache.accumulo.core.client.MutationsRejectedException;
 import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.client.TableOfflineException;
 import org.apache.accumulo.core.data.Mutation;
-import org.apache.accumulo.core.master.state.tables.TableState;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
 import com.google.common.util.concurrent.UncheckedExecutionException;
 
 public class MultiTableBatchWriterImpl implements MultiTableBatchWriter {
-  public static final long DEFAULT_CACHE_TIME = 200;
-  public static final TimeUnit DEFAULT_CACHE_TIME_UNIT = TimeUnit.MILLISECONDS;
 
   private static final Logger log = 
LoggerFactory.getLogger(MultiTableBatchWriterImpl.class);
   private AtomicBoolean closed;
-  private AtomicLong cacheLastState;
 
   private class TableBatchWriter implements BatchWriter {
 
@@ -82,49 +71,17 @@ public class MultiTableBatchWriterImpl implements 
MultiTableBatchWriter {
 
   }
 
-  /**
-   * CacheLoader which will look up the internal table ID for a given table 
name.
-   */
-  private class TableNameToIdLoader extends CacheLoader<String,String> {
-
-@Override
-public String load(String tableName) throws Exception {
-  Instance instance = context.getInstance();
-  String tableId = Tables.getNameToIdMap(instance).get(tableName);
-
-  if (tableId == null)
-throw new TableNotFoundException(null, tableName, null);
-
-  if (Tables.getTableState(instance, tableId) == TableState.OFFLINE)
-throw new TableOfflineException(instance, tableId);
-
-  return tableId;
-}
-
-  }
-
   private TabletServerBatchWriter bw;
   private ConcurrentHashMap<String,BatchWriter> tableWriters;
   private final ClientContext context;
-  private final LoadingCache<String,String> nameToIdCache;
 
   public MultiTableBatchWriterImpl(ClientContext context, BatchWriterConfig 
config) {
-this(context, config, DEFAULT_CACHE_TIME, DEFAULT_CACHE_TIME_UNIT);
-  }
-
-  public MultiTableBatchWriterImpl(ClientContext context, BatchWriterConfig 
config, long cacheTime, TimeUnit cacheTimeUnit) {
 checkArgument(context != null, "context is null");
 checkArgument(config != null, "config is null");
-checkArgument(cacheTimeUnit != null, "cacheTimeUnit is null");
 this.context = context;
 this.bw = new TabletServerBatchWriter(context, config);
 tableWriters = new ConcurrentHashMap<>();
 this

[accumulo] branch master updated (e05c475 -> f6c1662)

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git.


from e05c475  Merge branch '1.8'
 add 3a9efa0  ACCUMULO-4587 Upgrade Monitor jquery to 3.2.1
 add a13a6ad  Merge branch '1.7' into 1.8
 new f6c1662  Merge branch '1.8'

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo] 01/01: Merge branch '1.8'

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit f6c16626ebb3724824ca5be65b0d0ac5b0e60173
Merge: e05c475 a13a6ad
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Fri Jan 19 15:22:08 2018 -0500

Merge branch '1.8'


-- 
To stop receiving notification emails like this one, please contact
"commits@accumulo.apache.org" <commits@accumulo.apache.org>.

[accumulo] branch 1.8 updated (62f8883 -> a13a6ad)

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a change to branch 1.8
in repository https://gitbox.apache.org/repos/asf/accumulo.git.


from 62f8883  Merge branch '1.7' into 1.8
 add 3a9efa0  ACCUMULO-4587 Upgrade Monitor jquery to 3.2.1
 new a13a6ad  Merge branch '1.7' into 1.8

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../monitor/src/main/resources/web/flot/jquery.js  | 14887 +++
 1 file changed, 8412 insertions(+), 6475 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo] 01/01: Merge branch '1.7' into 1.8

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch 1.8
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit a13a6adc3ce97317645edf7233c72478b3bd9823
Merge: 62f8883 3a9efa0
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Fri Jan 19 15:02:16 2018 -0500

Merge branch '1.7' into 1.8

 .../monitor/src/main/resources/web/flot/jquery.js  | 14887 +++
 1 file changed, 8412 insertions(+), 6475 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
"commits@accumulo.apache.org" <commits@accumulo.apache.org>.

[accumulo] branch master updated (28b53e0 -> e05c475)

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git.


from 28b53e0  ACCUMULO-4611 Remove commons-config from API
 add da10af8  ACCUMULO-4741 Remove minified files in Monitor
 add 62f8883  Merge branch '1.7' into 1.8
 new e05c475  Merge branch '1.8'

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo] 01/01: Merge branch '1.8'

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit e05c475b5d1d7ca970398435fa597096a730ff83
Merge: 28b53e0 62f8883
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Fri Jan 19 13:55:24 2018 -0500

Merge branch '1.8'


-- 
To stop receiving notification emails like this one, please contact
"commits@accumulo.apache.org" <commits@accumulo.apache.org>.

[accumulo] branch 1.8 updated (9ac92c7 -> 62f8883)

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a change to branch 1.8
in repository https://gitbox.apache.org/repos/asf/accumulo.git.


from 9ac92c7  ACCUMULO-4611 Deprecate public API with commons config
 add da10af8  ACCUMULO-4741 Remove minified files in Monitor
 new 62f8883  Merge branch '1.7' into 1.8

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../accumulo/monitor/servlets/BasicServlet.java|  2 +-
 .../src/main/resources/web/flot/excanvas.min.js|  1 -
 .../resources/web/flot/jquery.colorhelpers.min.js  |  1 -
 .../web/flot/jquery.flot.crosshair.min.js  |  1 -
 .../web/flot/jquery.flot.fillbetween.min.js|  1 -
 .../resources/web/flot/jquery.flot.image.min.js|  1 -
 .../src/main/resources/web/flot/jquery.flot.min.js |  6 --
 .../resources/web/flot/jquery.flot.navigate.min.js |  1 -
 .../main/resources/web/flot/jquery.flot.pie.min.js |  1 -
 .../resources/web/flot/jquery.flot.resize.min.js   |  1 -
 .../web/flot/jquery.flot.selection.min.js  |  1 -
 .../resources/web/flot/jquery.flot.stack.min.js|  1 -
 .../resources/web/flot/jquery.flot.symbol.min.js   |  1 -
 .../web/flot/jquery.flot.threshold.min.js  |  1 -
 .../src/main/resources/web/flot/jquery.min.js  | 23 --
 15 files changed, 1 insertion(+), 42 deletions(-)
 delete mode 100644 server/monitor/src/main/resources/web/flot/excanvas.min.js
 delete mode 100644 
server/monitor/src/main/resources/web/flot/jquery.colorhelpers.min.js
 delete mode 100644 
server/monitor/src/main/resources/web/flot/jquery.flot.crosshair.min.js
 delete mode 100644 
server/monitor/src/main/resources/web/flot/jquery.flot.fillbetween.min.js
 delete mode 100644 
server/monitor/src/main/resources/web/flot/jquery.flot.image.min.js
 delete mode 100644 
server/monitor/src/main/resources/web/flot/jquery.flot.min.js
 delete mode 100644 
server/monitor/src/main/resources/web/flot/jquery.flot.navigate.min.js
 delete mode 100644 
server/monitor/src/main/resources/web/flot/jquery.flot.pie.min.js
 delete mode 100644 
server/monitor/src/main/resources/web/flot/jquery.flot.resize.min.js
 delete mode 100644 
server/monitor/src/main/resources/web/flot/jquery.flot.selection.min.js
 delete mode 100644 
server/monitor/src/main/resources/web/flot/jquery.flot.stack.min.js
 delete mode 100644 
server/monitor/src/main/resources/web/flot/jquery.flot.symbol.min.js
 delete mode 100644 
server/monitor/src/main/resources/web/flot/jquery.flot.threshold.min.js
 delete mode 100644 server/monitor/src/main/resources/web/flot/jquery.min.js

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo] 01/01: Merge branch '1.7' into 1.8

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch 1.8
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 62f88836cb97ebcf4edcbd6ce01633ef4107b887
Merge: 9ac92c7 da10af8
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Fri Jan 19 13:29:58 2018 -0500

Merge branch '1.7' into 1.8

 .../accumulo/monitor/servlets/BasicServlet.java|  2 +-
 .../src/main/resources/web/flot/excanvas.min.js|  1 -
 .../resources/web/flot/jquery.colorhelpers.min.js  |  1 -
 .../web/flot/jquery.flot.crosshair.min.js  |  1 -
 .../web/flot/jquery.flot.fillbetween.min.js|  1 -
 .../resources/web/flot/jquery.flot.image.min.js|  1 -
 .../src/main/resources/web/flot/jquery.flot.min.js |  6 --
 .../resources/web/flot/jquery.flot.navigate.min.js |  1 -
 .../main/resources/web/flot/jquery.flot.pie.min.js |  1 -
 .../resources/web/flot/jquery.flot.resize.min.js   |  1 -
 .../web/flot/jquery.flot.selection.min.js  |  1 -
 .../resources/web/flot/jquery.flot.stack.min.js|  1 -
 .../resources/web/flot/jquery.flot.symbol.min.js   |  1 -
 .../web/flot/jquery.flot.threshold.min.js  |  1 -
 .../src/main/resources/web/flot/jquery.min.js  | 23 --
 15 files changed, 1 insertion(+), 42 deletions(-)


-- 
To stop receiving notification emails like this one, please contact
"commits@accumulo.apache.org" <commits@accumulo.apache.org>.

[accumulo] branch 1.7 updated: ACCUMULO-4741 Remove minified files in Monitor

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch 1.7
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/1.7 by this push:
 new da10af8  ACCUMULO-4741 Remove minified files in Monitor
da10af8 is described below

commit da10af8d0c9da5e40b61a17976b29f826a818c27
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Fri Jan 19 13:11:10 2018 -0500

ACCUMULO-4741 Remove minified files in Monitor
---
 .../accumulo/monitor/servlets/BasicServlet.java|  2 +-
 .../src/main/resources/web/flot/excanvas.min.js|  1 -
 .../resources/web/flot/jquery.colorhelpers.min.js  |  1 -
 .../web/flot/jquery.flot.crosshair.min.js  |  1 -
 .../web/flot/jquery.flot.fillbetween.min.js|  1 -
 .../resources/web/flot/jquery.flot.image.min.js|  1 -
 .../src/main/resources/web/flot/jquery.flot.min.js |  6 --
 .../resources/web/flot/jquery.flot.navigate.min.js |  1 -
 .../main/resources/web/flot/jquery.flot.pie.min.js |  1 -
 .../resources/web/flot/jquery.flot.resize.min.js   |  1 -
 .../web/flot/jquery.flot.selection.min.js  |  1 -
 .../resources/web/flot/jquery.flot.stack.min.js|  1 -
 .../resources/web/flot/jquery.flot.symbol.min.js   |  1 -
 .../web/flot/jquery.flot.threshold.min.js  |  1 -
 .../src/main/resources/web/flot/jquery.min.js  | 23 --
 15 files changed, 1 insertion(+), 42 deletions(-)

diff --git 
a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
 
b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
index 8168ce7..e517b44 100644
--- 
a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
+++ 
b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
@@ -137,7 +137,7 @@ abstract public class BasicServlet extends HttpServlet {
 sb.append("\n");
 sb.append("\n");
 
-sb.append("\n");
+sb.append("\n");
 sb.append("\n");
 sb.append("\n");
 
diff --git a/server/monitor/src/main/resources/web/flot/excanvas.min.js 
b/server/monitor/src/main/resources/web/flot/excanvas.min.js
deleted file mode 100644
index 988f934..000
--- a/server/monitor/src/main/resources/web/flot/excanvas.min.js
+++ /dev/null
@@ -1 +0,0 @@
-if(!document.createElement("canvas").getContext){(function(){var z=Math;var 
K=z.round;var J=z.sin;var U=z.cos;var b=z.abs;var k=z.sqrt;var D=10;var 
F=D/2;function T(){return this.context_||(this.context_=new W(this))}var 
O=Array.prototype.slice;function G(i,j,m){var Z=O.call(arguments,2);return 
function(){return i.apply(j,Z.concat(O.call(arguments)))}}function AD(Z){return 
String(Z).replace(/&/g,"").replace(/"/g,"")}function 
r(i){if(!i.namespaces.g_vml_){i.namespaces.add("g_vm [...]
diff --git 
a/server/monitor/src/main/resources/web/flot/jquery.colorhelpers.min.js 
b/server/monitor/src/main/resources/web/flot/jquery.colorhelpers.min.js
deleted file mode 100644
index 7082b11..000
--- a/server/monitor/src/main/resources/web/flot/jquery.colorhelpers.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(b){b.color={};b.color.make=function(f,e,c,d){var 
h={};h.r=f||0;h.g=e||0;h.b=c||0;h.a=d!=null?d:1;h.add=function(k,j){for(var 
g=0;g<k.length;++g){h[k.charAt(g)]+=j}return 
h.normalize()};h.scale=function(k,j){for(var 
g=0;g<k.length;++g){h[k.charAt(g)]*=j}return 
h.normalize()};h.toString=function(){if(h.a>=1){return"rgb("+[h.r,h.g,h.b].join(",")+")"}else{return"rgba("+[h.r,h.g,h.b,h.a].join(",")+")"}};h.normalize=function(){function
 g(j,k,i){return k<j?j:(k>i?i:k)}h.r=g(0,parseInt [...]
diff --git 
a/server/monitor/src/main/resources/web/flot/jquery.flot.crosshair.min.js 
b/server/monitor/src/main/resources/web/flot/jquery.flot.crosshair.min.js
deleted file mode 100644
index bdd6da4..000
--- a/server/monitor/src/main/resources/web/flot/jquery.flot.crosshair.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(b){var a={crosshair:{mode:null,color:"rgba(170, 0, 0, 
0.80)",lineWidth:1}};function c(h){var 
j={x:-1,y:-1,locked:false};h.setCrosshair=function e(l){if(!l){j.x=-1}else{var 
k=h.p2c(l);j.x=Math.max(0,Math.min(k.left,h.width()));j.y=Math.max(0,Math.min(k.top,h.height()))}h.triggerRedrawOverlay()};h.clearCrosshair=h.setCrosshair;h.lockCrosshair=function
 f(k){if(k){h.setCrosshair(k)}j.locked=true};h.unlockCrosshair=function 
g(){j.locked=false};function d(k){if(j.locked){return}if(j. [...]
diff --git 
a/server/monitor/src/main/resources/web/flot/jquery.flot.fillbetween.min.js 
b/server/monitor/src/main/resources/web/flot/jquery.flot.fillbetween.min.js
deleted file mode 100644
index 6ebcdcc..000
--- a/server/monitor/src/main/resources/web/flot/jquery.flot.fillbetween.min.js
+++ /de

[accumulo] branch master updated: ACCUMULO-4771 Fix datatables paging in Monitor

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
 new c134e65  ACCUMULO-4771 Fix datatables paging in Monitor
c134e65 is described below

commit c134e65542b0557baa0ad36e0e5a6fbb4b97d8a3
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Thu Jan 18 17:13:32 2018 -0500

ACCUMULO-4771 Fix datatables paging in Monitor
---
 .../main/resources/org/apache/accumulo/monitor/resources/js/server.js   | 2 +-
 .../main/resources/org/apache/accumulo/monitor/resources/js/tservers.js | 2 +-
 .../src/main/resources/org/apache/accumulo/monitor/templates/log.ftl| 2 +-
 .../src/main/resources/org/apache/accumulo/monitor/templates/tables.ftl | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/server.js
 
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/server.js
index bc58b52..474a271 100644
--- 
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/server.js
+++ 
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/server.js
@@ -194,5 +194,5 @@ function refreshCurrentTable() {
  * Generates the server results table
  */
 function refreshResultsTable() {
-  tabletResults.ajax.reload();
+  tabletResults.ajax.reload(null, false ); // user paging is not reset on 
reload
 }
\ No newline at end of file
diff --git 
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/tservers.js
 
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/tservers.js
index 247f3cf..817db9f 100644
--- 
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/tservers.js
+++ 
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/tservers.js
@@ -167,5 +167,5 @@ function clearDeadTServers(server) {
  * Generates the tserver table
  */
 function refreshTServersTable() {
-  if(tserversList) tserversList.ajax.reload();
+  if(tserversList) tserversList.ajax.reload(null, false ); // user paging is 
not reset on reload
 }
diff --git 
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/log.ftl
 
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/log.ftl
index 19b355b..4645d0b 100644
--- 
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/log.ftl
+++ 
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/log.ftl
@@ -54,7 +54,7 @@
  * Used to refresh the table
  */
 function refresh() {
-  logList.ajax.reload();
+  logList.ajax.reload(null, false ); // user paging is not reset on 
reload
 }
   
   ${title}
diff --git 
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/tables.ftl
 
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/tables.ftl
index 8d3a9a2..3cd45db 100644
--- 
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/tables.ftl
+++ 
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/tables.ftl
@@ -73,7 +73,7 @@
 refreshMaster();
   
 
-  tableList.ajax.reload();
+  tableList.ajax.reload(null, false ); // user paging is not reset on 
reload
 }
   
   ${tablesTitle}

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo] branch master updated: ACCUMULO-4786 Fix XML and JSON links in Monitor

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
 new 93a4f0f  ACCUMULO-4786 Fix XML and JSON links in Monitor
93a4f0f is described below

commit 93a4f0fb5741a9c8686e0e74155d9e39ddb297dd
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Thu Jan 18 13:22:53 2018 -0500

ACCUMULO-4786 Fix XML and JSON links in Monitor
---
 ...XMLInformation.java => SummaryInformation.java} | 12 +--
 .../apache/accumulo/monitor/rest/XMLResource.java  | 25 --
 .../apache/accumulo/monitor/templates/navbar.ftl   |  4 ++--
 3 files changed, 27 insertions(+), 14 deletions(-)

diff --git 
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/XMLInformation.java
 
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/SummaryInformation.java
similarity index 91%
rename from 
server/monitor/src/main/java/org/apache/accumulo/monitor/rest/XMLInformation.java
rename to 
server/monitor/src/main/java/org/apache/accumulo/monitor/rest/SummaryInformation.java
index 0eeb388..cfffbb4 100644
--- 
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/XMLInformation.java
+++ 
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/SummaryInformation.java
@@ -31,13 +31,13 @@ import 
org.apache.accumulo.monitor.rest.tservers.TabletServer;
 
 /**
  *
- * Generate XML summary of Monitor
+ * Generate summary of Monitor
  *
  * @since 2.0.0
  *
  */
 @XmlRootElement(name = "stats")
-public class XMLInformation {
+public class SummaryInformation {
 
   // Variable names become JSON keys
   public List servers = new ArrayList<>();
@@ -55,10 +55,10 @@ public class XMLInformation {
 
   public Totals totals;
 
-  public XMLInformation() {}
+  public SummaryInformation() {}
 
   /**
-   * Stores Monitor information as XML
+   * Stores Monitor information as XML or JSON
*
* @param size
*  Number of tservers
@@ -67,7 +67,7 @@ public class XMLInformation {
* @param tablesList
*  Table list
*/
-  public XMLInformation(int size, MasterInformation info, TableInformationList 
tablesList) {
+  public SummaryInformation(int size, MasterInformation info, 
TableInformationList tablesList) {
 this.servers = new ArrayList<>(size);
 
 this.masterGoalState = info.masterGoalState;
@@ -85,7 +85,7 @@ public class XMLInformation {
   }
 
   /**
-   * Adds a new tablet to the XML
+   * Adds a new tablet
*
* @param tablet
*  Tablet to add
diff --git 
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/XMLResource.java
 
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/XMLResource.java
index 67c6363..72d9ff9 100644
--- 
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/XMLResource.java
+++ 
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/XMLResource.java
@@ -32,7 +32,7 @@ import org.apache.accumulo.monitor.rest.tservers.TabletServer;
 
 /**
  *
- * Responsible for generating an XML summary of the Monitor
+ * Responsible for generating a JSON and XML summary of the Monitor
  *
  * @since 2.0.0
  *
@@ -42,12 +42,11 @@ import 
org.apache.accumulo.monitor.rest.tservers.TabletServer;
 public class XMLResource {
 
   /**
-   * Generates an XML summary of the Monitor
+   * Generates summary of the Monitor
*
-   * @return XML summary
+   * @return SummaryInformation object
*/
-  @GET
-  public XMLInformation getXMLInformation() {
+  public SummaryInformation getInformation() {
 
 MasterMonitorInfo mmi = Monitor.getMmi();
 if (null == mmi) {
@@ -55,7 +54,7 @@ public class XMLResource {
 }
 
 // Add Monitor information
-XMLInformation xml = new XMLInformation(mmi.tServerInfo.size(), 
MasterResource.getTables(), TablesResource.getTables());
+SummaryInformation xml = new SummaryInformation(mmi.tServerInfo.size(), 
MasterResource.getTables(), TablesResource.getTables());
 
 // Add tserver information
 for (TabletServerStatus status : mmi.tServerInfo) {
@@ -64,4 +63,18 @@ public class XMLResource {
 
 return xml;
   }
+
+  @GET
+  @Path("xml")
+  @Produces(MediaType.APPLICATION_XML)
+  public SummaryInformation getXMLInformation() {
+return getInformation();
+  }
+
+  @GET
+  @Path("json")
+  @Produces(MediaType.APPLICATION_JSON)
+  public SummaryInformation getJSONInformation() {
+return getInformation();
+  }
 }
diff --git 
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/navbar.ftl
 
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/navbar.ftl
index 1710152..2fa6ed7 100644
--- 
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/navbar.ftl
+++ 
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/template

[accumulo] branch master updated: Drop Exceptions not thrown in Monitor

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
 new f95d3fd  Drop Exceptions not thrown in Monitor
f95d3fd is described below

commit f95d3fda92d466be4b7b18087c75391307b25388
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Thu Jan 18 13:24:35 2018 -0500

Drop Exceptions not thrown in Monitor
---
 .../accumulo/monitor/rest/tservers/TabletServerResource.java  | 2 +-
 .../src/main/java/org/apache/accumulo/monitor/view/WebViews.java  | 8 +++-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git 
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerResource.java
 
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerResource.java
index 46eb315..b45e378 100644
--- 
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerResource.java
+++ 
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerResource.java
@@ -105,7 +105,7 @@ public class TabletServerResource {
*/
   @POST
   @Consumes(MediaType.TEXT_PLAIN)
-  public void clearDeadServer(@QueryParam("server") @NotNull @Pattern(regexp = 
SERVER_REGEX) String server) throws Exception {
+  public void clearDeadServer(@QueryParam("server") @NotNull @Pattern(regexp = 
SERVER_REGEX) String server) {
 DeadServerList obit = new 
DeadServerList(ZooUtil.getRoot(Monitor.getContext().getInstance()) + 
Constants.ZDEADTSERVERS);
 obit.delete(server);
   }
diff --git 
a/server/monitor/src/main/java/org/apache/accumulo/monitor/view/WebViews.java 
b/server/monitor/src/main/java/org/apache/accumulo/monitor/view/WebViews.java
index c0d1260..1c6ecb6 100644
--- 
a/server/monitor/src/main/java/org/apache/accumulo/monitor/view/WebViews.java
+++ 
b/server/monitor/src/main/java/org/apache/accumulo/monitor/view/WebViews.java
@@ -25,7 +25,6 @@ import static org.apache.commons.lang.StringUtils.isEmpty;
 import static org.apache.commons.lang.StringUtils.isNotBlank;
 
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -265,7 +264,7 @@ public class WebViews {
   @GET
   @Path("tables")
   @Template(name = "/default.ftl")
-  public Map<String,Object> getTables() throws TableNotFoundException {
+  public Map<String,Object> getTables() {
 
 Map<String,Object> model = getModel();
 model.put("title", "Table Status"); // Need this for the browser tab title
@@ -285,8 +284,7 @@ public class WebViews {
   @GET
   @Path("tables/{tableID}")
   @Template(name = "/default.ftl")
-  public Map<String,Object> getTables(@PathParam("tableID") @NotNull 
@Pattern(regexp = ALPHA_NUM_REGEX_TABLE_ID) String tableID) throws 
TableNotFoundException,
-  UnsupportedEncodingException {
+  public Map<String,Object> getTables(@PathParam("tableID") @NotNull 
@Pattern(regexp = ALPHA_NUM_REGEX_TABLE_ID) String tableID) throws 
TableNotFoundException {
 
 String tableName = Tables.getTableName(Monitor.getContext().getInstance(), 
Table.ID.of(tableID));
 
@@ -357,7 +355,7 @@ public class WebViews {
   @GET
   @Path("trace/show")
   @Template(name = "/default.ftl")
-  public Map<String,Object> getTraceShow(@QueryParam("id") @NotNull 
@Pattern(regexp = ALPHA_NUM_REGEX) String id) throws Exception {
+  public Map<String,Object> getTraceShow(@QueryParam("id") @NotNull 
@Pattern(regexp = ALPHA_NUM_REGEX) String id) {
 
 Map<String,Object> model = getModel();
 model.put("title", "Trace ID " + id);

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo] branch master updated: ACCUMULO-4785 Cleanup html to pass W3C validation

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
 new 3b0846d  ACCUMULO-4785 Cleanup html to pass W3C validation
3b0846d is described below

commit 3b0846d6519df9a766386a265ce387e4cb5e15a8
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Wed Jan 17 18:09:28 2018 -0500

ACCUMULO-4785 Cleanup html to pass W3C validation
---
 .../resources/org/apache/accumulo/monitor/templates/default.ftl  | 9 +++--
 .../main/resources/org/apache/accumulo/monitor/templates/log.ftl | 2 +-
 .../resources/org/apache/accumulo/monitor/templates/navbar.ftl   | 2 +-
 .../resources/org/apache/accumulo/monitor/templates/show.ftl | 2 +-
 .../resources/org/apache/accumulo/monitor/templates/tables.ftl   | 4 ++--
 .../main/resources/org/apache/accumulo/monitor/templates/vis.ftl | 6 ++
 6 files changed, 10 insertions(+), 15 deletions(-)

diff --git 
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/default.ftl
 
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/default.ftl
index 0d6f622..8c60a39 100644
--- 
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/default.ftl
+++ 
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/default.ftl
@@ -18,9 +18,7 @@
 
   
 ${title} - Accumulo ${version}
-
-
-
+
 
 
 <#if externalResources?has_content>
@@ -32,7 +30,6 @@
   
   
   
-  
   
   
   
@@ -43,8 +40,8 @@
 
 
 
-
-
+
+
 
 
 
diff --git 
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/log.ftl
 
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/log.ftl
index 2a4a60e..19b355b 100644
--- 
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/log.ftl
+++ 
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/log.ftl
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
- <script type="text/javascript">
+ <script>
   var logList;
 /**
  * Creates DataTables table
diff --git 
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/navbar.ftl
 
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/navbar.ftl
index 7909007..1710152 100644
--- 
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/navbar.ftl
+++ 
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/navbar.ftl
@@ -23,7 +23,7 @@
 <span class="icon-bar"></span>
 <span class="icon-bar"></span>
   </button>
-  <img id="accumulo-avatar" class="navbar-left pull-left" 
src="/resources/images/accumulo-avatar.png" />
+  <img id="accumulo-avatar" alt="accumulo" class="navbar-left 
pull-left" src="/resources/images/accumulo-avatar.png" />
   <a class="navbar-brand" id="headertitle" 
href="/">${instance_name}</a>
 </div>
 <!-- Nav links -->
diff --git 
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/show.ftl
 
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/show.ftl
index 86fc772..575cd8a 100644
--- 
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/show.ftl
+++ 
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/show.ftl
@@ -19,7 +19,7 @@
 table.indent { position: relative; left: 10% }
 td.left { text-align: left }
   </style>
-  <script type="text/javascript">
+  <script>
 /**
  * Creates trace id initial table, passes id from template
  */
diff --git 
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/tables.ftl
 
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/tables.ftl
index 5af9ecf..8d3a9a2 100644
--- 
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/tables.ftl
+++ 
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/tables.ftl
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-  <script type="text/javascript">
+  <script>
   var tableList;
 /**
  * Creates DataTables table
@@ -84,7 +84,7 @@
 <th>State</th>
 <th title="Tables are broken down into ranges of rows called 
tablets." cl

[accumulo] branch master updated: ACCUMULO-4760 Fix NPE in Monitor replication rest

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
 new 208cfea  ACCUMULO-4760 Fix NPE in Monitor replication rest
208cfea is described below

commit 208cfeaf57e910683cd0215ea2f5487a98dab22b
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Thu Jan 4 17:13:54 2018 -0500

ACCUMULO-4760 Fix NPE in Monitor replication rest
---
 .../apache/accumulo/monitor/rest/replication/ReplicationResource.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/replication/ReplicationResource.java
 
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/replication/ReplicationResource.java
index 1c37d0a..f256ebb 100644
--- 
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/replication/ReplicationResource.java
+++ 
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/replication/ReplicationResource.java
@@ -111,7 +111,7 @@ public class ReplicationResource {
 // Number of files per target we have to replicate
 Map<ReplicationTarget,Long> targetCounts = new HashMap<>();
 
-Map<String,Table.ID> tableNameToId = Tables.getNameToIdMap(null);
+Map<String,Table.ID> tableNameToId = 
Tables.getNameToIdMap(conn.getInstance());
 Map<Table.ID,String> tableIdToName = invert(tableNameToId);
 
 for (String table : tops.list()) {

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo] branch master updated: ACCUMULO-4764 Move html to server.ftl

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
 new dae1d29  ACCUMULO-4764 Move html to server.ftl
dae1d29 is described below

commit dae1d29062938d4f04a6e8eddf6f31286471f35f
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Wed Dec 20 12:41:29 2017 -0500

ACCUMULO-4764 Move html to server.ftl
---
 .../apache/accumulo/monitor/resources/js/server.js | 130 +
 .../apache/accumulo/monitor/templates/server.ftl   |  51 ++--
 2 files changed, 43 insertions(+), 138 deletions(-)

diff --git 
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/server.js
 
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/server.js
index cd82a54..7c57704 100644
--- 
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/server.js
+++ 
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/server.js
@@ -281,132 +281,4 @@ function sortTable(table, n) {
   sessionStorage.tableColumnSort = n;
 
   sortTables(tableIDs[table], direction, n);
-}
-
-/**
- * Creates the server detail header
- *
- * @param {string} server Server name
- */
-function createDetailHeader(server) {
-  var caption = [];
-  serv = server;
-
-  caption.push('Details');
-  caption.push('' + server + '');
-
-  $('', {
-html: caption.join('')
-  }).appendTo('#tServerDetail');
-
-  var items = [];
-
-  var columns = ['HostedTablets', 'Entries',
-  'MinorCompacting', 'MajorCompacting',
-  'Splitting'];
-
-  for (i = 0; i < columns.length; i++) {
-var first = i == 0 ? true : false;
-items.push(createHeaderCell(first, 'sortTable(0,' + i + ')',
-  '', columns[i]));
-  }
-
-  $('', {
-html: items.join('')
-  }).appendTo('#tServerDetail');
-}
-
-/**
- * Creates the server history header
- */
-function createHistoryHeader() {
-  var caption = [];
-
-  caption.push('All-TimeTablet' +
-  'OperationResults');
-
-  $('', {
-html: caption.join('')
-  }).appendTo('#opHistoryDetails');
-
-  var items = [];
-
-  var columns = ['Operation', 'Success', 'Failure',
-  'AverageQueueTime',
-  'Std.Dev.QueueTime',
-  'AverageTime', 'Std.Dev.Time',
-  'PercentageTimeSpent'];
-
-  for (i = 0; i < columns.length; i++) {
-var first = i == 0 ? true : false;
-items.push(createHeaderCell(first, 'sortTable(1,' + i + ')',
-  '', columns[i]));
-  }
-
-  $('', {
-html: items.join('')
-  }).appendTo('#opHistoryDetails');
-}
-
-/**
- * Creates the current server header
- */
-function createCurrentHeader() {
-  var caption = [];
-
-  caption.push('CurrentTablet' +
-  'OperationResults');
-
-  $('', {
-html: caption.join('')
-  }).appendTo('#currentTabletOps');
-
-  var items = [];
-
-  var columns = ['MinorAverage', 'MinorStdDev',
-  'MajorAvg', 'MajorStdDev'];
-
-  for (i = 0; i < columns.length; i++) {
-var first = i == 0 ? true : false;
-items.push(createHeaderCell(first, 'sortTable(2,' + i + ')',
-  '', columns[i]));
-  }
-
-  $('', {
-html: items.join('')
-  }).appendTo('#currentTabletOps');
-}
-
-/**
- * Creates the server result header
- */
-function createResultsHeader() {
-  var caption = [];
-
-  caption.push('DetailedCurrent' +
-  'Operations');
-  caption.push('Per-tablet' +
-  'Details');
-
-  $('', {
-html: caption.join('')
-  }).appendTo('#perTabletResults');
-
-  var items = [];
-
-  var columns = ['Table', 'Tablet', 'Entries',
-  'Ingest', 'Query', 'MinorAvg',
-  'MinorStdDev', 'MinorAvge/s',
-  'MajorAvg', 'MajorStdDev',
-  'MajorAvge/s'];
-
-  for (i = 0; i < columns.length; i++) {
-var first = i == 0 ? true : false;
-items.push(createHeaderCell(first, 'sortTable(3,' + i + ')',
-  '', columns[i]));
-  }
-
-  $('', {
-html: items.join('')
-  }).appendTo('#perTabletResults');
-}
+}
\ No newline at end of file
diff --git 
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/server.ftl
 
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/server.ftl
index 3066dd1..297c61a 100644
--- 
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/server.ftl
+++ 
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/server.ftl
@@ -19,31 +19,64 @@
  * Creates server initial tables, passes values from template
  */
 $(document).ready(function() {
-  createDetailHeader('${server}');
-  createHistoryHeader();
-  createCurrentHeader();
-  createResultsHeader();
-  refreshServer('${server}');
+  serv = '${server}';
+  refreshServer();
 });
   
   ${title}
   
 
-
+Details'${server}'
+
+HostedTablets
+ 

[accumulo] branch master updated: ACCUMULO-4766 Fix Monitor table stats

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
 new 37c08d8  ACCUMULO-4766 Fix Monitor table stats
37c08d8 is described below

commit 37c08d8e674a73174656f87e82d1b590ff771bcf
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Tue Dec 19 16:12:09 2017 -0500

ACCUMULO-4766 Fix Monitor table stats
---
 .../org/apache/accumulo/monitor/rest/tables/TablesResource.java  | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git 
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesResource.java
 
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesResource.java
index 479b7f7..d0dae38 100644
--- 
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesResource.java
+++ 
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesResource.java
@@ -109,12 +109,12 @@ public class TablesResource {
* @return Table list
*/
   private static TablesList generateTables(TablesList tableNamespace) {
-Instance inst = Monitor.getContext().getInstance();
-SortedMap<String,TableInfo> tableStats = new TreeMap<>();
+SortedMap<Table.ID,TableInfo> tableStats = new TreeMap<>();
 
 if (Monitor.getMmi() != null && Monitor.getMmi().tableMap != null)
   for (Entry<String,TableInfo> te : Monitor.getMmi().tableMap.entrySet())
-tableStats.put(Tables.getPrintableTableInfoFromId(inst, 
Table.ID.of(te.getKey())), te.getValue());
+tableStats.put(Table.ID.of(te.getKey()), te.getValue());
+
 Map<String,Double> compactingByTable = 
TableInfoUtil.summarizeTableStats(Monitor.getMmi());
 TableManager tableManager = TableManager.getInstance();
 List tables = new ArrayList<>();
@@ -123,7 +123,8 @@ public class TablesResource {
 for (Entry<String,Table.ID> entry : 
Tables.getNameToIdMap(HdfsZooInstance.getInstance()).entrySet()) {
   String tableName = entry.getKey();
   Table.ID tableId = entry.getValue();
-  TableInfo tableInfo = tableStats.get(tableName);
+  TableInfo tableInfo = tableStats.get(tableId);
+
   if (null != tableInfo) {
 Double holdTime = compactingByTable.get(tableId.canonicalID());
 if (holdTime == null)

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo] branch master updated: ACCUMULO-4764 Move html from js to templates (#342)

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
 new dd5d5e9  ACCUMULO-4764 Move html from js to templates (#342)
dd5d5e9 is described below

commit dd5d5e91bac2576435ac05a04595fe947610706c
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Tue Dec 19 12:36:01 2017 -0500

ACCUMULO-4764 Move html from js to templates (#342)
---
 .../accumulo/monitor/resources/js/bulkImport.js| 68 -
 .../accumulo/monitor/resources/js/functions.js | 19 +-
 .../org/apache/accumulo/monitor/resources/js/gc.js | 34 ---
 .../apache/accumulo/monitor/resources/js/global.js | 71 --
 .../accumulo/monitor/resources/js/listType.js  | 38 
 .../apache/accumulo/monitor/resources/js/master.js | 56 -
 .../accumulo/monitor/resources/js/overview.js  | 47 --
 .../accumulo/monitor/resources/js/problems.js  | 63 +--
 .../accumulo/monitor/resources/js/replication.js   | 31 --
 .../apache/accumulo/monitor/resources/js/scans.js  | 30 -
 .../apache/accumulo/monitor/resources/js/show.js   | 30 -
 .../accumulo/monitor/resources/js/summary.js   | 34 ---
 .../apache/accumulo/monitor/resources/js/table.js  | 44 --
 .../apache/accumulo/monitor/resources/js/tables.js | 31 --
 .../accumulo/monitor/resources/js/tservers.js  | 42 -
 .../accumulo/monitor/templates/bulkImport.ftl  | 14 -
 .../org/apache/accumulo/monitor/templates/gc.ftl   | 17 --
 .../apache/accumulo/monitor/templates/listType.ftl | 10 ++-
 .../apache/accumulo/monitor/templates/master.ftl   | 24 ++--
 .../apache/accumulo/monitor/templates/overview.ftl | 26 +++-
 .../apache/accumulo/monitor/templates/problems.ftl | 22 +--
 .../accumulo/monitor/templates/replication.ftl |  9 ++-
 .../apache/accumulo/monitor/templates/scans.ftl|  7 ++-
 .../org/apache/accumulo/monitor/templates/show.ftl |  8 ++-
 .../apache/accumulo/monitor/templates/summary.ftl  | 12 +++-
 .../apache/accumulo/monitor/templates/table.ftl| 23 +--
 .../apache/accumulo/monitor/templates/tables.ftl   | 17 +-
 .../apache/accumulo/monitor/templates/tservers.ftl | 19 +-
 28 files changed, 178 insertions(+), 668 deletions(-)

diff --git 
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/bulkImport.js
 
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/bulkImport.js
index eb8e021..2f271fc 100644
--- 
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/bulkImport.js
+++ 
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/bulkImport.js
@@ -19,8 +19,6 @@
  * Creates bulk import initial table
  */
 $(document).ready(function() {
-  createBulkImportHeader();
-  createServerBulkHeader();
   refreshBulkImport();
 
   // Create tooltip for table column information
@@ -137,69 +135,3 @@ function sortTable(table, n) {
   sessionStorage.tableColumnSort = n;
   sortTables(tableIDs[table], direction, n);
 }
-
-/**
- * Creates the bulk import header
- */
-function createBulkImportHeader() {
-  var caption = 'BulkImport' +
-  'Status';
-
-  $('', {
-html: caption
-  }).appendTo('#masterBulkImportStatus');
-
-  var items = [];
-
-  var columns = ['Directory', 'Age', 'State'];
-
-  var titles = ['', descriptions['Import Age'], descriptions['Import State']];
-
-  /*
-   * Adds the columns, add sortTable function on click,
-   * if the column has a description, add title taken from the global.js
-   */
-  for (i = 0; i < columns.length; i++) {
-var first = i == 0 ? true : false;
-items.push(createHeaderCell(first, 'sortTable(1,' + i + ')',
-titles[i], columns[i]));
-  }
-
-  $('', {
-html: items.join('')
-  }).appendTo('#masterBulkImportStatus');
-}
-
-/**
- * Creates the bulk import header
- */
-function createServerBulkHeader() {
-  var caption = [];
-
-  caption.push('TabletServerBulk' +
-  'ImportStatus');
-
-  $('', {
-html: caption.join('')
-  }).appendTo('#bulkImportStatus');
-
-  var items = [];
-
-  var columns = ['Server', '#', 'OldestAge'];
-
-  var titles = ['', descriptions['# Imports'], descriptions['Oldest Age']];
-
-  /*
-   * Adds the columns, add sortTable function on click,
-   * if the column has a description, add title taken from the global.js
-   */
-  for (i = 0; i < columns.length; i++) {
-var first = i == 0 ? true : false;
-items.push(createHeaderCell(first, 'sortTable(0,' + i + ')',
-titles[i], columns[i]));
-  }
-
-  $('', {
-html: items.join('')
-  }).appendTo('#bulkImportStatus');
-}
diff --git 
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/functions.js
 
b/server/monitor/src/main/r

[accumulo] branch master updated: ACCUMULO-4756 Fix path param in TablesResource

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
 new 7a55000  ACCUMULO-4756 Fix path param in TablesResource
7a55000 is described below

commit 7a5500010efdeb2573b3c1d742caae8327349b55
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Thu Dec 14 18:03:28 2017 -0500

ACCUMULO-4756 Fix path param in TablesResource
---
 .../java/org/apache/accumulo/monitor/rest/tables/TablesResource.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesResource.java
 
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesResource.java
index 41d3825..19c9ac4 100644
--- 
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesResource.java
+++ 
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesResource.java
@@ -16,7 +16,7 @@
  */
 package org.apache.accumulo.monitor.rest.tables;
 
-import static 
org.apache.accumulo.monitor.util.ParameterValidator.ALPHA_NUM_REGEX;
+import static 
org.apache.accumulo.monitor.util.ParameterValidator.ALPHA_NUM_REGEX_TABLE_ID;
 import static 
org.apache.accumulo.monitor.util.ParameterValidator.NAMESPACE_LIST_REGEX;
 import static 
org.apache.accumulo.monitor.util.ParameterValidator.NAMESPACE_REGEX;
 
@@ -213,7 +213,7 @@ public class TablesResource {
*/
   @Path("{tableId}")
   @GET
-  public TabletServers getParticipatingTabletServers(@PathParam("tableId") 
@NotNull @Pattern(regexp = ALPHA_NUM_REGEX) String tableIdStr) throws Exception 
{
+  public TabletServers getParticipatingTabletServers(@PathParam("tableId") 
@NotNull @Pattern(regexp = ALPHA_NUM_REGEX_TABLE_ID) String tableIdStr) throws 
Exception {
 Instance instance = Monitor.getContext().getInstance();
 Table.ID tableId = Table.ID.of(tableIdStr);
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo-website] branch asf-site updated: Jekyll build from master:3f05ee3

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/accumulo-website.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new ea37477  Jekyll build from master:3f05ee3
ea37477 is described below

commit ea37477376846e89df67836ccb5b99782a4ad15d
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Tue Dec 12 11:13:04 2017 -0500

Jekyll build from master:3f05ee3

Added Benjamin Fach as contributor (#50)
---
 feed.xml  | 4 ++--
 people/index.html | 5 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/feed.xml b/feed.xml
index e95efd2..78cbf0d 100644
--- a/feed.xml
+++ b/feed.xml
@@ -6,8 +6,8 @@
 
 https://accumulo.apache.org/
 https://accumulo.apache.org/feed.xml; rel="self" 
type="application/rss+xml"/>
-Fri, 08 Dec 2017 17:46:55 -0500
-Fri, 08 Dec 2017 17:46:55 -0500
+Tue, 12 Dec 2017 11:12:54 -0500
+Tue, 12 Dec 2017 11:12:54 -0500
 Jekyll v3.5.2
 
 
diff --git a/people/index.html b/people/index.html
index e55f52a..118f3d1 100644
--- a/people/index.html
+++ b/people/index.html
@@ -385,6 +385,11 @@
    
 
 
+  Benjamin Fach
+   
+   
+
+
   Ben Manes
    
   http://www.timeanddate.com/time/zones/pt;>PT

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo-website] branch master updated: Added Benjamin Fach as contributor (#50)

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo-website.git


The following commit(s) were added to refs/heads/master by this push:
 new 3f05ee3  Added Benjamin Fach as contributor (#50)
3f05ee3 is described below

commit 3f05ee30e1a89b1c7fb19411548d96c256db085a
Author: Benjamin F <32075798+bfac...@users.noreply.github.com>
AuthorDate: Tue Dec 12 11:06:51 2017 -0500

Added Benjamin Fach as contributor (#50)
---
 pages/people.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pages/people.md b/pages/people.md
index b6c0e74..6aaa454 100644
--- a/pages/people.md
+++ b/pages/people.md
@@ -53,6 +53,7 @@ GitHub also has a [contributor list][github-contributors] 
based on commits.
 | Alex Moundalexis| [Cloudera][CLOUDERA]   
   | [ET][ET]  |
 | Andrew George Wells | [ClearEdgeIT][CLEAREDGE]   
   | [ET][ET]  |
 | Arshak Navruzyan| [Argyle Data][ARGYLE]  
   |   |
+| Benjamin Fach   |
   |   |
 | Ben Manes   |
   | [PT][PT]  |
 | Bob Thorman | [ATT][ATT]
   |   |
 | Charles Williams| [Tiber Technologies][TIBER]
   | [ET][ET]  |

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo] branch master updated: ACCUMULO-4756 Allow default tables validate REST (#331)

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
 new 2f9c72c  ACCUMULO-4756 Allow default tables validate REST (#331)
2f9c72c is described below

commit 2f9c72ceb40e9f1df5fc98a01873848a34aa2066
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Wed Dec 6 16:47:13 2017 -0500

ACCUMULO-4756 Allow default tables validate REST (#331)
---
 .../main/java/org/apache/accumulo/monitor/util/ParameterValidator.java | 2 ++
 .../src/main/java/org/apache/accumulo/monitor/view/WebViews.java   | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git 
a/server/monitor/src/main/java/org/apache/accumulo/monitor/util/ParameterValidator.java
 
b/server/monitor/src/main/java/org/apache/accumulo/monitor/util/ParameterValidator.java
index a736a29..aec0826 100644
--- 
a/server/monitor/src/main/java/org/apache/accumulo/monitor/util/ParameterValidator.java
+++ 
b/server/monitor/src/main/java/org/apache/accumulo/monitor/util/ParameterValidator.java
@@ -22,6 +22,8 @@ package org.apache.accumulo.monitor.util;
 public interface ParameterValidator {
 
   String ALPHA_NUM_REGEX = "\\w+";
+  // Allow the special default table IDs
+  String ALPHA_NUM_REGEX_TABLE_ID = "[!+]?\\w+";
   String ALPHA_NUM_REGEX_BLANK_OK = "\\w*";
 
   String RESOURCE_REGEX = "(\\w|:)+";
diff --git 
a/server/monitor/src/main/java/org/apache/accumulo/monitor/view/WebViews.java 
b/server/monitor/src/main/java/org/apache/accumulo/monitor/view/WebViews.java
index 9e26a48..e242575 100644
--- 
a/server/monitor/src/main/java/org/apache/accumulo/monitor/view/WebViews.java
+++ 
b/server/monitor/src/main/java/org/apache/accumulo/monitor/view/WebViews.java
@@ -18,6 +18,7 @@ package org.apache.accumulo.monitor.view;
 
 import static 
org.apache.accumulo.monitor.util.ParameterValidator.ALPHA_NUM_REGEX;
 import static 
org.apache.accumulo.monitor.util.ParameterValidator.ALPHA_NUM_REGEX_BLANK_OK;
+import static 
org.apache.accumulo.monitor.util.ParameterValidator.ALPHA_NUM_REGEX_TABLE_ID;
 import static 
org.apache.accumulo.monitor.util.ParameterValidator.SERVER_REGEX_BLANK_OK;
 import static org.apache.commons.lang.StringUtils.isBlank;
 import static org.apache.commons.lang.StringUtils.isEmpty;
@@ -289,7 +290,7 @@ public class WebViews {
   @GET
   @Path("tables/{tableID}")
   @Template(name = "/default.ftl")
-  public Map<String,Object> getTables(@PathParam("tableID") @NotNull 
@Pattern(regexp = ALPHA_NUM_REGEX) String tableID) throws 
TableNotFoundException,
+  public Map<String,Object> getTables(@PathParam("tableID") @NotNull 
@Pattern(regexp = ALPHA_NUM_REGEX_TABLE_ID) String tableID) throws 
TableNotFoundException,
   UnsupportedEncodingException {
 
 String tableName = Tables.getTableName(Monitor.getContext().getInstance(), 
Table.ID.of(tableID));

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo] branch master updated: ACCUMULO-4743 Fix formatting

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
 new 49a8c62  ACCUMULO-4743 Fix formatting
49a8c62 is described below

commit 49a8c62c9e09bd04ad60ef46e7e19ca85f94c9dd
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Mon Dec 4 16:12:16 2017 -0500

ACCUMULO-4743 Fix formatting
---
 .../apache/accumulo/core/file/blockfile/cache/BlockCacheManager.java  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git 
a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/BlockCacheManager.java
 
b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/BlockCacheManager.java
index 4c75c4d..1449887 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/BlockCacheManager.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/BlockCacheManager.java
@@ -55,9 +55,7 @@ public abstract class BlockCacheManager {
  *
  * 
  * Returns all Accumulo properties that have a prefix of {@code 
tserver.cache.config...} or {@code 
tserver.cache.config..default.}
- * with
- * values for
- * specific cache types overriding defaults.
+ * with values for specific cache types overriding defaults.
  *
  * 
  * For example assume the following data is in Accumulo's system config.

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo] branch master updated: ACCUMULO-4745 Fix broken links in monitor from Table.ID change (#326)

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
 new e189bfd  ACCUMULO-4745 Fix broken links in monitor from Table.ID 
change (#326)
e189bfd is described below

commit e189bfd30ed94831a9698aa4c0dbeda95f178fde
Author: Benjamin F <32075798+bfac...@users.noreply.github.com>
AuthorDate: Mon Dec 4 15:43:02 2017 -0500

ACCUMULO-4745 Fix broken links in monitor from Table.ID change (#326)
---
 .../accumulo/monitor/rest/problems/ProblemDetailInformation.java  | 8 
 .../accumulo/monitor/rest/problems/ProblemSummaryInformation.java | 8 
 .../org/apache/accumulo/monitor/rest/tables/TableInformation.java | 6 +++---
 .../apache/accumulo/monitor/rest/tservers/CurrentOperations.java  | 8 
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git 
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemDetailInformation.java
 
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemDetailInformation.java
index d32ccf5..b38862b 100644
--- 
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemDetailInformation.java
+++ 
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemDetailInformation.java
@@ -29,7 +29,7 @@ public class ProblemDetailInformation {
 
   // Variable names become JSON keys
   public String tableName;
-  public Table.ID tableID;
+  public String tableID;
   public String type;
   public String server;
 
@@ -44,7 +44,7 @@ public class ProblemDetailInformation {
*
* @param tableName
*  Table name of the problem
-   * @param tableID
+   * @param tableId
*  Table ID of the problem
* @param type
*  Type of problem
@@ -57,9 +57,9 @@ public class ProblemDetailInformation {
* @param exception
*  Exception of the problem
*/
-  public ProblemDetailInformation(String tableName, Table.ID tableID, String 
type, String server, Long time, String resource, String exception) {
+  public ProblemDetailInformation(String tableName, Table.ID tableId, String 
type, String server, Long time, String resource, String exception) {
 this.tableName = tableName;
-this.tableID = tableID;
+this.tableID = tableId.canonicalID();
 this.type = type;
 this.server = server;
 this.time = time;
diff --git 
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemSummaryInformation.java
 
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemSummaryInformation.java
index 78fdbad..165bf86 100644
--- 
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemSummaryInformation.java
+++ 
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemSummaryInformation.java
@@ -29,7 +29,7 @@ public class ProblemSummaryInformation {
 
   // Variable names become JSON keys
   public String tableName;
-  public Table.ID tableID;
+  public String tableID;
 
   public Integer fileRead;
   public Integer fileWrite;
@@ -42,7 +42,7 @@ public class ProblemSummaryInformation {
*
* @param tableName
*  Name of the table with a problem
-   * @param tableID
+   * @param tableId
*  ID of the table with a problem
* @param fileRead
*  Number of files read
@@ -51,9 +51,9 @@ public class ProblemSummaryInformation {
* @param tableLoad
*  Number of table loads
*/
-  public ProblemSummaryInformation(String tableName, Table.ID tableID, Integer 
fileRead, Integer fileWrite, Integer tableLoad) {
+  public ProblemSummaryInformation(String tableName, Table.ID tableId, Integer 
fileRead, Integer fileWrite, Integer tableLoad) {
 this.tableName = tableName;
-this.tableID = tableID;
+this.tableID = tableId.canonicalID();
 this.fileRead = fileRead;
 this.fileWrite = fileWrite;
 this.tableLoad = tableLoad;
diff --git 
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TableInformation.java
 
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TableInformation.java
index d151046..cacd342 100644
--- 
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TableInformation.java
+++ 
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TableInformation.java
@@ -30,7 +30,7 @@ public class TableInformation {
 
   // Variable names become JSON keys
   public String tablename;
-  public Table.ID tableId;
+  public String tableId;
   public String tableState;
 
   public int tablets;
@@ -75,7 +75,7 @@ public class TableInformation {
*/
   public TableInformation(String tableName, Table.ID tableId, String 
tableState) {
 this.tablename = tableName;
-this.tableId = tableId;
+this.tableId = tableId.canon

[accumulo] branch master updated: ACCUMULO-4677 Sanitize PathParam values in Monitor (#289)

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
 new 61242a7  ACCUMULO-4677 Sanitize PathParam values in Monitor (#289)
61242a7 is described below

commit 61242a780a7512339616fa165e5d7a61564479bf
Author: Kyle <gli...@users.noreply.github.com>
AuthorDate: Mon Dec 4 14:58:44 2017 -0500

ACCUMULO-4677 Sanitize PathParam values in Monitor (#289)
---
 assemble/pom.xml   |  28 
 assemble/src/main/assemblies/component.xml |   7 +
 pom.xml|  49 +++
 server/monitor/pom.xml |   4 +
 .../java/org/apache/accumulo/monitor/Monitor.java  |   6 +-
 .../monitor/rest/problems/ProblemsResource.java|  15 +-
 .../monitor/rest/tables/TablesResource.java|  30 +++-
 .../monitor/rest/trace/TracesResource.java |  26 ++--
 .../rest/tservers/TabletServerResource.java|  25 ++--
 .../accumulo/monitor/util/ParameterValidator.java  |  34 +
 .../org/apache/accumulo/monitor/view/WebViews.java |  57 +---
 .../monitor/util/ParameterValidatorTest.java   |  68 +
 test/pom.xml   |  66 +
 .../apache/accumulo/test/monitor/WebViewsIT.java   | 157 +
 14 files changed, 514 insertions(+), 58 deletions(-)

diff --git a/assemble/pom.xml b/assemble/pom.xml
index 2cf4d7a..4167de3 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -33,6 +33,10 @@
   true
 
 
+  com.fasterxml
+  classmate
+
+
   com.fasterxml.jackson.core
   jackson-annotations
 
@@ -80,6 +84,10 @@
   javax.annotation-api
 
 
+  javax.el
+  javax.el-api
+
+
   javax.servlet
   javax.servlet-api
   true
@@ -285,6 +293,10 @@
 
 
   org.glassfish.jersey.ext
+  jersey-bean-validation
+
+
+  org.glassfish.jersey.ext
   jersey-entity-filtering
 
 
@@ -304,10 +316,26 @@
   jersey-media-json-jackson
 
 
+  org.glassfish.web
+  el-impl
+
+
+  org.glassfish.web
+  javax.el
+
+
+  org.hibernate
+  hibernate-validator
+
+
   org.javassist
   javassist
 
 
+  org.jboss.logging
+  jboss-logging
+
+
   org.slf4j
   slf4j-api
   true
diff --git a/assemble/src/main/assemblies/component.xml 
b/assemble/src/main/assemblies/component.xml
index 470b5f7..405b7b3 100644
--- a/assemble/src/main/assemblies/component.xml
+++ b/assemble/src/main/assemblies/component.xml
@@ -52,6 +52,7 @@
 org.slf4j:slf4j-api
 org.slf4j:slf4j-log4j12
 
+com.fasterxml:classmate
 com.fasterxml.jackson.core:jackson-annotations
 com.fasterxml.jackson.core:jackson-core
 com.fasterxml.jackson.core:jackson-databind
@@ -59,6 +60,7 @@
 
com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider
 
com.fasterxml.jackson.module:jackson-module-jaxb-annotations
 javax.annotation:javax.annotation-api
+javax.el:javax.el-api
 javax.validation:validation-api
 javax.ws.rs:javax.ws.rs-api
 org.freemarker:freemarker
@@ -75,12 +77,17 @@
 org.glassfish.jersey.core:jersey-client
 org.glassfish.jersey.core:jersey-common
 org.glassfish.jersey.core:jersey-server
+org.glassfish.jersey.ext:jersey-bean-validation
 org.glassfish.jersey.ext:jersey-entity-filtering
 org.glassfish.jersey.ext:jersey-mvc-freemarker
 org.glassfish.jersey.ext:jersey-mvc
 org.glassfish.jersey.media:jersey-media-jaxb
 org.glassfish.jersey.media:jersey-media-json-jackson
+org.glassfish.web:javax.el
+org.glassfish.web:el-impl
+org.hibernate:hibernate-validator
 org.javassist:javassist
+org.jboss.logging:jboss-logging
 log4j:log4j
   
 
diff --git a/pom.xml b/pom.xml
index 49ce9d8..4cce012 100644
--- a/pom.xml
+++ b/pom.xml
@@ -133,6 +133,7 @@
 4.3.1
 false
 2.9.0
+2.2.4
 2.25.1
 9.3.21.v20170918
 1.8
@@ -163,6 +164,11 @@
 1.72
   
   
+com.fasterxml
+classmate
+1.0.0
+  
+  
 com.fasterxml.jackson.core
 jackson-annotations
 ${jackson.version}
@@ -260,6 +266,11 @@
 1.2
   
   
+javax.el
+javax.el-api
+${javax.el.version}
+  
+  
 javax.servlet
 javax.servlet-api
 ${servlet.api.version}
@@ -635,6 +646,11 @@
   
   
 org.glassfish.jersey.ext
+jersey-bean-validation
+${jersey.version}
+  
+  
+org.glassfish.jersey.ext
 jersey-entity-filtering
 ${jersey.v

[accumulo] 01/01: Merge branch '1.8'

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 41dcabb14772b192f32b1fa67f770378c4ea068f
Merge: 03139a3 d4722bf
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Thu Nov 30 14:18:48 2017 -0500

Merge branch '1.8'

 Conflicts:

server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java

 .../accumulo/server/tables/TableManager.java   | 20 ++-
 .../IllegalTableTransitionExceptionTest.java   | 68 ++
 2 files changed, 87 insertions(+), 1 deletion(-)

diff --cc 
server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java
index cfc5c90,0777f3f..74c4f62
--- 
a/server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java
@@@ -125,9 -142,14 +138,14 @@@ public class TableManager 
return newState;
  }
  
+ @Override
+ public String getMessage() {
+   return message;
+ }
+ 
}
  
 -  public synchronized void transitionTableState(final String tableId, final 
TableState newState) {
 +  public synchronized void transitionTableState(final Table.ID tableId, final 
TableState newState) {
  String statePath = ZooUtil.getRoot(HdfsZooInstance.getInstance()) + 
Constants.ZTABLES + "/" + tableId + Constants.ZTABLE_STATE;
  
  try {
@@@ -162,8 -184,8 +180,8 @@@
  }
});
  } catch (Exception e) {
-   // ACCUMULO-3651 Changed level to error and added FATAL to message for 
slf4j compability
+   // ACCUMULO-3651 Changed level to error and added FATAL to message for 
slf4j compatibility
 -  log.error("FATAL Failed to transition table to state " + newState);
 +  log.error("FATAL Failed to transition table to state {}", newState);
throw new RuntimeException(e);
  }
}

-- 
To stop receiving notification emails like this one, please contact
"commits@accumulo.apache.org" <commits@accumulo.apache.org>.

[accumulo] branch master updated (03139a3 -> 41dcabb)

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git.


from 03139a3  ACCUMULO-4740 Enable GCM mode for crypto
 add e738351  ACCUMULO-4546 Create default log message for table error 
(#327)
 add 238e471  ACCUMULO-4546 Fix StringUtils import
 add d4722bf  Merge branch '1.7' into 1.8
 new 41dcabb  Merge branch '1.8'

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../accumulo/server/tables/TableManager.java   | 20 ++-
 .../IllegalTableTransitionExceptionTest.java   | 68 ++
 2 files changed, 87 insertions(+), 1 deletion(-)
 create mode 100644 
server/base/src/test/java/org/apache/accumulo/server/tables/IllegalTableTransitionExceptionTest.java

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo] branch 1.7 updated: ACCUMULO-4546 Fix StringUtils import

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch 1.7
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/1.7 by this push:
 new 238e471  ACCUMULO-4546 Fix StringUtils import
238e471 is described below

commit 238e47116b16d7ea391860644a43f0dd44e75413
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Thu Nov 30 13:54:42 2017 -0500

ACCUMULO-4546 Fix StringUtils import
---
 .../src/main/java/org/apache/accumulo/server/tables/TableManager.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java 
b/server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java
index cb207ec..0777f3f 100644
--- 
a/server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java
@@ -41,7 +41,7 @@ import org.apache.accumulo.server.client.HdfsZooInstance;
 import org.apache.accumulo.server.util.TablePropUtil;
 import org.apache.accumulo.server.zookeeper.ZooCache;
 import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.WatchedEvent;
 import org.apache.zookeeper.Watcher;

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo] branch 1.8 updated (029c743 -> d4722bf)

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a change to branch 1.8
in repository https://gitbox.apache.org/repos/asf/accumulo.git.


from 029c743  Merge branch '1.7' into 1.8
 add e738351  ACCUMULO-4546 Create default log message for table error 
(#327)
 add 238e471  ACCUMULO-4546 Fix StringUtils import
 new d4722bf  Merge branch '1.7' into 1.8

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../accumulo/server/tables/TableManager.java   | 20 ++-
 .../IllegalTableTransitionExceptionTest.java   | 68 ++
 2 files changed, 87 insertions(+), 1 deletion(-)
 create mode 100644 
server/base/src/test/java/org/apache/accumulo/server/tables/IllegalTableTransitionExceptionTest.java

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo] 01/01: Merge branch '1.7' into 1.8

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch 1.8
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit d4722bf1b45df2b5521ad494275a36127c9394f3
Merge: 029c743 238e471
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Thu Nov 30 13:55:38 2017 -0500

Merge branch '1.7' into 1.8

 .../accumulo/server/tables/TableManager.java   | 20 ++-
 .../IllegalTableTransitionExceptionTest.java   | 68 ++
 2 files changed, 87 insertions(+), 1 deletion(-)

-- 
To stop receiving notification emails like this one, please contact
"commits@accumulo.apache.org" <commits@accumulo.apache.org>.

[accumulo] branch 1.7 updated: ACCUMULO-4546 Create default log message for table error (#327)

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch 1.7
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/1.7 by this push:
 new e738351  ACCUMULO-4546 Create default log message for table error 
(#327)
e738351 is described below

commit e738351fcdf2359997814c2cf105875702799265
Author: Mark Owens <jmark...@gmail.com>
AuthorDate: Thu Nov 30 13:11:21 2017 -0500

ACCUMULO-4546 Create default log message for table error (#327)
---
 .../accumulo/server/tables/TableManager.java   | 20 ++-
 .../IllegalTableTransitionExceptionTest.java   | 68 ++
 2 files changed, 87 insertions(+), 1 deletion(-)

diff --git 
a/server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java 
b/server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java
index 0b23061..cb207ec 100644
--- 
a/server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java
@@ -41,6 +41,7 @@ import org.apache.accumulo.server.client.HdfsZooInstance;
 import org.apache.accumulo.server.util.TablePropUtil;
 import org.apache.accumulo.server.zookeeper.ZooCache;
 import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.WatchedEvent;
 import org.apache.zookeeper.Watcher;
@@ -115,10 +116,22 @@ public class TableManager {
 
 final TableState oldState;
 final TableState newState;
+final String message;
 
 public IllegalTableTransitionException(TableState oldState, TableState 
newState) {
+  this(oldState, newState, "");
+}
+
+public IllegalTableTransitionException(TableState oldState, TableState 
newState, String message) {
   this.oldState = oldState;
   this.newState = newState;
+
+  if (StringUtils.isNotEmpty(message))
+this.message = message;
+  else {
+String defaultMessage = "Error transitioning from " + oldState + " 
state to " + newState + " state";
+this.message = defaultMessage;
+  }
 }
 
 public TableState getOldState() {
@@ -129,6 +142,11 @@ public class TableManager {
   return newState;
 }
 
+@Override
+public String getMessage() {
+  return message;
+}
+
   }
 
   public synchronized void transitionTableState(final String tableId, final 
TableState newState) {
@@ -166,7 +184,7 @@ public class TableManager {
 }
   });
 } catch (Exception e) {
-  // ACCUMULO-3651 Changed level to error and added FATAL to message for 
slf4j compability
+  // ACCUMULO-3651 Changed level to error and added FATAL to message for 
slf4j compatibility
   log.error("FATAL Failed to transition table to state " + newState);
   throw new RuntimeException(e);
 }
diff --git 
a/server/base/src/test/java/org/apache/accumulo/server/tables/IllegalTableTransitionExceptionTest.java
 
b/server/base/src/test/java/org/apache/accumulo/server/tables/IllegalTableTransitionExceptionTest.java
new file mode 100644
index 000..d867ead
--- /dev/null
+++ 
b/server/base/src/test/java/org/apache/accumulo/server/tables/IllegalTableTransitionExceptionTest.java
@@ -0,0 +1,68 @@
+/*
+ * 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.server.tables;
+
+import static org.junit.Assert.assertEquals;
+
+import org.apache.accumulo.core.master.state.tables.TableState;
+import 
org.apache.accumulo.server.tables.TableManager.IllegalTableTransitionException;
+import org.junit.Test;
+
+public class IllegalTableTransitionExceptionTest {
+
+  final TableState oldState = TableState.ONLINE;
+  final TableState newState = TableState.OFFLINE;
+  final String defaultMsg = "Error transitioning from " + oldState + " state 
to " + newState + " state";
+
+  @Test
+  public void testIllegalTableTransitionExceptionMessage() {
+String userMessage = null;
+try {
+  userMessage = &

[accumulo-website] branch tour-website updated: Correct typo on range-splits page (#42)

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch tour-website
in repository https://gitbox.apache.org/repos/asf/accumulo-website.git


The following commit(s) were added to refs/heads/tour-website by this push:
 new e8add8d  Correct typo on range-splits page (#42)
e8add8d is described below

commit e8add8dc21f5b83b99fc886b20044082655e8268
Author: Mark Owens <jmark...@gmail.com>
AuthorDate: Wed Nov 29 10:58:48 2017 -0500

Correct typo on range-splits page (#42)
---
 tour/ranges-splits.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tour/ranges-splits.md b/tour/ranges-splits.md
index 327d703..3f3bb41 100644
--- a/tour/ranges-splits.md
+++ b/tour/ranges-splits.md
@@ -16,7 +16,7 @@ scanner.setRange(new Range("id", "id0010"));  // returns 
rows from id to
 
 As your data grows larger, Accumulo will split tables into smaller pieces 
called Tablets.  Tablets can then be distributed across multiple Tablet 
Servers.  
 By default a table will get split into Tablets on row boundaries, guaranteeing 
an entire row to be on one Tablet Server.  We have the ability to 
-tell Accumulo were to split tables by setting split points. This is done using 
_addSplits_ in the [TableOperations] API.  The image below 
+tell Accumulo where to split tables by setting split points. This is done 
using _addSplits_ in the [TableOperations] API.  The image below 
 demonstrates how Accumulo splits data.  
 
 ![data distribution]({{ site.url }}/images/docs/data_distribution.png)
@@ -33,4 +33,4 @@ Knowing these terms are critical when working closely with 
Accumulo.  Iterators
 When working with large amounts of data across many Tablet Servers, a simple 
Scanner might not do the trick. Next lesson we learn about the power of 
 the multi-threaded BatchScanner!  
 
-[TableOperations]: 
https://accumulo.apache.org/1.8/apidocs/org/apache/accumulo/core/client/admin/TableOperations.html
\ No newline at end of file
+[TableOperations]: 
https://accumulo.apache.org/1.8/apidocs/org/apache/accumulo/core/client/admin/TableOperations.html

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo] branch pr-289 deleted (was 8b30740)

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a change to branch pr-289
in repository https://gitbox.apache.org/repos/asf/accumulo.git.


 was 8b30740  ACCUMULO-4677 Fix dependency issues in test pom

This change permanently discards the following revisions:

 discard 8b30740  ACCUMULO-4677 Fix dependency issues in test pom

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo] branch master updated: ACCUMULO-4739 Fix variable names and formatting

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
 new 9d806c8  ACCUMULO-4739 Fix variable names and formatting
9d806c8 is described below

commit 9d806c86f1efbe2445ef7283351d8490805ce674
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Tue Nov 28 11:42:58 2017 -0500

ACCUMULO-4739 Fix variable names and formatting
---
 .../java/org/apache/accumulo/monitor/view/WebViews.java| 14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git 
a/server/monitor/src/main/java/org/apache/accumulo/monitor/view/WebViews.java 
b/server/monitor/src/main/java/org/apache/accumulo/monitor/view/WebViews.java
index 6033ce0..750ea8c 100644
--- 
a/server/monitor/src/main/java/org/apache/accumulo/monitor/view/WebViews.java
+++ 
b/server/monitor/src/main/java/org/apache/accumulo/monitor/view/WebViews.java
@@ -16,6 +16,8 @@
  */
 package org.apache.accumulo.monitor.view;
 
+import static org.apache.commons.lang.StringUtils.isEmpty;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,7 +40,6 @@ import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.util.AddressUtil;
 import org.apache.accumulo.monitor.Monitor;
-import org.apache.commons.lang.StringUtils;
 import org.glassfish.jersey.server.mvc.Template;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -59,19 +60,20 @@ public class WebViews {
   private static final Logger log = LoggerFactory.getLogger(WebViews.class);
 
   /**
-   * Get HTML for CSS and JS imports from configuration. See ACCUMULO-4739
+   * Get HTML for external CSS and JS resources from configuration. See 
ACCUMULO-4739
*
-   * @param model map of the MVC model
+   * @param model
+   *  map of the MVC model
*/
   private void addExternalResources(Map<String,Object> model) {
 AccumuloConfiguration conf = Monitor.getContext().getConfiguration();
-String imports = conf.get(Property.MONITOR_RESOURCES_EXTERNAL);
-if (StringUtils.isEmpty(imports))
+String resourcesProperty = conf.get(Property.MONITOR_RESOURCES_EXTERNAL);
+if (isEmpty(resourcesProperty))
   return;
 List monitorResources = new ArrayList<>();
 ObjectMapper objectMapper = new ObjectMapper();
 try {
-  for (String monitorResource : objectMapper.readValue(imports, 
String[].class)) {
+  for (String monitorResource : objectMapper.readValue(resourcesProperty, 
String[].class)) {
 monitorResources.add(monitorResource);
   }
 } catch (IOException e) {

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo-website] branch tour-website updated: ACCUMULO-4734 Create a few exercises for the tour

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch tour-website
in repository https://gitbox.apache.org/repos/asf/accumulo-website.git


The following commit(s) were added to refs/heads/tour-website by this push:
 new e7c6958  ACCUMULO-4734 Create a few exercises for the tour
e7c6958 is described below

commit e7c69584b3c50a930ecef805ebcd24d3fa4e147a
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Tue Nov 28 15:25:03 2017 -0500

ACCUMULO-4734 Create a few exercises for the tour
---
 _data/tour.yml  |  6 +
 tour/authorizations-code.md | 64 +
 tour/authorizations.md  | 46 
 tour/basic-read-write.md| 52 ++--
 tour/batch-scanner-code.md  | 42 +
 tour/batch-scanner.md   | 35 +
 tour/data-model-code.md | 58 
 tour/data-model.md  | 28 
 tour/getting-started.md | 29 +++-
 tour/index.md   | 11 
 tour/ranges-splits.md   | 36 +
 11 files changed, 398 insertions(+), 9 deletions(-)

diff --git a/_data/tour.yml b/_data/tour.yml
index d84b5bb..c7de9ed 100644
--- a/_data/tour.yml
+++ b/_data/tour.yml
@@ -1,6 +1,12 @@
 docs:
  - getting-started
  - basic-read-write
+ - data-model
+ - data-model-code
+ - authorizations
+ - authorizations-code
+ - ranges-splits
  - batch-scanner
+ - batch-scanner-code
  - conditional-writer
  - using-iterators
diff --git a/tour/authorizations-code.md b/tour/authorizations-code.md
new file mode 100644
index 000..04ea47b
--- /dev/null
+++ b/tour/authorizations-code.md
@@ -0,0 +1,64 @@
+---
+title: Authorizations Code
+---
+```java
+// start writing your code here
+// Connect to Mini Accumulo as the root user and create a table called 
"GothamPD".
+Connector conn = mac.getConnector("root", "tourguide");
+conn.tableOperations().create("GothamPD");
+
+// Create a "secretIdentity" authorization & visibility
+final String secId = "secretIdentity";
+Authorizations auths = new Authorizations(secId);
+ColumnVisibility visibility = new ColumnVisibility(secId);
+
+// Create a user with the "secretIdentity" authorization and grant him 
read permissions on our table
+conn.securityOperations().createLocalUser("commissioner", new 
PasswordToken("gordanrocks"));
+conn.securityOperations().changeUserAuthorizations("commissioner", 
auths);
+conn.securityOperations().grantTablePermission("commissioner", 
"GothamPD", TablePermission.READ);
+
+// Create 3 Mutation objects, securing the proper columns.
+Mutation mutation1 = new Mutation("id0001");
+mutation1.put("hero","alias", "Batman");
+mutation1.put("hero","name", visibility, "Bruce Wayne");
+mutation1.put("hero","wearsCape?", "true");
+Mutation mutation2 = new Mutation("id0002");
+mutation2.put("hero","alias", "Robin");
+mutation2.put("hero","name", visibility,"Dick Grayson");
+mutation2.put("hero","wearsCape?", "true");
+Mutation mutation3 = new Mutation("id0003");
+mutation3.put("villain","alias", "Joker");
+mutation3.put("villain","name", "Unknown");
+mutation3.put("villain","wearsCape?", "false");
+
+// Create a BatchWriter to the GothamPD table and add your mutations 
to it.
+// Once the BatchWriter is closed by the try w/ resources, data will 
be available to scans.
+try(BatchWriter writer = conn.createBatchWriter("GothamPD", new 
BatchWriterConfig())) {
+writer.addMutation(mutation1);
+writer.addMutation(mutation2);
+writer.addMutation(mutation3);
+}
+
+// Read and print all rows of the commissioner can see. Pass Scanner 
proper authorizations
+Connector commishConn = mac.getConnector("commissioner", 
"gordanrocks");
+try(Scanner scan = commishConn.createScanner("GothamPD", auths)) {
+System.out.println("Gotham Police Department Persons of 
Interest:");
+for (Map.Entry<Key, Value> entry : scan) {
+System.out.printf("Key : %-60s  Value : %s\n", entry.getKey(), 
entry.getValue());
+}
+}
+```
+
+The code above will print (timesta

[accumulo-website] branch tour updated: ACCUMULO-4734 Add required imports

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch tour
in repository https://gitbox.apache.org/repos/asf/accumulo-website.git


The following commit(s) were added to refs/heads/tour by this push:
 new fd616fd  ACCUMULO-4734 Add required imports
fd616fd is described below

commit fd616fdb0d358692af20da5f3fdd81e1307abf31
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Mon Nov 6 13:09:47 2017 -0500

ACCUMULO-4734 Add required imports
---
 src/main/java/tour/Main.java | 16 ++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/java/tour/Main.java b/src/main/java/tour/Main.java
index 10ac577..db1ec1c 100644
--- a/src/main/java/tour/Main.java
+++ b/src/main/java/tour/Main.java
@@ -1,6 +1,17 @@
 package tour;
 
-
+// Classes you will use along the tour
+import java.util.Map;
+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.MutationsRejectedException;
+import org.apache.accumulo.core.client.Scanner;
+import org.apache.accumulo.core.client.TableNotFoundException;
+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.security.Authorizations;
 import org.apache.accumulo.minicluster.MiniAccumuloCluster;
 
 import java.nio.file.Files;
@@ -20,7 +31,8 @@ public class Main {
 mac.stop();
 }
 
-static void exercise(MiniAccumuloCluster mac) {
+static void exercise(MiniAccumuloCluster mac) throws Exception{
 // start writing your code here
+
 }
 }

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo-website] branch milleruntime-readme-ruby deleted (was cc5aaec)

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a change to branch milleruntime-readme-ruby
in repository https://gitbox.apache.org/repos/asf/accumulo-website.git.


 was cc5aaec  Update README.md

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo-website] branch master updated (cba2cca -> bdcf5d2)

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo-website.git.


from cba2cca  ACCUMULO-4735 Fixed typos and spelling errors (#34)
 add cc5aaec  Update README.md
 new bdcf5d2  Update README.md with instructions for Ruby install

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 README.md | 4 
 1 file changed, 4 insertions(+)

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo-website] 01/01: Update README.md with instructions for Ruby install

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo-website.git

commit bdcf5d2b12f883985936d8b27833313b2b8ab4e7
Merge: cba2cca cc5aaec
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Fri Nov 3 17:15:18 2017 -0400

Update README.md with instructions for Ruby install

 README.md | 4 
 1 file changed, 4 insertions(+)

-- 
To stop receiving notification emails like this one, please contact
"commits@accumulo.apache.org" <commits@accumulo.apache.org>.

[accumulo-website] branch milleruntime-readme-ruby created (now cc5aaec)

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a change to branch milleruntime-readme-ruby
in repository https://gitbox.apache.org/repos/asf/accumulo-website.git.


  at cc5aaec  Update README.md

This branch includes the following new commits:

 new cc5aaec  Update README.md

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo-website] 01/01: Update README.md

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch milleruntime-readme-ruby
in repository https://gitbox.apache.org/repos/asf/accumulo-website.git

commit cc5aaecae4a96fe90543b60a83c8c0bc6d9365be
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Thu Nov 2 17:59:02 2017 -0400

Update README.md
---
 README.md | 4 
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index ec88309..56f0bab 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,10 @@ use [Bundler] to install the necessary dependencies to run and 
build the website
 
 ## Install Bundler and dependencies
 
+Ruby is required to use Bundler so first make sure you have Ruby on your 
machine.  If you are using
+an OS packaged version of Ruby, you will have to also install the ruby-dev 
(Ubuntu) or 
+ruby-devel (Fedora) package as well.
+
 With Ruby installed on your machine, you can install [Bundler] using the 
command below:
 
 gem install bundler

-- 
To stop receiving notification emails like this one, please contact
"commits@accumulo.apache.org" <commits@accumulo.apache.org>.

[accumulo-website] branch tour updated: ACCUMULO-4734 Set up MAC

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch tour
in repository https://gitbox.apache.org/repos/asf/accumulo-website.git


The following commit(s) were added to refs/heads/tour by this push:
 new eae7bec  ACCUMULO-4734 Set up MAC
eae7bec is described below

commit eae7bec9c4a330e093d58297ff19ca4383e97bc4
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Thu Nov 2 17:33:30 2017 -0400

ACCUMULO-4734 Set up MAC
---
 README.md   | 16 
 pom.xml | 11 ++-
 src/main/java/tour/Main.java| 19 ++-
 src/main/resources/log4j.properties |  9 +
 4 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index a410739..f5b0913 100644
--- a/README.md
+++ b/README.md
@@ -5,12 +5,20 @@ This git repository provides a barebones Maven+Java 
environment for the [Accumul
 go through the tour edit [Main.java] and use the following maven command to 
run your code.  This command 
 will execute Main.java with all of the correct dependencies on the classpath.
 
-```bash
+```commandline
 mvn -q clean compile exec:java
 ```
 
-The command takes a bit to run because it starts a MiniAccumulo each time.
+The command takes a bit to run because it starts a MiniAccumuloCluster each 
time.
 
-[tour]: https://fluo.apache.org/tour
-[Main.java]: src/main/java/tour/Main.java
+MiniAccumuloCluster is a mini version of Accumulo that runs on your local 
filesystem.  It should only be used for
+development purposes. Files and logs used by MiniAccumuloCluster can be seen 
in the generated directory:
+
+```commandline
+target/mac
+```
 
+Running _mvn clean_ will remove any files created by previous runs.
+
+[tour]: https://fluo.apache.org/tour
+[Main.java]: src/main/java/tour/Main.java
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 36ff99e..c94719e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,8 @@
 
 
 
-
+UTF-8
+1.8.1
 
 
 
@@ -40,5 +41,13 @@
 

 
+
+
+org.apache.accumulo
+accumulo-minicluster
+${accumulo.version}
+
+
+
 
 
diff --git a/src/main/java/tour/Main.java b/src/main/java/tour/Main.java
index 4ec8f8c..10ac577 100644
--- a/src/main/java/tour/Main.java
+++ b/src/main/java/tour/Main.java
@@ -1,9 +1,26 @@
 package tour;
 
 
+import org.apache.accumulo.minicluster.MiniAccumuloCluster;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
 public class Main {
 
-public static void main(String[] args) {
+public static void main(String[] args) throws Exception {
 System.out.println("Running the Accumulo tour. Having fun yet?");
+
+Path tempDir = Files.createTempDirectory(Paths.get("target"), "mac");
+MiniAccumuloCluster mac = new MiniAccumuloCluster(tempDir.toFile(), 
"tourguide");
+
+mac.start();
+exercise(mac);
+mac.stop();
+}
+
+static void exercise(MiniAccumuloCluster mac) {
+// start writing your code here
 }
 }
diff --git a/src/main/resources/log4j.properties 
b/src/main/resources/log4j.properties
new file mode 100644
index 000..05f649f
--- /dev/null
+++ b/src/main/resources/log4j.properties
@@ -0,0 +1,9 @@
+log4j.rootLogger=INFO, CA
+log4j.appender.CA=org.apache.log4j.ConsoleAppender
+log4j.appender.CA.layout=org.apache.log4j.PatternLayout
+log4j.appender.CA.layout.ConversionPattern=%d{ISO8601} [%c{2}] %-5p: %m%n
+
+log4j.logger.org.apache.zookeeper.ClientCnxn=FATAL
+log4j.logger.org.apache.zookeeper.ZooKeeper=WARN
+log4j.logger.org.apache.curator=WARN
+log4j.logger.org.apache.accumulo=INFO

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo-website] 01/01: ACCUMULO-4734 Initial commit

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch tour
in repository https://gitbox.apache.org/repos/asf/accumulo-website.git

commit fd091203db8f8d84d4b8b12f341b5104d15632f8
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Thu Nov 2 15:51:18 2017 -0400

ACCUMULO-4734 Initial commit
---
 .gitignore   |  3 +++
 README.md| 16 
 pom.xml  | 44 
 src/main/java/tour/Main.java |  9 +
 4 files changed, 72 insertions(+)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..d8b48b5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/target/
+/.idea
+/*.iml
diff --git a/README.md b/README.md
new file mode 100644
index 000..a410739
--- /dev/null
+++ b/README.md
@@ -0,0 +1,16 @@
+Accumulo Tour
+-
+
+This git repository provides a barebones Maven+Java environment for the 
[Accumulo Tour][tour].  As you
+go through the tour edit [Main.java] and use the following maven command to 
run your code.  This command 
+will execute Main.java with all of the correct dependencies on the classpath.
+
+```bash
+mvn -q clean compile exec:java
+```
+
+The command takes a bit to run because it starts a MiniAccumulo each time.
+
+[tour]: https://fluo.apache.org/tour
+[Main.java]: src/main/java/tour/Main.java
+
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 000..36ff99e
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,44 @@
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+org.apache.accumulo
+accumulo-tour
+0.0.1-SNAPSHOT
+jar
+
+accumulo-tour
+
+
+
+
+
+
+
+
+  
+maven-compiler-plugin
+3.1
+
+  1.8
+  1.8
+  true
+  UTF-8
+
+  
+  
+org.codehaus.mojo
+exec-maven-plugin
+1.5.0
+
+  tour.Main
+  false
+
+  
+
+   
+
+
+
diff --git a/src/main/java/tour/Main.java b/src/main/java/tour/Main.java
new file mode 100644
index 000..4ec8f8c
--- /dev/null
+++ b/src/main/java/tour/Main.java
@@ -0,0 +1,9 @@
+package tour;
+
+
+public class Main {
+
+public static void main(String[] args) {
+System.out.println("Running the Accumulo tour. Having fun yet?");
+}
+}

-- 
To stop receiving notification emails like this one, please contact
"commits@accumulo.apache.org" <commits@accumulo.apache.org>.

[accumulo-website] branch tour created (now fd09120)

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a change to branch tour
in repository https://gitbox.apache.org/repos/asf/accumulo-website.git.


  at fd09120  ACCUMULO-4734 Initial commit

This branch includes the following new commits:

 new fd09120  ACCUMULO-4734 Initial commit

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo-examples] branch master updated: ACCUMULO-1641 Add checkstyle plugin for API check

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo-examples.git


The following commit(s) were added to refs/heads/master by this push:
 new cb78047  ACCUMULO-1641 Add checkstyle plugin for API check
cb78047 is described below

commit cb7804799c316d7e05b715ac5d9baabb9627dc05
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Wed Nov 1 21:52:40 2017 +

ACCUMULO-1641 Add checkstyle plugin for API check
---
 bin/runex  |  2 +-
 checkstyle.xml | 28 
 pom.xml| 11 +++
 3 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/bin/runex b/bin/runex
index feabbe9..aa55ef3 100755
--- a/bin/runex
+++ b/bin/runex
@@ -19,7 +19,7 @@ main_class="$1"
 main_args="${*:2}"
 
 if command -v accumulo > /dev/null 2>&1 ; then
-  av_arg="-Daccumulo.version=`accumulo version`"
+  av_arg="-Daccumulo.version=`accumulo version | tail -n 1`"
 fi
 
 mvn -q exec:java -Dexec.mainClass="org.apache.accumulo.examples.$main_class" 
$av_arg -Dexec.args="$main_args"
diff --git a/checkstyle.xml b/checkstyle.xml
new file mode 100755
index 000..4bfef83
--- /dev/null
+++ b/checkstyle.xml
@@ -0,0 +1,28 @@
+
+
+http://www.puppycrawl.com/dtds/configuration_1_3.dtd;>
+
+  
+  
+
+  
+  
+  
+  
+
+  
+
+
diff --git a/pom.xml b/pom.xml
index d994d0e..834c761 100644
--- a/pom.xml
+++ b/pom.xml
@@ -113,6 +113,17 @@
   
 
   
+  
+
+org.apache.maven.plugins
+maven-checkstyle-plugin
+2.17
+
+  checkstyle.xml
+
+  
 
   
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo-testing] 02/02: ACCUMULO-4717 Update TableOp to handle error codes

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo-testing.git

commit c152795044001178491a961392b7438d3d23dfc9
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Wed Oct 25 18:40:38 2017 -0400

ACCUMULO-4717 Update TableOp to handle error codes
---
 .../testing/core/randomwalk/security/TableOp.java  | 25 +++---
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git 
a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/TableOp.java
 
b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/TableOp.java
index 7513b23..2fee84f 100644
--- 
a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/TableOp.java
+++ 
b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/TableOp.java
@@ -19,6 +19,7 @@ package org.apache.accumulo.testing.core.randomwalk.security;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import java.util.Iterator;
+import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.Random;
@@ -161,7 +162,6 @@ public class TableOp extends Test {
 throw new AccumuloException("Table didn't exist when it should 
have: " + tableName, ase);
   return;
 }
-boolean ambiguousZone = WalkingSecurity.get(state, 
env).inAmbiguousZone(conn.whoami(), tp);
 
 String key = WalkingSecurity.get(state, env).getLastKey() + "1";
 Mutation m = new Mutation(new Text(key));
@@ -182,24 +182,15 @@ public class TableOp extends Test {
 writer.addMutation(m);
 writer.close();
   } catch (MutationsRejectedException mre) {
-// Currently no method for detecting reason for mre.
-// Waiting on ACCUMULO-670
-// For now, just wait a second and go again if they can
-// write!
-if (!canWrite)
-  return;
-
-if (ambiguousZone) {
-  Thread.sleep(1000);
-  try {
-writer = conn.createBatchWriter(tableName, new 
BatchWriterConfig().setMaxWriteThreads(1));
-writer.addMutation(m);
-writer.close();
-writer = null;
-  } catch (MutationsRejectedException mre2) {
-throw new AccumuloException("Mutation exception!", mre2);
+if (mre.getSecurityErrorCodes().size() == 1) {
+  // TabletServerBatchWriter will log the error automatically so 
make sure its the error we expect
+  SecurityErrorCode errorCode = 
mre.getSecurityErrorCodes().entrySet().iterator().next().getValue().iterator().next();
+  if (errorCode.equals(SecurityErrorCode.PERMISSION_DENIED) && 
!canWrite) {
+log.info("Caught MutationsRejectedException({}) in 
TableOp.WRITE as expected.", errorCode);
+return;
   }
 }
+throw new AccumuloException("Unexpected MutationsRejectedException 
in TableOp.WRITE", mre);
   }
   if (works)
 for (String s : WalkingSecurity.get(state, env).getAuthsArray())

-- 
To stop receiving notification emails like this one, please contact
"commits@accumulo.apache.org" <commits@accumulo.apache.org>.

[accumulo-testing] branch master updated (03453ac -> c152795)

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo-testing.git.


from 03453ac  ACCUMULO-4717 Refactor WalkingSecurity to use API (#9)
 new 47be23a  ACCUMULO-4717 Fix boolean checks in AlterTablePerm
 new c152795  ACCUMULO-4717 Update TableOp to handle error codes

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../core/randomwalk/security/AlterTablePerm.java   | 21 +-
 .../testing/core/randomwalk/security/TableOp.java  | 25 +++---
 2 files changed, 18 insertions(+), 28 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo-testing] 01/02: ACCUMULO-4717 Fix boolean checks in AlterTablePerm

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo-testing.git

commit 47be23ab11658046932887297b95835a311be25c
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Wed Oct 25 17:29:14 2017 -0400

ACCUMULO-4717 Fix boolean checks in AlterTablePerm
---
 .../core/randomwalk/security/AlterTablePerm.java| 21 ++---
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git 
a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/AlterTablePerm.java
 
b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/AlterTablePerm.java
index 8d1d4a6..85372fb 100644
--- 
a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/AlterTablePerm.java
+++ 
b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/AlterTablePerm.java
@@ -44,7 +44,6 @@ public class AlterTablePerm extends Test {
 String perm = props.getProperty("perm", "random");
 String sourceUserProp = props.getProperty("source", "system");
 String targetUser = props.getProperty("target", "table");
-boolean tabExists = WalkingSecurity.get(state, env).getTableExists();
 
 String target;
 if ("table".equals(targetUser))
@@ -52,7 +51,7 @@ public class AlterTablePerm extends Test {
 else
   target = WalkingSecurity.get(state, env).getSysUserName();
 
-boolean exists = WalkingSecurity.get(state, env).userExists(target);
+boolean userExists = WalkingSecurity.get(state, env).userExists(target);
 boolean tableExists = WalkingSecurity.get(state, env).getTableExists();
 
 TablePermission tabPerm;
@@ -85,7 +84,7 @@ public class AlterTablePerm extends Test {
   || secOps.hasTablePermission(sourceUser, tableName, 
TablePermission.GRANT);
 } catch (AccumuloSecurityException ae) {
   if 
(ae.getSecurityErrorCode().equals(SecurityErrorCode.TABLE_DOESNT_EXIST)) {
-if (exists)
+if (tableExists)
   throw new TableExistsException(null, tableName, "Got a 
TableNotFoundException but it should exist", ae);
 else
   return;
@@ -109,13 +108,13 @@ public class AlterTablePerm extends Test {
   } catch (AccumuloSecurityException ae) {
 switch (ae.getSecurityErrorCode()) {
   case USER_DOESNT_EXIST:
-if (exists)
+if (userExists)
   throw new AccumuloException("Framework and Accumulo are out of 
sync, we think user exists", ae);
 else
   return;
   case TABLE_DOESNT_EXIST:
-if (tabExists)
-  throw new AccumuloException(conn.whoami(), ae);
+if (tableExists)
+  throw new TableExistsException(null, tableName, "Got a 
TableNotFoundException but it should exist", ae);
 else
   return;
   default:
@@ -137,7 +136,7 @@ public class AlterTablePerm extends Test {
   throw new AccumuloException(conn.whoami() + " failed to revoke 
permission to " + target + " when it should have worked", ae);
 return;
   case USER_DOESNT_EXIST:
-if (exists)
+if (userExists)
   throw new AccumuloException("Table user doesn't exist and they 
SHOULD.", ae);
 return;
   case TABLE_DOESNT_EXIST:
@@ -165,7 +164,7 @@ public class AlterTablePerm extends Test {
   throw new AccumuloException(conn.whoami() + " failed to give 
permission to " + target + " when it should have worked", ae);
 return;
   case USER_DOESNT_EXIST:
-if (exists)
+if (userExists)
   throw new AccumuloException("Table user doesn't exist and they 
SHOULD.", ae);
 return;
   case TABLE_DOESNT_EXIST:
@@ -183,10 +182,10 @@ public class AlterTablePerm extends Test {
   WalkingSecurity.get(state, env).grantTablePermission(target, tableName, 
tabPerm);
 }
 
-if (!exists)
-  throw new AccumuloException("User shouldn't have existed, but apparantly 
does");
+if (!userExists)
+  throw new AccumuloException("User shouldn't have existed, but apparently 
does");
 if (!tableExists)
-  throw new AccumuloException("Table shouldn't have existed, but 
apparantly does");
+  throw new AccumuloException("Table shouldn't have existed, but 
apparently does");
 if (!canGive)
   throw new AccumuloException(conn.whoami() + " shouldn't have been able 
to grant privilege");
 

-- 
To stop receiving notification emails like this one, please contact
"commits@accumulo.apache.org" <commits@accumulo.apache.org>.

[accumulo-testing] branch master updated: ACCUMULO-4717 Refactor WalkingSecurity to use API (#9)

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo-testing.git


The following commit(s) were added to refs/heads/master by this push:
 new 03453ac  ACCUMULO-4717 Refactor WalkingSecurity to use API (#9)
03453ac is described below

commit 03453aceeed5559e07ccf1ee82f39115004d6313
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Wed Oct 25 15:40:10 2017 -0400

ACCUMULO-4717 Refactor WalkingSecurity to use API (#9)

Simplified WalkingSecurity by removing the inheritance from server
classes and removing unused code. Now it is simply a helper class and
the other classes in the randomwalk framework call the API directly.
Also added try catch blocks where exceptions are now thrown.
---
 .../core/randomwalk/security/AlterTable.java   |  20 +-
 .../core/randomwalk/security/AlterTablePerm.java   |  17 +-
 .../core/randomwalk/security/Authenticate.java |   2 +-
 .../core/randomwalk/security/ChangePass.java   |   2 +-
 .../core/randomwalk/security/CreateTable.java  |   3 +-
 .../core/randomwalk/security/CreateUser.java   |   6 +-
 .../core/randomwalk/security/DropTable.java|  12 +-
 .../testing/core/randomwalk/security/DropUser.java |   6 +-
 .../testing/core/randomwalk/security/TableOp.java  |  35 +++-
 .../testing/core/randomwalk/security/Validate.java |   6 -
 .../core/randomwalk/security/WalkingSecurity.java  | 208 +
 11 files changed, 88 insertions(+), 229 deletions(-)

diff --git 
a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/AlterTable.java
 
b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/AlterTable.java
index ee26003..1283fd7 100644
--- 
a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/AlterTable.java
+++ 
b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/AlterTable.java
@@ -25,6 +25,7 @@ import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.TableExistsException;
 import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.client.security.SecurityErrorCode;
+import org.apache.accumulo.core.security.SystemPermission;
 import org.apache.accumulo.core.security.TablePermission;
 import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv;
 import org.apache.accumulo.testing.core.randomwalk.State;
@@ -34,13 +35,26 @@ public class AlterTable extends Test {
 
   @Override
   public void visit(State state, RandWalkEnv env, Properties props) throws 
Exception {
-Connector conn = 
env.getAccumuloInstance().getConnector(WalkingSecurity.get(state, 
env).getSysUserName(), WalkingSecurity.get(state, env).getSysToken());
+String systemUser = WalkingSecurity.get(state, env).getSysUserName();
+Connector conn = env.getAccumuloInstance().getConnector(systemUser, 
WalkingSecurity.get(state, env).getSysToken());
 
 String tableName = WalkingSecurity.get(state, env).getTableName();
 
 boolean exists = WalkingSecurity.get(state, env).getTableExists();
-boolean hasPermission = 
conn.securityOperations().hasTablePermission(WalkingSecurity.get(state, 
env).getSysUserName(), tableName,
-TablePermission.ALTER_TABLE);
+boolean hasPermission;
+try {
+  hasPermission = conn.securityOperations().hasTablePermission(systemUser, 
tableName, TablePermission.ALTER_TABLE)
+  || conn.securityOperations().hasSystemPermission(systemUser, 
SystemPermission.ALTER_TABLE);
+} catch (AccumuloSecurityException ae) {
+  if 
(ae.getSecurityErrorCode().equals(SecurityErrorCode.TABLE_DOESNT_EXIST)) {
+if (exists)
+  throw new TableExistsException(null, tableName, "Got a 
TableNotFoundException but it should exist", ae);
+else
+  return;
+  } else {
+throw new AccumuloException("Got unexpected ae error code", ae);
+  }
+}
 String newTableName = String.format("security_%s_%s_%d", 
InetAddress.getLocalHost().getHostName().replaceAll("[-.]", "_"), env.getPid(),
 System.currentTimeMillis());
 
diff --git 
a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/AlterTablePerm.java
 
b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/AlterTablePerm.java
index 30f727f..8d1d4a6 100644
--- 
a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/AlterTablePerm.java
+++ 
b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/AlterTablePerm.java
@@ -22,7 +22,9 @@ import java.util.Random;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.Connector;;
+import org.apache.accumulo.core.client.TableExistsException;
 import org.apach

[accumulo-testing] branch master updated: ACCUMULO-4718 Add Hadoop common to shade pom

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo-testing.git


The following commit(s) were added to refs/heads/master by this push:
 new 3266ae5  ACCUMULO-4718 Add Hadoop common to shade pom
3266ae5 is described below

commit 3266ae55144922a15615fb630dafb2c29755bb69
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Wed Oct 25 14:34:02 2017 -0400

ACCUMULO-4718 Add Hadoop common to shade pom
---
 core/pom.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/core/pom.xml b/core/pom.xml
index 3f82d27..d9ff2e9 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -59,6 +59,10 @@
   hadoop-client
 
 
+org.apache.hadoop
+hadoop-common
+ 
+
   org.apache.hadoop
   hadoop-mapreduce-client-jobclient
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo-testing] branch master updated: ACCUMULO-4725 Add modules dir to script help (#8)

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo-testing.git


The following commit(s) were added to refs/heads/master by this push:
 new a4aa560  ACCUMULO-4725 Add modules dir to script help (#8)
a4aa560 is described below

commit a4aa560c048e902ba2fb78480b20f043669f597c
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Thu Oct 19 14:34:00 2017 -0400

ACCUMULO-4725 Add modules dir to script help (#8)
---
 bin/accumulo-testing | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/accumulo-testing b/bin/accumulo-testing
index 3412564..34fadb0 100755
--- a/bin/accumulo-testing
+++ b/bin/accumulo-testing
@@ -33,8 +33,9 @@ Possible commands:
 Applications: ingest, walk, batchwalk, scan
   ci-mapredRuns continuous ingest mapreduce 
 Applications: verify, moru  
-  rw-local  Runs randomwalk  in local java process
-  rw-yarn  Runs randomwalk  in  containers 
on YARN
+  rw-local *Runs randomwalk  in local java process
+  rw-yarn  *   Runs randomwalk  in  containers 
on YARN
+*Modules located in 
core/src/main/resources/randomwalk/modules
 EOF
 }
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo-testing] branch master updated: ACCUMULO-4717 Use public API (#7)

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo-testing.git


The following commit(s) were added to refs/heads/master by this push:
 new ab969c1  ACCUMULO-4717 Use public API (#7)
ab969c1 is described below

commit ab969c18a2156ee6ad5facd6fe73ddfa18b71471
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Thu Oct 19 12:21:59 2017 -0400

ACCUMULO-4717 Use public API (#7)

* Replace security operations with API
* Utilize newer RFile API
* Replace core.client.impl code
* Replace CachedConfiguration with Hadoop Configuration
---
 .../testing/core/continuous/ContinuousMoru.java|  1 -
 .../testing/core/continuous/ContinuousOpts.java|  3 +-
 .../testing/core/continuous/UndefinedAnalyzer.java |  1 -
 .../testing/core/ingest/BulkImportDirectory.java   |  4 +--
 .../testing/core/randomwalk/bulk/BulkPlusOne.java  | 22 +---
 .../core/randomwalk/concurrent/BulkImport.java | 14 +++-
 .../randomwalk/concurrent/ChangePermissions.java   | 13 +---
 .../core/randomwalk/image/ImageFixture.java|  5 ++-
 .../core/randomwalk/multitable/CopyTable.java  |  1 -
 .../core/randomwalk/multitable/CreateTable.java|  1 -
 .../core/randomwalk/security/AlterTable.java   |  9 ++---
 .../core/randomwalk/security/AlterTablePerm.java   | 14 
 .../core/randomwalk/security/Authenticate.java |  4 +--
 .../core/randomwalk/security/ChangePass.java   |  4 +--
 .../core/randomwalk/security/DropTable.java| 12 ++-
 .../core/randomwalk/security/SecurityHelper.java   | 20 ---
 .../testing/core/randomwalk/security/SetAuths.java |  5 ++-
 .../testing/core/randomwalk/security/TableOp.java  | 39 ++
 .../testing/core/randomwalk/security/Validate.java | 18 ++
 .../randomwalk/sequential/SequentialFixture.java   |  4 +--
 .../testing/core/randomwalk/shard/BulkInsert.java  |  2 +-
 21 files changed, 60 insertions(+), 136 deletions(-)

diff --git 
a/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousMoru.java
 
b/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousMoru.java
index 0c3ae2d..81f9bd3 100644
--- 
a/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousMoru.java
+++ 
b/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousMoru.java
@@ -32,7 +32,6 @@ import org.apache.accumulo.core.data.Mutation;
 import org.apache.accumulo.core.data.Range;
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.security.ColumnVisibility;
-import org.apache.accumulo.core.util.CachedConfiguration;
 import org.apache.accumulo.testing.core.TestProps;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.conf.Configured;
diff --git 
a/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousOpts.java
 
b/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousOpts.java
index 3bb11fb..14babaf 100644
--- 
a/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousOpts.java
+++ 
b/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousOpts.java
@@ -18,7 +18,6 @@ package org.apache.accumulo.testing.core.continuous;
 
 import java.io.IOException;
 
-import org.apache.accumulo.core.Constants;
 import org.apache.log4j.FileAppender;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
@@ -35,7 +34,7 @@ public class ContinuousOpts {
   public static class DebugConverter implements IStringConverter {
 @Override
 public String convert(String debugLog) {
-  Logger logger = Logger.getLogger(Constants.CORE_PACKAGE_NAME);
+  Logger logger = Logger.getLogger("org.apache.accumulo.core");
   logger.setLevel(Level.TRACE);
   logger.setAdditivity(false);
   try {
diff --git 
a/core/src/main/java/org/apache/accumulo/testing/core/continuous/UndefinedAnalyzer.java
 
b/core/src/main/java/org/apache/accumulo/testing/core/continuous/UndefinedAnalyzer.java
index 4c33588..7158491 100644
--- 
a/core/src/main/java/org/apache/accumulo/testing/core/continuous/UndefinedAnalyzer.java
+++ 
b/core/src/main/java/org/apache/accumulo/testing/core/continuous/UndefinedAnalyzer.java
@@ -39,7 +39,6 @@ import java.util.concurrent.TimeUnit;
 import org.apache.accumulo.core.cli.BatchScannerOpts;
 import org.apache.accumulo.core.client.BatchScanner;
 import org.apache.accumulo.core.client.Connector;
-import org.apache.accumulo.core.client.impl.Tables;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Range;
 import org.apache.accumulo.core.data.Value;
diff --git 
a/core/src/main/java/org/apache/accumulo/testing/core/ingest/BulkImportDirectory.java
 
b/core/src/main/java/org/apache/accumulo/testing/core/ingest/BulkImportDirectory.java
index 074bd8b..c8988b8 100644
--- 
a/core/src/main/java/org

[accumulo-testing] branch master updated: ACCUMULO-4718 Add CLASSPATH to script

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo-testing.git


The following commit(s) were added to refs/heads/master by this push:
 new 966bb41  ACCUMULO-4718 Add CLASSPATH to script
966bb41 is described below

commit 966bb41df34e8b17cc68ab58e05caa65ebd2bd28
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Tue Oct 17 15:31:41 2017 -0400

ACCUMULO-4718 Add CLASSPATH to script
---
 bin/accumulo-testing | 7 ---
 conf/accumulo-testing-env.sh.example | 2 ++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/bin/accumulo-testing b/bin/accumulo-testing
index 84a1d40..3412564 100755
--- a/bin/accumulo-testing
+++ b/bin/accumulo-testing
@@ -70,6 +70,7 @@ fi
 
 function build_shade_jar() {
   export 
at_shaded_jar="$at_home/core/target/accumulo-testing-core-$at_version-shaded.jar"
+  export CLASSPATH="$at_shaded_jar:$CLASSPATH"
   if [ ! -f "$at_shaded_jar" ]; then
 echo "Building $at_shaded_jar"
 cd "$at_home" || exit 1
@@ -185,7 +186,7 @@ 
randomwalk_main="org.apache.accumulo.testing.core.randomwalk.Framework"
 case "$1" in
 ci-createtable)
   build_shade_jar
-  java -Dlog4j.configuration="file:$log4j_config" -cp "$at_shaded_jar" 
org.apache.accumulo.testing.core.continuous.CreateTable "$at_props"
+  java -Dlog4j.configuration="file:$log4j_config" 
org.apache.accumulo.testing.core.continuous.CreateTable "$at_props"
   ;;
 ci-local)
   if [ -z "$2" ]; then
@@ -195,7 +196,7 @@ ci-local)
   fi
   determine_app_main "$2"
   build_shade_jar
-  java -Dlog4j.configuration="file:$log4j_config" -cp "$at_shaded_jar" 
"$ci_main" "$at_props"
+  java -Dlog4j.configuration="file:$log4j_config" "$ci_main" "$at_props"
   ;;
 ci-yarn)
   if [ -z "$2" ]; then
@@ -229,7 +230,7 @@ rw-local)
 exit 1
   fi
   build_shade_jar
-  java -Dlog4j.configuration="file:$log4j_config" -cp "$at_shaded_jar" 
"$randomwalk_main" "$at_props" "$2"
+  java -Dlog4j.configuration="file:$log4j_config" "$randomwalk_main" 
"$at_props" "$2"
   ;;
 rw-yarn)
   if [ -z "$2" ]; then
diff --git a/conf/accumulo-testing-env.sh.example 
b/conf/accumulo-testing-env.sh.example
index e03c973..677c23d 100644
--- a/conf/accumulo-testing-env.sh.example
+++ b/conf/accumulo-testing-env.sh.example
@@ -20,6 +20,8 @@ test -z "$HADOOP_PREFIX" && export 
HADOOP_PREFIX=/path/to/hadoop
 export ACCUMULO_VERSION=`accumulo version`
 export HADOOP_VERSION=`hadoop version | head -n1 | awk '{print $2}'`
 export ZOOKEEPER_VERSION=3.4.9
+# Make sure Hadoop configuration directory is on the classpath
+export CLASSPATH=$HADOOP_PREFIX/etc/hadoop
 
 # Agitator
 # 

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo-testing] branch master updated: ACCUMULO-4717 Tweak regex for API checkstyle

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo-testing.git


The following commit(s) were added to refs/heads/master by this push:
 new d71c061  ACCUMULO-4717 Tweak regex for API checkstyle
d71c061 is described below

commit d71c061a9d1c063cc646f1680d371d20a8b91dd3
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Fri Oct 6 16:34:41 2017 -0400

ACCUMULO-4717 Tweak regex for API checkstyle
---
 contrib/checkstyle.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/checkstyle.xml b/contrib/checkstyle.xml
index 54d2a94..68bb068 100644
--- a/contrib/checkstyle.xml
+++ b/contrib/checkstyle.xml
@@ -19,7 +19,7 @@
   
 
   
-  
+  
   
   
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo-testing] branch master updated: ACCUMULO-4718 Disable native maps in IT

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo-testing.git


The following commit(s) were added to refs/heads/master by this push:
 new d0bf74c  ACCUMULO-4718 Disable native maps in IT
d0bf74c is described below

commit d0bf74cf1e949442d213b8bf9974ca3caa2c4d6c
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Fri Oct 6 14:18:54 2017 -0400

ACCUMULO-4718 Disable native maps in IT
---
 .../accumulo/testing/core/randomwalk/ReplicationRandomWalkIT.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git 
a/core/src/test/java/org/apache/accumulo/testing/core/randomwalk/ReplicationRandomWalkIT.java
 
b/core/src/test/java/org/apache/accumulo/testing/core/randomwalk/ReplicationRandomWalkIT.java
index 6a6e713..2dc6acd 100644
--- 
a/core/src/test/java/org/apache/accumulo/testing/core/randomwalk/ReplicationRandomWalkIT.java
+++ 
b/core/src/test/java/org/apache/accumulo/testing/core/randomwalk/ReplicationRandomWalkIT.java
@@ -17,6 +17,7 @@
 package org.apache.accumulo.testing.core.randomwalk;
 
 import static org.apache.accumulo.core.conf.Property.TSERV_ARCHIVE_WALOGS;
+import static org.apache.accumulo.core.conf.Property.TSERV_NATIVEMAP_ENABLED;
 import static org.apache.accumulo.core.conf.Property.TSERV_WALOG_MAX_SIZE;
 
 import java.util.Properties;
@@ -36,6 +37,7 @@ public class ReplicationRandomWalkIT extends 
ConfigurableMacBase {
   protected void configure(MiniAccumuloConfigImpl cfg, Configuration 
hadoopCoreSite) {
 cfg.setProperty(TSERV_ARCHIVE_WALOGS, "false");
 cfg.setProperty(TSERV_WALOG_MAX_SIZE, "1M");
+cfg.setProperty(TSERV_NATIVEMAP_ENABLED, "false");
 cfg.setNumTservers(1);
   }
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo-testing] branch master updated (da53bbb -> b4f8b62)

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo-testing.git.


from da53bbb  ACCUMULO-4718 Get code working with recent updates
 add 5fbf767  ACCUMULO-4717 Add checkstyle plugin to check API
 new b4f8b62  ACCUMULO-4717 Add checkstyle plugin to check API

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 contrib/checkstyle.xml | 28 
 pom.xml| 11 +++
 2 files changed, 39 insertions(+)
 create mode 100644 contrib/checkstyle.xml

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo-website] branch master updated (54fb9ed -> a49d6e1)

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo-website.git.


from 54fb9ed  Added Mark Owens as contributor
 add 3155648  Add FineAndDandy as contributor
 new a49d6e1  Add FineAndDandy as contributor

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pages/people.md | 2 ++
 1 file changed, 2 insertions(+)

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo-website] 01/01: Add FineAndDandy as contributor

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo-website.git

commit a49d6e12f327eece5eaa2f38658736266f05f4fb
Merge: 54fb9ed 3155648
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Thu Oct 5 10:24:48 2017 -0400

Add FineAndDandy as contributor

 pages/people.md | 2 ++
 1 file changed, 2 insertions(+)

-- 
To stop receiving notification emails like this one, please contact
"commits@accumulo.apache.org" <commits@accumulo.apache.org>.

[accumulo] 01/01: Merge branch '1.8'

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 1c2eb9aeb1f530ec20f95d7832aa777bbc5d3e74
Merge: 8096446 d8260b7
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Wed Oct 4 14:03:36 2017 -0400

Merge branch '1.8'

 assemble/pom.xml | 5 +
 1 file changed, 5 insertions(+)


-- 
To stop receiving notification emails like this one, please contact
"commits@accumulo.apache.org" <commits@accumulo.apache.org>.

[accumulo] branch master updated (8096446 -> 1c2eb9a)

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git.


from 8096446  ACCUMULO-2968: Axe TabletServer.majorCompactorDisabled (#302)
 add da9de86  ACCUMULO-4702 Fix missing Guava in assemble
 add d8260b7  Merge branch '1.7' into 1.8
 new 1c2eb9a  Merge branch '1.8'

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 assemble/pom.xml | 5 +
 1 file changed, 5 insertions(+)

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo] 01/01: Merge branch '1.7' into 1.8

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch 1.8
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit d8260b7a96a584e955092fea5b0ce3ccba89f087
Merge: b3f6aae da9de86
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Wed Oct 4 13:55:02 2017 -0400

Merge branch '1.7' into 1.8

 assemble/pom.xml | 5 +
 1 file changed, 5 insertions(+)


-- 
To stop receiving notification emails like this one, please contact
"commits@accumulo.apache.org" <commits@accumulo.apache.org>.

[accumulo] branch 1.8 updated (b3f6aae -> d8260b7)

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a change to branch 1.8
in repository https://gitbox.apache.org/repos/asf/accumulo.git.


from b3f6aae  Merge branch '1.7' into 1.8
 add da9de86  ACCUMULO-4702 Fix missing Guava in assemble
 new d8260b7  Merge branch '1.7' into 1.8

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 assemble/pom.xml | 5 +
 1 file changed, 5 insertions(+)

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo] branch 1.7 updated: ACCUMULO-4702 Fix missing Guava in assemble

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch 1.7
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/1.7 by this push:
 new da9de86  ACCUMULO-4702 Fix missing Guava in assemble
da9de86 is described below

commit da9de8686b6f986534db50b84635449e841f642f
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Wed Oct 4 13:50:59 2017 -0400

ACCUMULO-4702 Fix missing Guava in assemble
---
 assemble/pom.xml | 5 +
 1 file changed, 5 insertions(+)

diff --git a/assemble/pom.xml b/assemble/pom.xml
index bd2ff5d..5132f1c 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -38,6 +38,11 @@
   true
 
 
+  com.google.guava
+  guava
+  true
+
+
   com.google.protobuf
   protobuf-java
   true

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo] branch master updated: ACCUMULO-4703 Upgrade Jetty version

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
 new c286ed2  ACCUMULO-4703 Upgrade Jetty version
c286ed2 is described below

commit c286ed261705fb403f487554457942ca26b5e33f
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Mon Oct 2 11:54:47 2017 -0400

ACCUMULO-4703 Upgrade Jetty version
---
 pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2aada0d..0d8782d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,8 +134,7 @@
 false
 2.9.0
 2.25.1
-
-9.2.17.v20160517
+9.3.21.v20170918
 1.8
 1.8
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo] branch master updated: ACCUMULO-4703 Upgrade Jackson to 2.9.0

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
 new 2ed1620  ACCUMULO-4703 Upgrade Jackson to 2.9.0
2ed1620 is described below

commit 2ed16205bb7c01e0784ec673f81bb89551701e00
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Fri Sep 29 15:34:05 2017 -0400

ACCUMULO-4703 Upgrade Jackson to 2.9.0
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index dc34665..2aada0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,7 +132,7 @@
 3.1.0-incubating
 4.3.1
 false
-2.3.2
+2.9.0
 2.25.1
 
 9.2.17.v20160517

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo] branch master updated: ACCUMULO-4703 Upgrade JCommander to 1.72

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
 new 44a1f4d  ACCUMULO-4703 Upgrade JCommander to 1.72
44a1f4d is described below

commit 44a1f4d07bd4a8eb12a265b9de540311e485ee35
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Thu Sep 28 16:42:13 2017 -0400

ACCUMULO-4703 Upgrade JCommander to 1.72
---
 pom.xml| 2 +-
 shell/src/test/java/org/apache/accumulo/shell/ShellConfigTest.java | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8714c2f..dc34665 100644
--- a/pom.xml
+++ b/pom.xml
@@ -161,7 +161,7 @@
   
 com.beust
 jcommander
-1.60
+1.72
   
   
 com.fasterxml.jackson.core
diff --git a/shell/src/test/java/org/apache/accumulo/shell/ShellConfigTest.java 
b/shell/src/test/java/org/apache/accumulo/shell/ShellConfigTest.java
index d948768..ee3935c 100644
--- a/shell/src/test/java/org/apache/accumulo/shell/ShellConfigTest.java
+++ b/shell/src/test/java/org/apache/accumulo/shell/ShellConfigTest.java
@@ -94,7 +94,9 @@ public class ShellConfigTest {
   @Test
   public void testBadArg() throws IOException {
 assertFalse(shell.config(args("--bogus")));
-assertTrue("Did not print usage", output.get().startsWith("Usage"));
+// JCommander versions after 1.60 will cause the Shell to detect the arg 
as Unrecognized option
+assertTrue("Did not print Error", output.get().startsWith("ERROR"));
+assertTrue("Did not print usage", output.get().contains("Usage"));
   }
 
   @Test

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo] branch master updated: ACCUMULO-4703 Upgraded jcommander to 1.60

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
 new 3ca280c  ACCUMULO-4703 Upgraded jcommander to 1.60
3ca280c is described below

commit 3ca280c290f974d77886ff264f908a32aeb7f81f
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Tue Sep 26 11:18:29 2017 -0400

ACCUMULO-4703 Upgraded jcommander to 1.60
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7e267b1..8714c2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -161,7 +161,7 @@
   
 com.beust
 jcommander
-1.48
+1.60
   
   
 com.fasterxml.jackson.core

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo] 01/01: Merge branch '1.8'

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 2b7adbffdbe799f073f7c9364198c1e796e7a279
Merge: 1eead7b b3f6aae
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Mon Sep 25 15:13:09 2017 -0400

Merge branch '1.8'

 assemble/pom.xml   | 5 -
 server/monitor/pom.xml | 4 
 2 files changed, 9 deletions(-)

diff --cc server/monitor/pom.xml
index c9e51f2,fb4ec7b..06e0f9b
--- a/server/monitor/pom.xml
+++ b/server/monitor/pom.xml
@@@ -33,12 -33,12 +33,8 @@@
true
  
  
-   com.google.guava
-   guava
 -  com.google.code.gson
 -  gson
--
--
 -  commons-codec
 -  commons-codec
 +  commons-lang
 +  commons-lang
  
  
javax.servlet

-- 
To stop receiving notification emails like this one, please contact
"commits@accumulo.apache.org" <commits@accumulo.apache.org>.

[accumulo] branch master updated (1eead7b -> 2b7adbf)

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git.


from 1eead7b  Merge branch '1.8'
 add d765a2d  ACCUMULO-4702 Removed unused guava deps from poms
 add b3f6aae  Merge branch '1.7' into 1.8
 new 2b7adbf  Merge branch '1.8'

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 assemble/pom.xml   | 5 -
 server/monitor/pom.xml | 4 
 2 files changed, 9 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo] branch 1.8 updated (8fdfb3d -> b3f6aae)

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a change to branch 1.8
in repository https://gitbox.apache.org/repos/asf/accumulo.git.


from 8fdfb3d  Merge branch '1.7' into 1.8
 add d765a2d  ACCUMULO-4702 Removed unused guava deps from poms
 new b3f6aae  Merge branch '1.7' into 1.8

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 assemble/pom.xml   | 5 -
 server/monitor/pom.xml | 4 
 start/pom.xml  | 5 -
 3 files changed, 14 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo] 01/01: Merge branch '1.7' into 1.8

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch 1.8
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit b3f6aae4bcaadaa32fbbe83fd62cb1938377b475
Merge: 8fdfb3d d765a2d
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Mon Sep 25 14:47:15 2017 -0400

Merge branch '1.7' into 1.8

 assemble/pom.xml   | 5 -
 server/monitor/pom.xml | 4 
 start/pom.xml  | 5 -
 3 files changed, 14 deletions(-)


-- 
To stop receiving notification emails like this one, please contact
"commits@accumulo.apache.org" <commits@accumulo.apache.org>.

[accumulo] branch 1.7 updated: ACCUMULO-4702 Removed unused guava deps from poms

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch 1.7
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/1.7 by this push:
 new d765a2d  ACCUMULO-4702 Removed unused guava deps from poms
d765a2d is described below

commit d765a2df8250fa77a5bfa57a4fa97a6605f4ffaa
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Mon Sep 25 14:45:05 2017 -0400

ACCUMULO-4702 Removed unused guava deps from poms
---
 assemble/pom.xml   | 5 -
 server/monitor/pom.xml | 4 
 start/pom.xml  | 5 -
 3 files changed, 14 deletions(-)

diff --git a/assemble/pom.xml b/assemble/pom.xml
index 5132f1c..bd2ff5d 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -38,11 +38,6 @@
   true
 
 
-  com.google.guava
-  guava
-  true
-
-
   com.google.protobuf
   protobuf-java
   true
diff --git a/server/monitor/pom.xml b/server/monitor/pom.xml
index 1724078..d982e7e 100644
--- a/server/monitor/pom.xml
+++ b/server/monitor/pom.xml
@@ -37,10 +37,6 @@
   gson
 
 
-  com.google.guava
-  guava
-
-
   commons-codec
   commons-codec
 
diff --git a/start/pom.xml b/start/pom.xml
index 74fbab4..eb72d76 100644
--- a/start/pom.xml
+++ b/start/pom.xml
@@ -47,11 +47,6 @@
   hadoop-client
 
 
-  com.google.guava
-  guava
-  test
-
-
   junit
   junit
   test

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo] 01/02: ACCUMULO-4702 Merged up Guava changes from #299

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 6e2e2e7c609d6b55122bf6afdf5308de9526342d
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Mon Sep 25 13:16:43 2017 -0400

ACCUMULO-4702 Merged up Guava changes from #299
---
 .../accumulo/core/client/IsolatedScanner.java  |  2 +-
 .../core/client/impl/ConditionalWriterImpl.java|  2 +-
 .../accumulo/core/client/impl/MasterClient.java|  2 +-
 .../accumulo/core/client/impl/OfflineIterator.java |  2 +-
 .../client/impl/ReplicationOperationsImpl.java |  2 +-
 .../core/client/impl/RootTabletLocator.java|  2 +-
 .../accumulo/core/client/impl/ServerClient.java|  2 +-
 .../core/client/impl/TableOperationsImpl.java  |  2 +-
 .../core/client/impl/TabletLocatorImpl.java|  2 +-
 .../apache/accumulo/core/client/impl/Writer.java   |  2 +-
 .../core/client/mapred/AbstractInputFormat.java|  2 +-
 .../core/client/mapreduce/AbstractInputFormat.java |  2 +-
 .../core/file/rfile/VisMetricsGatherer.java| 20 +++-
 .../accumulo/core/client/TestThrift1474.java   |  2 +-
 .../java/org/apache/accumulo/fate/ZooStore.java|  2 +-
 .../apache/accumulo/fate/util/UtilWaitThread.java  | 36 ++
 .../accumulo/minicluster/MiniAccumuloRunner.java   |  7 +++--
 .../minicluster/impl/MiniAccumuloClusterImpl.java  |  2 +-
 .../main/java/org/apache/accumulo/proxy/Proxy.java |  4 +--
 .../java/org/apache/accumulo/server/Accumulo.java  |  2 +-
 .../accumulo/server/client/BulkImporter.java   |  2 +-
 .../java/org/apache/accumulo/server/util/Halt.java |  2 +-
 .../accumulo/server/util/MasterMetadataUtil.java   |  2 +-
 .../accumulo/server/util/MetadataTableUtil.java|  2 +-
 .../accumulo/server/util/ReplicationTableUtil.java |  2 +-
 .../accumulo/server/util/TabletIterator.java   |  2 +-
 .../apache/accumulo/gc/SimpleGarbageCollector.java |  2 +-
 .../java/org/apache/accumulo/master/Master.java|  2 +-
 .../master/MasterClientServiceHandler.java |  2 +-
 .../apache/accumulo/master/TabletGroupWatcher.java |  2 +-
 .../DistributedWorkQueueWorkAssigner.java  |  2 +-
 .../master/replication/UnorderedWorkAssigner.java  |  2 +-
 .../accumulo/master/replication/WorkDriver.java|  2 +-
 .../accumulo/master/tableOps/BulkImport.java   |  2 +-
 .../apache/accumulo/master/tableOps/LoadFiles.java |  2 +-
 .../java/org/apache/accumulo/monitor/Monitor.java  |  2 +-
 .../apache/accumulo/monitor/ZooKeeperStatus.java   |  2 +-
 .../org/apache/accumulo/tracer/TraceServer.java|  2 +-
 .../org/apache/accumulo/tserver/InMemoryMap.java   |  2 +-
 .../org/apache/accumulo/tserver/TabletServer.java  |  2 +-
 .../tserver/TabletServerResourceManager.java   |  2 +-
 .../accumulo/tserver/log/TabletServerLogger.java   |  2 +-
 .../tserver/replication/AccumuloReplicaSystem.java |  2 +-
 .../accumulo/tserver/tablet/DatafileManager.java   |  2 +-
 .../accumulo/tserver/tablet/MinorCompactor.java|  2 +-
 .../org/apache/accumulo/tserver/tablet/Tablet.java |  2 +-
 .../accumulo/shell/commands/TraceCommand.java  |  2 +-
 .../accumulo/test/BadDeleteMarkersCreatedIT.java   |  2 +-
 .../org/apache/accumulo/test/BalanceFasterIT.java  |  2 +-
 .../java/org/apache/accumulo/test/CleanWalIT.java  |  2 +-
 .../apache/accumulo/test/ConditionalWriterIT.java  |  2 +-
 .../apache/accumulo/test/GetFileInfoBulkIT.java|  4 +--
 .../org/apache/accumulo/test/IMMLGBenchmark.java   |  2 +-
 .../apache/accumulo/test/MetaGetsReadersIT.java|  2 +-
 .../apache/accumulo/test/MultiTableRecoveryIT.java |  2 +-
 .../org/apache/accumulo/test/NamespacesIT.java |  2 +-
 .../accumulo/test/NativeMapPerformanceTest.java|  2 +-
 .../org/apache/accumulo/test/ShellServerIT.java|  2 +-
 .../apache/accumulo/test/SplitCancelsMajCIT.java   |  2 +-
 .../org/apache/accumulo/test/SplitRecoveryIT.java  |  2 +-
 .../apache/accumulo/test/TableOperationsIT.java|  2 +-
 .../accumulo/test/TabletServerGivesUpIT.java   |  2 +-
 .../org/apache/accumulo/test/TotalQueuedIT.java|  2 +-
 .../test/TracerRecoversAfterOfflineTableIT.java|  2 +-
 .../accumulo/test/functional/AddSplitIT.java   |  2 +-
 .../test/functional/BadIteratorMincIT.java |  2 +-
 .../accumulo/test/functional/BatchScanSplitIT.java |  2 +-
 .../test/functional/BatchWriterFlushIT.java|  2 +-
 .../test/functional/BulkSplitOptimizationIT.java   |  2 +-
 .../accumulo/test/functional/CacheTestReader.java  |  2 +-
 .../accumulo/test/functional/CacheTestWriter.java  |  2 +-
 .../accumulo/test/functional/ClassLoaderIT.java|  2 +-
 .../accumulo/test/functional/ConcurrencyIT.java|  2 +-
 .../accumulo/test/functional/ConstraintIT.java |  2 +-
 .../test/functional/DeleteEverythingIT.java|  2 +-
 .../test/functional/DeleteRowsSplitIT.java |  2 +-
 .../test/func

[accumulo] branch master updated (2f6becc -> 1eead7b)

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git.


from 2f6becc  ACCUMULO-4703 New formatter version code changes
 new 6e2e2e7  ACCUMULO-4702 Merged up Guava changes from #299
 add d472fd2  ACCUMULO-4702 Checkstyle corrections
 add b25f679  ACCUMULO-4702 Removed Beta Guava dependencies
 add dea1937  Merge branch '1.7' into 1.8
 add b95db79  ACCUMULO-4702 Removed Beta Guava code where possible
 add 2962878  ACCUMULO-4702 Removed Beta Guava dependencies (#299)
 add 8fdfb3d  Merge branch '1.7' into 1.8
 new 1eead7b  Merge branch '1.8'

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../accumulo/core/client/IsolatedScanner.java  |  2 +-
 .../core/client/impl/ConditionalWriterImpl.java|  2 +-
 .../accumulo/core/client/impl/MasterClient.java|  2 +-
 .../accumulo/core/client/impl/OfflineIterator.java |  2 +-
 .../client/impl/ReplicationOperationsImpl.java |  2 +-
 .../core/client/impl/RootTabletLocator.java|  2 +-
 .../accumulo/core/client/impl/ServerClient.java|  2 +-
 .../core/client/impl/TableOperationsImpl.java  |  2 +-
 .../core/client/impl/TabletLocatorImpl.java|  2 +-
 .../apache/accumulo/core/client/impl/Writer.java   |  2 +-
 .../core/client/mapred/AbstractInputFormat.java|  2 +-
 .../core/client/mapreduce/AbstractInputFormat.java |  2 +-
 .../core/file/rfile/VisMetricsGatherer.java| 20 +++-
 .../accumulo/core/client/TestThrift1474.java   |  2 +-
 .../java/org/apache/accumulo/fate/ZooStore.java|  2 +-
 .../apache/accumulo/fate/util/UtilWaitThread.java  | 36 ++
 .../accumulo/minicluster/MiniAccumuloRunner.java   |  7 +++--
 .../minicluster/impl/MiniAccumuloClusterImpl.java  |  2 +-
 .../main/java/org/apache/accumulo/proxy/Proxy.java |  4 +--
 .../java/org/apache/accumulo/server/Accumulo.java  |  2 +-
 .../accumulo/server/client/BulkImporter.java   |  2 +-
 .../java/org/apache/accumulo/server/util/Halt.java |  2 +-
 .../accumulo/server/util/MasterMetadataUtil.java   |  2 +-
 .../accumulo/server/util/MetadataTableUtil.java|  2 +-
 .../accumulo/server/util/ReplicationTableUtil.java |  2 +-
 .../accumulo/server/util/TabletIterator.java   |  2 +-
 .../apache/accumulo/gc/SimpleGarbageCollector.java |  2 +-
 .../java/org/apache/accumulo/master/Master.java|  2 +-
 .../master/MasterClientServiceHandler.java |  2 +-
 .../apache/accumulo/master/TabletGroupWatcher.java |  2 +-
 .../DistributedWorkQueueWorkAssigner.java  |  2 +-
 .../master/replication/UnorderedWorkAssigner.java  |  2 +-
 .../accumulo/master/replication/WorkDriver.java|  2 +-
 .../accumulo/master/tableOps/BulkImport.java   |  2 +-
 .../apache/accumulo/master/tableOps/LoadFiles.java |  2 +-
 .../java/org/apache/accumulo/monitor/Monitor.java  |  2 +-
 .../apache/accumulo/monitor/ZooKeeperStatus.java   |  2 +-
 .../org/apache/accumulo/tracer/TraceServer.java|  2 +-
 .../org/apache/accumulo/tserver/InMemoryMap.java   |  2 +-
 .../org/apache/accumulo/tserver/TabletServer.java  |  2 +-
 .../tserver/TabletServerResourceManager.java   |  2 +-
 .../accumulo/tserver/log/TabletServerLogger.java   |  2 +-
 .../tserver/replication/AccumuloReplicaSystem.java |  2 +-
 .../accumulo/tserver/tablet/DatafileManager.java   |  2 +-
 .../accumulo/tserver/tablet/MinorCompactor.java|  2 +-
 .../org/apache/accumulo/tserver/tablet/Tablet.java |  2 +-
 .../accumulo/shell/commands/TraceCommand.java  |  2 +-
 .../accumulo/test/BadDeleteMarkersCreatedIT.java   |  2 +-
 .../org/apache/accumulo/test/BalanceFasterIT.java  |  2 +-
 .../java/org/apache/accumulo/test/CleanWalIT.java  |  2 +-
 .../apache/accumulo/test/ConditionalWriterIT.java  |  2 +-
 .../apache/accumulo/test/GetFileInfoBulkIT.java|  4 +--
 .../org/apache/accumulo/test/IMMLGBenchmark.java   |  2 +-
 .../apache/accumulo/test/MetaGetsReadersIT.java|  2 +-
 .../apache/accumulo/test/MultiTableRecoveryIT.java |  2 +-
 .../org/apache/accumulo/test/NamespacesIT.java |  2 +-
 .../accumulo/test/NativeMapPerformanceTest.java|  2 +-
 .../org/apache/accumulo/test/ShellServerIT.java|  2 +-
 .../apache/accumulo/test/SplitCancelsMajCIT.java   |  2 +-
 .../org/apache/accumulo/test/SplitRecoveryIT.java  |  2 +-
 .../apache/accumulo/test/TableOperationsIT.java|  2 +-
 .../accumulo/test/TabletServerGivesUpIT.java   |  2 +-
 .../org/apache/accumulo/test/TotalQueuedIT.java|  2 +-
 .../test/TracerRecoversAfterOfflineTableIT.java|  2 +-
 .../accumulo/test/functional/AddSplitIT.java   |  2 +-
 .../test/functional/BadIteratorMincIT.java |  2 +-
 .../accumulo/test/functional/B

[accumulo] 02/02: Merge branch '1.8'

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 1eead7b395e837a41cc5ee22309e9cf84923d375
Merge: 6e2e2e7 8fdfb3d
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Mon Sep 25 13:22:00 2017 -0400

Merge branch '1.8'


-- 
To stop receiving notification emails like this one, please contact
"commits@accumulo.apache.org" <commits@accumulo.apache.org>.

[accumulo] branch 1.8 updated (8a966a0 -> 8fdfb3d)

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a change to branch 1.8
in repository https://gitbox.apache.org/repos/asf/accumulo.git.


from 8a966a0  ACCUMULO-4702 Replaced uses of Guava HostAndPort
 add d472fd2  ACCUMULO-4702 Checkstyle corrections
 new b25f679  ACCUMULO-4702 Removed Beta Guava dependencies
 new dea1937  Merge branch '1.7' into 1.8
 new b95db79  ACCUMULO-4702 Removed Beta Guava code where possible
 add 2962878  ACCUMULO-4702 Removed Beta Guava dependencies (#299)
 new 8fdfb3d  Merge branch '1.7' into 1.8

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../accumulo/core/client/IsolatedScanner.java  |  2 +-
 .../core/client/impl/ConditionalWriterImpl.java|  2 +-
 .../accumulo/core/client/impl/MasterClient.java|  2 +-
 .../accumulo/core/client/impl/OfflineIterator.java |  2 +-
 .../client/impl/ReplicationOperationsImpl.java |  2 +-
 .../core/client/impl/RootTabletLocator.java|  2 +-
 .../accumulo/core/client/impl/ServerClient.java|  2 +-
 .../core/client/impl/TableOperationsImpl.java  |  2 +-
 .../core/client/impl/TabletLocatorImpl.java|  2 +-
 .../apache/accumulo/core/client/impl/Writer.java   |  2 +-
 .../core/client/mapred/AbstractInputFormat.java|  2 +-
 .../core/client/mapreduce/AbstractInputFormat.java |  2 +-
 .../core/file/rfile/VisMetricsGatherer.java| 20 +++-
 .../accumulo/core/client/TestThrift1474.java   |  2 +-
 .../java/org/apache/accumulo/fate/ZooStore.java|  2 +-
 .../apache/accumulo/fate/util/UtilWaitThread.java  | 36 ++
 .../accumulo/minicluster/MiniAccumuloRunner.java   |  7 +++--
 .../minicluster/impl/MiniAccumuloClusterImpl.java  |  4 +--
 .../main/java/org/apache/accumulo/proxy/Proxy.java |  4 +--
 .../java/org/apache/accumulo/server/Accumulo.java  |  2 +-
 .../accumulo/server/client/BulkImporter.java   |  2 +-
 .../java/org/apache/accumulo/server/util/Halt.java |  2 +-
 .../accumulo/server/util/MasterMetadataUtil.java   |  2 +-
 .../accumulo/server/util/MetadataTableUtil.java|  2 +-
 .../accumulo/server/util/ReplicationTableUtil.java |  2 +-
 .../accumulo/server/util/TabletIterator.java   |  2 +-
 .../apache/accumulo/gc/SimpleGarbageCollector.java |  2 +-
 .../java/org/apache/accumulo/master/Master.java|  2 +-
 .../master/MasterClientServiceHandler.java |  2 +-
 .../apache/accumulo/master/TabletGroupWatcher.java |  2 +-
 .../DistributedWorkQueueWorkAssigner.java  |  2 +-
 .../master/replication/UnorderedWorkAssigner.java  |  2 +-
 .../accumulo/master/replication/WorkDriver.java|  2 +-
 .../accumulo/master/tableOps/BulkImport.java   |  2 +-
 .../apache/accumulo/master/tableOps/LoadFiles.java |  2 +-
 .../java/org/apache/accumulo/monitor/Monitor.java  |  2 +-
 .../apache/accumulo/monitor/ZooKeeperStatus.java   |  2 +-
 .../org/apache/accumulo/tracer/TraceServer.java|  2 +-
 .../org/apache/accumulo/tserver/InMemoryMap.java   |  2 +-
 .../org/apache/accumulo/tserver/TabletServer.java  |  2 +-
 .../tserver/TabletServerResourceManager.java   |  2 +-
 .../accumulo/tserver/log/TabletServerLogger.java   |  2 +-
 .../tserver/replication/AccumuloReplicaSystem.java |  2 +-
 .../accumulo/tserver/tablet/DatafileManager.java   |  2 +-
 .../accumulo/tserver/tablet/MinorCompactor.java|  2 +-
 .../org/apache/accumulo/tserver/tablet/Tablet.java |  2 +-
 .../accumulo/shell/commands/TraceCommand.java  |  2 +-
 .../accumulo/test/BadDeleteMarkersCreatedIT.java   |  2 +-
 .../org/apache/accumulo/test/BalanceFasterIT.java  |  2 +-
 .../java/org/apache/accumulo/test/CleanWalIT.java  |  2 +-
 .../apache/accumulo/test/ConditionalWriterIT.java  |  2 +-
 .../apache/accumulo/test/GetFileInfoBulkIT.java|  4 +--
 .../org/apache/accumulo/test/IMMLGBenchmark.java   |  2 +-
 .../apache/accumulo/test/MetaGetsReadersIT.java|  2 +-
 .../apache/accumulo/test/MultiTableRecoveryIT.java |  2 +-
 .../org/apache/accumulo/test/NamespacesIT.java |  2 +-
 .../accumulo/test/NativeMapPerformanceTest.java|  2 +-
 .../org/apache/accumulo/test/ShellServerIT.java|  2 +-
 .../apache/accumulo/test/SplitCancelsMajCIT.java   |  2 +-
 .../org/apache/accumulo/test/SplitRecoveryIT.java  |  2 +-
 .../apache/accumulo/test/TableOperationsIT.java|  2 +-
 .../accumulo/test/TabletServerGivesUpIT.java   |  2 +-
 .../org/apache/accumulo/test/TotalQueuedIT.java|  2 +-
 .../test/TracerRecoversAfterOfflineTableIT.java|  2 +-
 .../test/continuous/ContinuousBatchWalker.java |  2 +-
 .../test/continuous/ContinuousScanner.java |  2 +-
 .../accumulo/test/functional/AddSplitIT.java   |  2 +-
 .../test/functional/BadIteratorMincIT.java |  2 +-
 .../accu

[accumulo] 04/04: Merge branch '1.7' into 1.8

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch 1.8
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 8fdfb3d6b2fb533bb2eccd6291e3aa7bced7f7ec
Merge: b95db79 2962878
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Mon Sep 25 12:16:31 2017 -0400

Merge branch '1.7' into 1.8

 .../java/org/apache/accumulo/fate/util/UtilWaitThread.java | 10 ++
 .../org/apache/accumulo/minicluster/MiniAccumuloRunner.java|  2 +-
 proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java   |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)


-- 
To stop receiving notification emails like this one, please contact
"commits@accumulo.apache.org" <commits@accumulo.apache.org>.

[accumulo] 01/04: ACCUMULO-4702 Removed Beta Guava dependencies

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch 1.8
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit b25f679af1ac2546b9a2c5d35006954a026bc7a7
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Thu Sep 14 11:48:00 2017 -0400

ACCUMULO-4702 Removed Beta Guava dependencies
---
 .../core/file/rfile/VisMetricsGatherer.java| 20 ++---
 .../java/org/apache/accumulo/fate/ZooStore.java|  2 +-
 .../apache/accumulo/fate/util/UtilWaitThread.java  | 26 ++
 .../accumulo/minicluster/MiniAccumuloRunner.java   |  7 +++---
 .../main/java/org/apache/accumulo/proxy/Proxy.java |  4 ++--
 5 files changed, 45 insertions(+), 14 deletions(-)

diff --git 
a/core/src/main/java/org/apache/accumulo/core/file/rfile/VisMetricsGatherer.java
 
b/core/src/main/java/org/apache/accumulo/core/file/rfile/VisMetricsGatherer.java
index 8c8c949..b648335 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/file/rfile/VisMetricsGatherer.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/file/rfile/VisMetricsGatherer.java
@@ -19,6 +19,8 @@ package org.apache.accumulo.core.file.rfile;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import java.io.PrintStream;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
@@ -30,9 +32,6 @@ import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Value;
 import org.apache.hadoop.io.Text;
 
-import com.google.common.hash.HashCode;
-import com.google.common.hash.HashFunction;
-import com.google.common.hash.Hashing;
 import com.google.common.util.concurrent.AtomicLongMap;
 
 /**
@@ -127,11 +126,16 @@ public class VisMetricsGatherer implements 
MetricsGatherer<Map<String,ArrayList<
   out.printf("%-27s", metricWord);
   out.println("Number of keys" + "\t   " + "Percent of keys" + "\t" + 
"Number of blocks" + "\t" + "Percent of blocks");
   for (Entry<String,Long> entry : metric.get(lGName).asMap().entrySet()) {
-HashFunction hf = Hashing.md5();
-HashCode hc = hf.newHasher().putString(entry.getKey(), UTF_8).hash();
-if (hash)
-  out.printf("%-20s", hc.toString().substring(0, 8));
-else
+if (hash) {
+  String md5String = "";
+  try {
+byte[] md5Bytes = 
MessageDigest.getInstance("MD5").digest(entry.getKey().getBytes(UTF_8));
+md5String = new String(md5Bytes, UTF_8);
+  } catch (NoSuchAlgorithmException e) {
+out.println("Failed to convert key to MD5 hash: " + 
e.getMessage());
+  }
+  out.printf("%-20s", md5String.substring(0, 8));
+} else
   out.printf("%-20s", entry.getKey());
 out.print("\t\t" + entry.getValue() + "\t\t\t");
 out.printf("%.2f", ((double) entry.getValue() / numEntries.get(i)) * 
100);
diff --git a/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java 
b/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
index ac18e83..68f1efd 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
@@ -16,8 +16,8 @@
  */
 package org.apache.accumulo.fate;
 
-import static 
com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
 import static java.nio.charset.StandardCharsets.UTF_8;
+import static 
org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git 
a/fate/src/main/java/org/apache/accumulo/fate/util/UtilWaitThread.java 
b/fate/src/main/java/org/apache/accumulo/fate/util/UtilWaitThread.java
index de31fb0..f8c18b0 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/util/UtilWaitThread.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/util/UtilWaitThread.java
@@ -16,6 +16,10 @@
  */
 package org.apache.accumulo.fate.util;
 
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
+
+import java.util.concurrent.TimeUnit;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -29,4 +33,26 @@ public class UtilWaitThread {
   log.error("{}", e.getMessage(), e);
 }
   }
+
+  public static void sleepUninterruptibly(long sleepFor, TimeUnit unit) {
+boolean interrupted = false;
+try {
+  long remainingNanos = unit.toNanos(sleepFor);
+  long end = System.nanoTime() + remainingNanos;
+  while (true) {
+try {
+  // TimeUnit.sleep() treats negative timeouts just like zero.
+  NANOSECONDS.sleep(remainingNanos);
+  return;
+} catch (InterruptedException e) {
+  interrupted = true;
+

[accumulo] 03/04: ACCUMULO-4702 Removed Beta Guava code where possible

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch 1.8
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit b95db79ec7ed0ab937fd186b650e67f52b0e7ce4
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Thu Sep 14 17:58:20 2017 -0400

ACCUMULO-4702 Removed Beta Guava code where possible
---
 .../main/java/org/apache/accumulo/core/client/IsolatedScanner.java| 2 +-
 .../org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java   | 2 +-
 .../main/java/org/apache/accumulo/core/client/impl/MasterClient.java  | 2 +-
 .../java/org/apache/accumulo/core/client/impl/OfflineIterator.java| 2 +-
 .../apache/accumulo/core/client/impl/ReplicationOperationsImpl.java   | 2 +-
 .../java/org/apache/accumulo/core/client/impl/RootTabletLocator.java  | 2 +-
 .../main/java/org/apache/accumulo/core/client/impl/ServerClient.java  | 2 +-
 .../org/apache/accumulo/core/client/impl/TableOperationsImpl.java | 2 +-
 .../java/org/apache/accumulo/core/client/impl/TabletLocatorImpl.java  | 2 +-
 core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java   | 2 +-
 .../org/apache/accumulo/core/client/mapred/AbstractInputFormat.java   | 2 +-
 .../apache/accumulo/core/client/mapreduce/AbstractInputFormat.java| 2 +-
 .../src/test/java/org/apache/accumulo/core/client/TestThrift1474.java | 2 +-
 .../org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java | 4 ++--
 server/base/src/main/java/org/apache/accumulo/server/Accumulo.java| 2 +-
 .../src/main/java/org/apache/accumulo/server/client/BulkImporter.java | 2 +-
 server/base/src/main/java/org/apache/accumulo/server/util/Halt.java   | 2 +-
 .../main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java | 2 +-
 .../main/java/org/apache/accumulo/server/util/MetadataTableUtil.java  | 2 +-
 .../java/org/apache/accumulo/server/util/ReplicationTableUtil.java| 2 +-
 .../src/main/java/org/apache/accumulo/server/util/TabletIterator.java | 2 +-
 .../src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java  | 2 +-
 server/master/src/main/java/org/apache/accumulo/master/Master.java| 2 +-
 .../java/org/apache/accumulo/master/MasterClientServiceHandler.java   | 2 +-
 .../src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java  | 2 +-
 .../accumulo/master/replication/DistributedWorkQueueWorkAssigner.java | 2 +-
 .../org/apache/accumulo/master/replication/UnorderedWorkAssigner.java | 2 +-
 .../main/java/org/apache/accumulo/master/replication/WorkDriver.java  | 2 +-
 .../src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java | 2 +-
 .../src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java  | 2 +-
 server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java | 2 +-
 .../src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java| 2 +-
 .../tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java  | 2 +-
 .../src/main/java/org/apache/accumulo/tserver/InMemoryMap.java| 2 +-
 .../src/main/java/org/apache/accumulo/tserver/TabletServer.java   | 2 +-
 .../java/org/apache/accumulo/tserver/TabletServerResourceManager.java | 2 +-
 .../main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java | 2 +-
 .../apache/accumulo/tserver/replication/AccumuloReplicaSystem.java| 2 +-
 .../main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java | 2 +-
 .../main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java  | 2 +-
 .../src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java  | 2 +-
 .../main/java/org/apache/accumulo/shell/commands/TraceCommand.java| 2 +-
 .../main/java/org/apache/accumulo/test/BadDeleteMarkersCreatedIT.java | 2 +-
 test/src/main/java/org/apache/accumulo/test/BalanceFasterIT.java  | 2 +-
 test/src/main/java/org/apache/accumulo/test/CleanWalIT.java   | 2 +-
 test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java  | 2 +-
 test/src/main/java/org/apache/accumulo/test/GetFileInfoBulkIT.java| 4 ++--
 test/src/main/java/org/apache/accumulo/test/IMMLGBenchmark.java   | 2 +-
 test/src/main/java/org/apache/accumulo/test/MetaGetsReadersIT.java| 2 +-
 test/src/main/java/org/apache/accumulo/test/MultiTableRecoveryIT.java | 2 +-
 test/src/main/java/org/apache/accumulo/test/NamespacesIT.java | 2 +-
 .../main/java/org/apache/accumulo/test/NativeMapPerformanceTest.java  | 2 +-
 test/src/main/java/org/apache/accumulo/test/ShellServerIT.java| 2 +-
 test/src/main/java/org/apache/accumulo/test/SplitCancelsMajCIT.java   | 2 +-
 test/src/main/java/org/apache/accumulo/test/SplitRecoveryIT.java  | 2 +-
 test/src/main/java/org/apache/accumulo/test/TableOperationsIT.java| 2 +-
 .../src/main/java/org/apache/accumulo/test/TabletServerGivesUpIT.java | 2 +-
 test/src/main/java/org/apache/accumulo/test/TotalQueuedIT.java| 2 +-
 .../org/apache/accumulo/test/TracerRecoversAfterOfflineTableIT.java   | 2 +-
 .../org/apache/ac

[accumulo] branch 1.7 updated: ACCUMULO-4702 Removed Beta Guava dependencies (#299)

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch 1.7
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/1.7 by this push:
 new 2962878  ACCUMULO-4702 Removed Beta Guava dependencies (#299)
2962878 is described below

commit 2962878f4297fd81d4790f0be2e92ecb3fd69e82
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Mon Sep 25 11:46:11 2017 -0400

ACCUMULO-4702 Removed Beta Guava dependencies (#299)

Code compiles against Guava 23 and passes beta library-detectors plugin
---
 .../core/file/rfile/VisMetricsGatherer.java| 20 +++-
 .../java/org/apache/accumulo/fate/ZooStore.java|  2 +-
 .../apache/accumulo/fate/util/UtilWaitThread.java  | 36 ++
 .../accumulo/minicluster/MiniAccumuloRunner.java   |  7 +++--
 .../main/java/org/apache/accumulo/proxy/Proxy.java |  4 +--
 5 files changed, 55 insertions(+), 14 deletions(-)

diff --git 
a/core/src/main/java/org/apache/accumulo/core/file/rfile/VisMetricsGatherer.java
 
b/core/src/main/java/org/apache/accumulo/core/file/rfile/VisMetricsGatherer.java
index 8c8c949..b648335 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/file/rfile/VisMetricsGatherer.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/file/rfile/VisMetricsGatherer.java
@@ -19,6 +19,8 @@ package org.apache.accumulo.core.file.rfile;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import java.io.PrintStream;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
@@ -30,9 +32,6 @@ import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Value;
 import org.apache.hadoop.io.Text;
 
-import com.google.common.hash.HashCode;
-import com.google.common.hash.HashFunction;
-import com.google.common.hash.Hashing;
 import com.google.common.util.concurrent.AtomicLongMap;
 
 /**
@@ -127,11 +126,16 @@ public class VisMetricsGatherer implements 
MetricsGatherer<Map<String,ArrayList<
   out.printf("%-27s", metricWord);
   out.println("Number of keys" + "\t   " + "Percent of keys" + "\t" + 
"Number of blocks" + "\t" + "Percent of blocks");
   for (Entry<String,Long> entry : metric.get(lGName).asMap().entrySet()) {
-HashFunction hf = Hashing.md5();
-HashCode hc = hf.newHasher().putString(entry.getKey(), UTF_8).hash();
-if (hash)
-  out.printf("%-20s", hc.toString().substring(0, 8));
-else
+if (hash) {
+  String md5String = "";
+  try {
+byte[] md5Bytes = 
MessageDigest.getInstance("MD5").digest(entry.getKey().getBytes(UTF_8));
+md5String = new String(md5Bytes, UTF_8);
+  } catch (NoSuchAlgorithmException e) {
+out.println("Failed to convert key to MD5 hash: " + 
e.getMessage());
+  }
+  out.printf("%-20s", md5String.substring(0, 8));
+} else
   out.printf("%-20s", entry.getKey());
 out.print("\t\t" + entry.getValue() + "\t\t\t");
 out.printf("%.2f", ((double) entry.getValue() / numEntries.get(i)) * 
100);
diff --git a/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java 
b/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
index ac18e83..68f1efd 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
@@ -16,8 +16,8 @@
  */
 package org.apache.accumulo.fate;
 
-import static 
com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
 import static java.nio.charset.StandardCharsets.UTF_8;
+import static 
org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git 
a/fate/src/main/java/org/apache/accumulo/fate/util/UtilWaitThread.java 
b/fate/src/main/java/org/apache/accumulo/fate/util/UtilWaitThread.java
index de31fb0..8a14ded 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/util/UtilWaitThread.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/util/UtilWaitThread.java
@@ -16,6 +16,10 @@
  */
 package org.apache.accumulo.fate.util;
 
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
+
+import java.util.concurrent.TimeUnit;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -29,4 +33,36 @@ public class UtilWaitThread {
   log.error("{}", e.getMessage(), e);
 }
   }
+
+  /**
+   * Copied from Guava release 23. The Uniterruptibles class was annotated as 
Beta by Google, therefore unstable to use. The following javadoc was copied from
+   * com.google.common.util.concurrent.Uninterruptibles:
+   

[accumulo] 02/02: ACCUMULO-4703 New formatter version code changes

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 2f6becc17470132cf8cf1afea1de90a8dff61ced
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Fri Sep 22 16:58:17 2017 -0400

ACCUMULO-4703 New formatter version code changes
---
 .../main/java/org/apache/accumulo/core/client/impl/Namespace.java | 1 -
 .../src/main/java/org/apache/accumulo/core/client/impl/Table.java | 1 -
 .../main/java/org/apache/accumulo/core/client/impl/Tables.java| 1 -
 .../java/org/apache/accumulo/core/conf/SiteConfigurationTest.java | 1 -
 .../java/org/apache/accumulo/iteratortest/IteratorTestOutput.java | 8 
 .../main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java  | 1 -
 .../org/apache/accumulo/test/functional/ChaoticBalancerIT.java| 1 -
 7 files changed, 4 insertions(+), 10 deletions(-)

diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/impl/Namespace.java 
b/core/src/main/java/org/apache/accumulo/core/client/impl/Namespace.java
index 83edeee..56d7073 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/Namespace.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/Namespace.java
@@ -60,6 +60,5 @@ public class Namespace {
 throw new AssertionError("This should never happen: ID constructor 
should never return null.");
   }
 }
-
   }
 }
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/Table.java 
b/core/src/main/java/org/apache/accumulo/core/client/impl/Table.java
index 74d783d..15517d9 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/Table.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/Table.java
@@ -58,7 +58,6 @@ public class Table {
 throw new AssertionError("This should never happen: ID constructor 
should never return null.");
   }
 }
-
   }
 
 }
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java 
b/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
index dfdc170..512c875 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
@@ -306,5 +306,4 @@ public class Tables {
 
 return singleName.get(0);
   }
-
 }
diff --git 
a/core/src/test/java/org/apache/accumulo/core/conf/SiteConfigurationTest.java 
b/core/src/test/java/org/apache/accumulo/core/conf/SiteConfigurationTest.java
index b42abca..92a0da4 100644
--- 
a/core/src/test/java/org/apache/accumulo/core/conf/SiteConfigurationTest.java
+++ 
b/core/src/test/java/org/apache/accumulo/core/conf/SiteConfigurationTest.java
@@ -71,5 +71,4 @@ public class SiteConfigurationTest {
 Assert.assertEquals(null, props.get("ignored.property"));
 Assert.assertEquals(Property.GENERAL_RPC_TIMEOUT.getDefaultValue(), 
props.get(Property.GENERAL_RPC_TIMEOUT.getKey()));
   }
-
 }
diff --git 
a/iterator-test-harness/src/main/java/org/apache/accumulo/iteratortest/IteratorTestOutput.java
 
b/iterator-test-harness/src/main/java/org/apache/accumulo/iteratortest/IteratorTestOutput.java
index 4b670bb..cf1e50c 100644
--- 
a/iterator-test-harness/src/main/java/org/apache/accumulo/iteratortest/IteratorTestOutput.java
+++ 
b/iterator-test-harness/src/main/java/org/apache/accumulo/iteratortest/IteratorTestOutput.java
@@ -39,11 +39,11 @@ public class IteratorTestOutput {
  * The IteratorTestCase proactively passed.
  */
 PASSED, /**
- * The IteratorTestCase proactively failed.
- */
+ * The IteratorTestCase proactively failed.
+ */
 FAILED, /**
- * The IteratorTestCase completed, but the pass/fail should be determined 
by the other context.
- */
+ * The IteratorTestCase completed, but the pass/fail should be 
determined by the other context.
+ */
 COMPLETED
   }
 
diff --git 
a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java 
b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
index 7c9498d..47b5292 100644
--- a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
@@ -492,7 +492,6 @@ public class SimpleGarbageCollector extends 
AccumuloServerContext implements Ifa
 return Collections.emptyIterator();
   }
 }
-
   }
 
   private void run() {
diff --git 
a/test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java 
b/test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java
index d7e5129..7532b54 100644
--- 
a/test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java
@@ -79,5 +79,4 @@ public class ChaoticBalancerIT extends AccumuloClusterHarne

[accumulo] 01/02: ACCUMULO-4703 Updated mvn formatter plugin 2.0.1

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit ed0204b15e2243ea2ab23ae9d0eced8a5d332156
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Fri Sep 22 16:52:09 2017 -0400

ACCUMULO-4703 Updated mvn formatter plugin 2.0.1
---
 pom.xml | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4f3625e..7e267b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -944,9 +944,9 @@
   1.0.1
 
 
-  com.googlecode.maven-java-formatter-plugin
-  maven-java-formatter-plugin
-  0.4
+  net.revelc.code.formatter
+  formatter-maven-plugin
+  2.0.1
   
 ${maven.compiler.source}
 ${maven.compiler.source}
@@ -1343,8 +1343,8 @@
 
 
   
-
com.googlecode.maven-java-formatter-plugin
-maven-java-formatter-plugin
+net.revelc.code.formatter
+formatter-maven-plugin
 [0,)
 
   format
@@ -1603,8 +1603,8 @@
 
   
   
-com.googlecode.maven-java-formatter-plugin
-maven-java-formatter-plugin
+net.revelc.code.formatter
+formatter-maven-plugin
 
   ${eclipseFormatterStyle}
 

-- 
To stop receiving notification emails like this one, please contact
"commits@accumulo.apache.org" <commits@accumulo.apache.org>.

[accumulo] branch master updated: ACCUMULO-4703 Move mvn prereq to maven-plugin

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
 new 2a91243  ACCUMULO-4703 Move mvn prereq to maven-plugin
2a91243 is described below

commit 2a912439cd2608fbde502815b41a6b466549a041
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Thu Sep 21 13:13:40 2017 -0400

ACCUMULO-4703 Move mvn prereq to maven-plugin
---
 maven-plugin/pom.xml | 3 +++
 pom.xml  | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index e87d533..dc0a687 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -26,6 +26,9 @@
   maven-plugin
   Apache Accumulo Maven Plugin
   An Apache Maven plugin for testing software against a test 
Apache Accumulo instance.
+  
+${maven.min-version}
+  
   
 
   commons-io
diff --git a/pom.xml b/pom.xml
index 5510ff7..4f3625e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,9 +76,6 @@
   
https://lists.apache.org/list.html?notificati...@accumulo.apache.org
 
   
-  
-${maven.min-version}
-  
   
 assemble
 core

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo] branch master updated: ACCUMULO-4703 Update maven min version

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
 new 0039ec1  ACCUMULO-4703 Update maven min version
0039ec1 is described below

commit 0039ec1b69f68e07494dc47bd5c8a761f8002c7e
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Wed Sep 20 15:59:49 2017 -0400

ACCUMULO-4703 Update maven min version
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b0e224c..5510ff7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,7 +142,7 @@
 1.8
 1.8
 
-3.0.5
+3.2.5
 
 
true
 1.6.5

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo] branch master updated: ACCUMULO-4703 Upgraded Zookeeper to 3.4.10

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
 new a88bb51  ACCUMULO-4703 Upgraded Zookeeper to 3.4.10
a88bb51 is described below

commit a88bb51e2ff4f6fc2658d7b6efe9d6716e2ad6a9
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Tue Sep 19 17:54:44 2017 -0400

ACCUMULO-4703 Upgraded Zookeeper to 3.4.10
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 80a06be..b0e224c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -157,7 +157,7 @@
 
 0.10.0
 
-3.4.6
+3.4.10
   
   
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo] branch master updated: ACCUMULO-4703 Upgraded bouncycastle to 1.58

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
 new 0028bb4  ACCUMULO-4703 Upgraded bouncycastle to 1.58
0028bb4 is described below

commit 0028bb445bb5820f6fa36eba21f3236833790722
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Tue Sep 19 17:28:20 2017 -0400

ACCUMULO-4703 Upgraded bouncycastle to 1.58
---
 pom.xml  |  2 +-
 .../main/java/org/apache/accumulo/test/util/CertUtils.java   | 12 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2b36346..80a06be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,7 +118,7 @@
 false
 posix
 
-1.54
+1.58
 
 2.11.0
 
diff --git a/test/src/main/java/org/apache/accumulo/test/util/CertUtils.java 
b/test/src/main/java/org/apache/accumulo/test/util/CertUtils.java
index f2e1178..876a686 100644
--- a/test/src/main/java/org/apache/accumulo/test/util/CertUtils.java
+++ b/test/src/main/java/org/apache/accumulo/test/util/CertUtils.java
@@ -60,10 +60,10 @@ import org.bouncycastle.asn1.x509.Extension;
 import org.bouncycastle.asn1.x509.KeyUsage;
 import org.bouncycastle.cert.CertIOException;
 import org.bouncycastle.cert.X509CertificateHolder;
+import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
 import org.bouncycastle.cert.jcajce.JcaX509ExtensionUtils;
 import org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.provider.X509CertificateObject;
 import org.bouncycastle.operator.OperatorCreationException;
 import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
 import org.slf4j.Logger;
@@ -250,7 +250,7 @@ public class CertUtils {
 PrivateKey signerKey = findPrivateKey(signerKeystore, signerPasswordArray);
 
 KeyPair kp = generateKeyPair();
-X509CertificateObject cert = generateCert(keyName, kp, false, 
signerCert.getPublicKey(), signerKey);
+Certificate cert = generateCert(kp, false, signerCert.getPublicKey(), 
signerKey);
 
 char[] password = keystorePassword.toCharArray();
 KeyStore keystore = KeyStore.getInstance(keystoreType);
@@ -270,7 +270,7 @@ public class CertUtils {
 
 KeyPair kp = generateKeyPair();
 
-X509CertificateObject cert = generateCert(keyName, kp, true, 
kp.getPublic(), kp.getPrivate());
+Certificate cert = generateCert(kp, true, kp.getPublic(), kp.getPrivate());
 
 char[] password = keystorePassword.toCharArray();
 KeyStore keystore = KeyStore.getInstance(keystoreType);
@@ -288,8 +288,8 @@ public class CertUtils {
 return gen.generateKeyPair();
   }
 
-  private X509CertificateObject generateCert(String keyName, KeyPair kp, 
boolean isCertAuthority, PublicKey signerPublicKey, PrivateKey signerPrivateKey)
-  throws IOException, CertIOException, OperatorCreationException, 
CertificateException, NoSuchAlgorithmException {
+  private Certificate generateCert(KeyPair kp, boolean isCertAuthority, 
PublicKey signerPublicKey, PrivateKey signerPrivateKey) throws IOException,
+  CertIOException, OperatorCreationException, CertificateException, 
NoSuchAlgorithmException {
 Calendar startDate = Calendar.getInstance();
 Calendar endDate = Calendar.getInstance();
 endDate.add(Calendar.YEAR, 100);
@@ -305,7 +305,7 @@ public class CertUtils {
   certGen.addExtension(Extension.keyUsage, true, new 
KeyUsage(KeyUsage.keyCertSign));
 }
 X509CertificateHolder cert = certGen.build(new 
JcaContentSignerBuilder(signingAlgorithm).build(signerPrivateKey));
-return new X509CertificateObject(cert.toASN1Structure());
+return new JcaX509CertificateConverter().getCertificate(cert);
   }
 
   static Certificate findCert(KeyStore keyStore) throws KeyStoreException {

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

[accumulo] branch 1.7 updated: ACCUMULO-4702 Checkstyle corrections

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch 1.7
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/1.7 by this push:
 new d472fd2  ACCUMULO-4702 Checkstyle corrections
d472fd2 is described below

commit d472fd2a43c30d2920fc4bf347ade5194ec84b41
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Thu Sep 14 10:26:11 2017 -0400

ACCUMULO-4702 Checkstyle corrections
---
 .../main/java/org/apache/accumulo/core/util/HostAndPort.java   | 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/org/apache/accumulo/core/util/HostAndPort.java 
b/core/src/main/java/org/apache/accumulo/core/util/HostAndPort.java
index bae98be..59cb652 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/HostAndPort.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/HostAndPort.java
@@ -22,15 +22,13 @@ import java.io.Serializable;
 import com.google.common.base.Strings;
 
 /**
- * This class was copied from Guava release 23.0 to replace the older Guava 14 
version that had been used in Accumulo.
- * It was annotated as Beta by Google, therefore unstable to use in a core 
Accumulo library.  We learned this the hard
- * way when Guava version 20 deprecated the getHostText method and then 
removed the method all together in version 22.
- * See ACCUMULO-4702
+ * This class was copied from Guava release 23.0 to replace the older Guava 14 
version that had been used in Accumulo. It was annotated as Beta by Google,
+ * therefore unstable to use in a core Accumulo library. We learned this the 
hard way when Guava version 20 deprecated the getHostText method and then 
removed
+ * the method all together in version 22. See ACCUMULO-4702
  *
  * Unused methods and annotations were removed to reduce maintenance costs.
  *
- * Javadoc from Guava 23.0 release:
- * An immutable representation of a host and port.
+ * Javadoc from Guava 23.0 release: An immutable representation of a host and 
port.
  *
  * 
  * Example usage:

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].