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

[elserj]

Merge branch '1.6' into 1.7

Conflicts:
        
server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java


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

Branch: refs/heads/1.7
Commit: 99c734c8c5c389ea600fe08117c183365c89d8b8
Parents: d71e5ee 9a4dd30
Author: Josh Elser <els...@apache.org>
Authored: Mon Jun 1 18:37:30 2015 -0400
Committer: Josh Elser <els...@apache.org>
Committed: Mon Jun 1 18:37:30 2015 -0400

----------------------------------------------------------------------
 .../java/org/apache/accumulo/tserver/TabletServer.java   | 11 -----------
 1 file changed, 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/99c734c8/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
----------------------------------------------------------------------
diff --cc 
server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index df0848d,128aaa9..b4c5e5f
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@@ -1380,30 -2203,21 +1380,19 @@@ public class TabletServer extends Accum
        return result;
      }
  
 -    private ZooCache masterLockCache = new ZooCache();
 -
      private void checkPermission(TCredentials credentials, String lock, final 
String request) throws ThriftSecurityException {
-       boolean fatal = false;
        try {
 -        log.debug("Got " + request + " message from user: " + 
credentials.getPrincipal());
 +        log.trace("Got " + request + " message from user: " + 
credentials.getPrincipal());
          if (!security.canPerformSystemActions(credentials)) {
            log.warn("Got " + request + " message from user: " + 
credentials.getPrincipal());
            throw new ThriftSecurityException(credentials.getPrincipal(), 
SecurityErrorCode.PERMISSION_DENIED);
          }
        } catch (ThriftSecurityException e) {
          log.warn("Got " + request + " message from unauthenticatable user: " 
+ e.getUser());
 -        if 
(SystemCredentials.get().getToken().getClass().getName().equals(credentials.getTokenClassName()))
 {
 -          log.fatal("Got message from a service with a mismatched 
configuration. Please ensure a compatible configuration.", e);
 +        if 
(getCredentials().getToken().getClass().getName().equals(credentials.getTokenClassName()))
 {
 +          log.error("Got message from a service with a mismatched 
configuration. Please ensure a compatible configuration.", e);
-           fatal = true;
          }
          throw e;
-       } finally {
-         if (fatal) {
-           Halt.halt(1, new Runnable() {
-             @Override
-             public void run() {
-               gcLogger.logGCInfo(TabletServer.this.getConfiguration());
-             }
-           });
-         }
        }
  
        if (tabletServerLock == null || !tabletServerLock.wasLockAcquired()) {