accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mwa...@apache.org
Subject [accumulo] branch master updated: Remove unnecessary exceptions (#844)
Date Wed, 19 Dec 2018 22:48:08 GMT
This is an automated email from the ASF dual-hosted git repository.

mwalch 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 7abe4e8  Remove unnecessary exceptions (#844)
7abe4e8 is described below

commit 7abe4e8dc73e14bc25524587924781e2f9d322bc
Author: Mike Walch <mwalch@apache.org>
AuthorDate: Wed Dec 19 17:48:04 2018 -0500

    Remove unnecessary exceptions (#844)
---
 .../org/apache/accumulo/proxy/ProxyServerTest.java |  3 -
 .../accumulo/server/client/BulkImporter.java       |  7 +-
 .../server/client/ClientServiceHandler.java        |  2 +-
 .../accumulo/server/conf/ConfigSanityCheck.java    |  2 +-
 .../apache/accumulo/server/fs/VolumeManager.java   |  2 +-
 .../apache/accumulo/server/init/Initialize.java    |  3 +-
 .../accumulo/server/master/LiveTServerSet.java     |  4 +-
 .../server/master/recovery/MapRLogCloser.java      |  2 +-
 .../server/master/recovery/RecoveryPath.java       |  4 +-
 .../server/master/state/TabletStateStore.java      |  3 +-
 .../accumulo/server/master/state/ZooStore.java     |  3 +-
 .../server/master/state/ZooTabletStateStore.java   | 10 +--
 .../server/problems/ProblemReportingIterator.java  |  2 +-
 .../accumulo/server/problems/ProblemReports.java   |  4 +-
 .../server/replication/ReplicaSystemHelper.java    |  3 +-
 .../server/security/SecurityOperation.java         | 82 +++++++---------------
 .../server/security/handler/Authenticator.java     |  8 +--
 .../server/security/handler/Authorizor.java        |  8 +--
 .../security/handler/InsecureAuthenticator.java    | 14 ++--
 .../security/handler/InsecurePermHandler.java      | 52 +++++---------
 .../security/handler/KerberosAuthenticator.java    | 11 ++-
 .../security/handler/KerberosAuthorizor.java       |  8 +--
 .../handler/KerberosPermissionHandler.java         | 20 +++---
 .../server/security/handler/PermissionHandler.java | 20 +++---
 .../server/security/handler/ZKAuthenticator.java   |  3 +-
 .../server/security/handler/ZKAuthorizor.java      |  3 +-
 .../server/security/handler/ZKPermHandler.java     | 13 ++--
 .../server/tablets/UniqueNameAllocator.java        |  2 +-
 .../org/apache/accumulo/server/util/Admin.java     |  6 +-
 .../server/util/CheckForMetadataProblems.java      |  4 +-
 .../apache/accumulo/server/util/DumpZookeeper.java |  6 +-
 .../accumulo/server/util/FindOfflineTablets.java   | 12 +---
 .../accumulo/server/util/MasterMetadataUtil.java   | 10 ++-
 .../accumulo/server/util/MetadataTableUtil.java    | 20 +++---
 .../accumulo/server/util/RestoreZookeeper.java     |  6 +-
 .../org/apache/accumulo/server/AccumuloTest.java   |  2 +-
 .../org/apache/accumulo/server/ServerOptsTest.java |  2 +-
 .../accumulo/server/client/BulkImporterTest.java   | 13 ++--
 .../conf/ServerConfigurationFactoryTest.java       |  6 +-
 .../constraints/MetadataConstraintsTest.java       |  4 +-
 .../server/fs/PerTableVolumeChooserTest.java       | 20 +++---
 .../server/fs/PreferredVolumeChooserTest.java      | 24 +++----
 .../accumulo/server/fs/VolumeManagerImplTest.java  |  8 +--
 .../apache/accumulo/server/fs/VolumeUtilTest.java  |  2 +-
 .../accumulo/server/init/InitializeTest.java       |  2 +-
 .../iterators/MetadataBulkLoadFilterTest.java      |  4 +-
 .../BaseHostRegexTableLoadBalancerTest.java        |  5 +-
 .../master/balancer/ChaoticLoadBalancerTest.java   |  5 +-
 .../master/balancer/DefaultLoadBalancerTest.java   |  5 +-
 ...tRegexTableLoadBalancerReconfigurationTest.java |  5 +-
 .../balancer/HostRegexTableLoadBalancerTest.java   |  4 +-
 .../master/balancer/TableLoadBalancerTest.java     | 12 ++--
 .../server/master/state/MergeInfoTest.java         |  4 +-
 .../master/state/TabletLocationStateTest.java      |  2 +-
 .../server/problems/ProblemReportTest.java         |  2 +-
 .../problems/ProblemReportingIteratorTest.java     |  4 +-
 .../server/rpc/SaslDigestCallbackHandlerTest.java  |  3 +-
 .../server/security/UserImpersonationTest.java     |  2 +-
 .../ZooAuthenticationKeyWatcherTest.java           |  8 +--
 .../accumulo/server/tablets/LogicalTimeTest.java   |  2 +-
 .../accumulo/server/tablets/MillisTimeTest.java    |  2 +-
 .../accumulo/server/tablets/TabletTimeTest.java    |  2 +-
 .../server/zookeeper/TransactionWatcherTest.java   |  4 +-
 .../java/org/apache/accumulo/gc/GCExecutable.java  |  4 +-
 .../accumulo/gc/GarbageCollectWriteAheadLogs.java  | 13 ++--
 .../accumulo/gc/GarbageCollectionAlgorithm.java    | 17 ++---
 .../accumulo/gc/GarbageCollectionEnvironment.java  | 16 ++---
 .../apache/accumulo/gc/SimpleGarbageCollector.java | 19 ++---
 .../gc/GarbageCollectWriteAheadLogsTest.java       | 18 ++---
 .../apache/accumulo/gc/GarbageCollectionTest.java  |  5 +-
 .../accumulo/gc/SimpleGarbageCollectorTest.java    |  2 +-
 .../java/org/apache/accumulo/master/Master.java    | 19 ++---
 .../master/MasterClientServiceHandler.java         |  9 ++-
 .../apache/accumulo/master/TabletGroupWatcher.java |  2 +-
 .../master/metrics/Metrics2ReplicationMetrics.java |  2 +-
 .../accumulo/master/recovery/RecoveryManager.java  |  2 +-
 .../accumulo/master/replication/WorkDriver.java    |  4 +-
 .../accumulo/master/tableOps/ChangeTableState.java |  4 +-
 .../org/apache/accumulo/master/tableOps/Utils.java | 10 ++-
 .../master/tableOps/bulkVer1/CopyFailed.java       |  2 +-
 .../master/tableOps/bulkVer1/LoadFiles.java        |  2 +-
 .../master/tableOps/bulkVer2/LoadFiles.java        |  2 +-
 .../master/tableOps/bulkVer2/PrepBulkImport.java   |  2 +-
 .../master/tableOps/clone/CloneMetadata.java       |  2 +-
 .../master/tableOps/clone/ClonePermissions.java    |  2 +-
 .../accumulo/master/tableOps/clone/CloneTable.java |  2 +-
 .../master/tableOps/clone/FinishCloneTable.java    |  6 +-
 .../master/tableOps/compact/CompactRange.java      |  2 +-
 .../master/tableOps/compact/CompactionDriver.java  |  2 +-
 .../tableOps/compact/cancel/CancelCompactions.java |  4 +-
 .../compact/cancel/FinishCancelCompaction.java     |  4 +-
 .../accumulo/master/tableOps/create/ChooseDir.java |  2 +-
 .../accumulo/master/tableOps/create/CreateDir.java |  2 +-
 .../master/tableOps/create/CreateTable.java        |  2 +-
 .../master/tableOps/create/FinishCreateTable.java  |  4 +-
 .../master/tableOps/create/PopulateMetadata.java   |  2 +-
 .../accumulo/master/tableOps/delete/CleanUp.java   |  4 +-
 .../master/tableOps/delete/DeleteTable.java        |  4 +-
 .../master/tableOps/merge/TableRangeOp.java        |  2 +-
 .../master/tableOps/merge/TableRangeOpWait.java    |  2 +-
 .../tableOps/namespace/create/CreateNamespace.java |  4 +-
 .../namespace/create/FinishCreateNamespace.java    |  6 +-
 .../tableOps/namespace/delete/DeleteNamespace.java |  4 +-
 .../namespace/delete/NamespaceCleanUp.java         |  6 +-
 .../tableOps/namespace/rename/RenameNamespace.java |  2 +-
 .../master/tableOps/rename/RenameTable.java        |  2 +-
 .../master/tableOps/tableExport/ExportTable.java   |  7 +-
 .../tableOps/tableExport/WriteExportFiles.java     |  2 +-
 .../tableOps/tableImport/FinishImportTable.java    |  4 +-
 .../tableImport/ImportSetupPermissions.java        |  2 +-
 .../master/tserverOps/ShutdownTServer.java         |  4 +-
 .../replication/SequentialWorkAssignerTest.java    |  4 +-
 .../replication/UnorderedWorkAssignerTest.java     |  2 +-
 .../accumulo/master/replication/WorkMakerTest.java |  2 +-
 .../master/state/RootTabletStateStoreTest.java     |  8 +--
 .../java/org/apache/accumulo/monitor/Monitor.java  |  2 +-
 .../apache/accumulo/monitor/MonitorExecutable.java |  2 +-
 .../monitor/util/ParameterValidatorTest.java       |  2 +-
 .../apache/accumulo/tracer/AsyncSpanReceiver.java  |  2 +-
 .../apache/accumulo/tracer/SendSpansViaThrift.java |  2 +-
 .../org/apache/accumulo/tracer/TraceServer.java    |  9 ++-
 .../accumulo/tracer/AsyncSpanReceiverTest.java     |  4 +-
 .../org/apache/accumulo/tracer/TracerTest.java     |  5 +-
 .../apache/accumulo/tserver/CompactionQueue.java   |  5 +-
 .../org/apache/accumulo/tserver/NativeMap.java     |  8 +--
 .../org/apache/accumulo/tserver/TabletServer.java  | 57 ++++++---------
 .../accumulo/tserver/TservConstraintEnv.java       |  9 +--
 .../compaction/EverythingCompactionStrategy.java   |  6 +-
 .../tserver/compaction/MajorCompactionRequest.java |  2 +-
 .../strategies/ConfigurableCompactionStrategy.java | 14 ++--
 .../org/apache/accumulo/tserver/log/DfsLogger.java |  7 +-
 .../accumulo/tserver/log/TabletServerLogger.java   | 20 +++---
 .../tserver/replication/AccumuloReplicaSystem.java |  2 +-
 .../BatchWriterReplicationReplayer.java            |  4 +-
 .../replication/ReplicationServicerHandler.java    |  3 +-
 .../accumulo/tserver/tablet/DatafileManager.java   |  2 +-
 .../org/apache/accumulo/tserver/tablet/Tablet.java |  2 +-
 .../accumulo/tserver/tablet/TabletMemory.java      |  3 +-
 .../apache/accumulo/tserver/InMemoryMapTest.java   |  4 +-
 .../tserver/LargestFirstMemoryManagerTest.java     |  4 +-
 .../org/apache/accumulo/tserver/MemValueTest.java  |  2 +-
 .../tserver/TabletResourceManagerTest.java         |  2 +-
 .../tserver/TabletServerSyncCheckTest.java         | 38 +++++-----
 .../accumulo/tserver/TservConstraintEnvTest.java   |  3 +-
 .../accumulo/tserver/WalRemovalOrderTest.java      |  9 +--
 .../compaction/DefaultCompactionStrategyTest.java  | 26 +++----
 .../SizeLimitCompactionStrategyTest.java           |  3 +-
 .../compaction/TwoTierCompactionStrategyTest.java  |  7 +-
 .../ConfigurableCompactionStrategyTest.java        |  2 +-
 .../tserver/constraints/ConstraintCheckerTest.java |  2 +-
 .../replication/AccumuloReplicaSystemTest.java     |  4 +-
 .../tserver/tablet/DatafileManagerTest.java        |  9 ++-
 .../test/replication/MockReplicaSystem.java        |  3 +-
 153 files changed, 417 insertions(+), 654 deletions(-)

diff --git a/proxy/src/test/java/org/apache/accumulo/proxy/ProxyServerTest.java b/proxy/src/test/java/org/apache/accumulo/proxy/ProxyServerTest.java
index 76ef4be..fcae2cf 100644
--- a/proxy/src/test/java/org/apache/accumulo/proxy/ProxyServerTest.java
+++ b/proxy/src/test/java/org/apache/accumulo/proxy/ProxyServerTest.java
@@ -32,9 +32,6 @@ import org.apache.accumulo.proxy.thrift.WriterOptions;
 import org.easymock.EasyMock;
 import org.junit.Test;
 
-/**
- *
- */
 public class ProxyServerTest {
 
   @Test
diff --git a/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java b/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
index 1b9323a..3ac6bcd 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
@@ -45,7 +45,6 @@ import org.apache.accumulo.core.clientImpl.Translator;
 import org.apache.accumulo.core.clientImpl.Translators;
 import org.apache.accumulo.core.clientImpl.thrift.ClientService;
 import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException;
-import org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException;
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.data.ByteSequence;
@@ -81,8 +80,7 @@ public class BulkImporter {
   private static final Logger log = LoggerFactory.getLogger(BulkImporter.class);
 
   public static List<String> bulkLoad(ServerContext context, long tid, String tableId,
-      List<String> files, String errorDir, boolean setTime) throws IOException, AccumuloException,
-      AccumuloSecurityException, ThriftTableOperationException {
+      List<String> files, String errorDir, boolean setTime) throws IOException {
     AssignmentStats stats = new BulkImporter(context, tid, tableId, setTime).importFiles(files,
         new Path(errorDir));
     List<String> result = new ArrayList<>();
@@ -110,8 +108,7 @@ public class BulkImporter {
     this.setTime = setTime;
   }
 
-  public AssignmentStats importFiles(List<String> files, Path failureDir) throws IOException,
-      AccumuloException, AccumuloSecurityException, ThriftTableOperationException {
+  public AssignmentStats importFiles(List<String> files, Path failureDir) throws IOException {
 
     int numThreads = context.getConfiguration().getCount(Property.TSERV_BULK_PROCESS_THREADS);
     int numAssignThreads = context.getConfiguration()
diff --git a/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java b/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
index e6a1399..f2d4981 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
@@ -355,7 +355,7 @@ public class ClientServiceHandler implements ClientService.Iface {
   }
 
   @Override
-  public boolean isActive(TInfo tinfo, long tid) throws TException {
+  public boolean isActive(TInfo tinfo, long tid) {
     return transactionWatcher.isActive(tid);
   }
 
diff --git a/server/base/src/main/java/org/apache/accumulo/server/conf/ConfigSanityCheck.java b/server/base/src/main/java/org/apache/accumulo/server/conf/ConfigSanityCheck.java
index ff5402c..fcffcfb 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/conf/ConfigSanityCheck.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/conf/ConfigSanityCheck.java
@@ -42,7 +42,7 @@ public class ConfigSanityCheck implements KeywordExecutable {
   }
 
   @Override
-  public void execute(String[] args) throws Exception {
+  public void execute(String[] args) {
     main(args);
   }
 
diff --git a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManager.java b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManager.java
index b9b8c96..3e72829 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManager.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManager.java
@@ -158,7 +158,7 @@ public interface VolumeManager {
   Path getFullPath(Table.ID tableId, String path);
 
   // Given a filename, figure out the qualified path given multiple namespaces
-  Path getFullPath(FileType fileType, String fileName) throws IOException;
+  Path getFullPath(FileType fileType, String fileName);
 
   // forward to the appropriate FileSystem object
   ContentSummary getContentSummary(Path dir) throws IOException;
diff --git a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
index 64889f6..f3cecc1 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
@@ -42,7 +42,6 @@ import org.apache.accumulo.core.client.IteratorSetting;
 import org.apache.accumulo.core.client.IteratorSetting.Column;
 import org.apache.accumulo.core.clientImpl.Namespace;
 import org.apache.accumulo.core.clientImpl.Table;
-import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException;
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.conf.DefaultConfiguration;
 import org.apache.accumulo.core.conf.Property;
@@ -777,7 +776,7 @@ public class Initialize implements KeywordExecutable {
   }
 
   private static void initSecurity(ServerContext context, Opts opts, String iid, String rootUser)
-      throws AccumuloSecurityException, ThriftSecurityException, IOException {
+      throws AccumuloSecurityException {
     AuditedSecurityOperation.getInstance(context, true).initializeSecurity(context.rpcCreds(),
         rootUser, opts.rootpass);
   }
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java b/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
index c7ad9ef..58dca14 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
@@ -72,7 +72,7 @@ public class LiveTServerSet implements Watcher {
   public class TServerConnection {
     private final HostAndPort address;
 
-    public TServerConnection(HostAndPort addr) throws TException {
+    public TServerConnection(HostAndPort addr) {
       address = addr;
     }
 
@@ -295,7 +295,7 @@ public class LiveTServerSet implements Watcher {
 
   private synchronized void checkServer(final Set<TServerInstance> updates,
       final Set<TServerInstance> doomed, final String path, final String zPath)
-      throws TException, InterruptedException, KeeperException {
+      throws InterruptedException, KeeperException {
 
     TServerInfo info = current.get(zPath);
 
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/recovery/MapRLogCloser.java b/server/base/src/main/java/org/apache/accumulo/server/master/recovery/MapRLogCloser.java
index 6701b14..043bf15 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/recovery/MapRLogCloser.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/recovery/MapRLogCloser.java
@@ -31,7 +31,7 @@ public class MapRLogCloser implements LogCloser {
   private static final Logger log = LoggerFactory.getLogger(MapRLogCloser.class);
 
   @Override
-  public long close(AccumuloConfiguration conf, VolumeManager fs, Path path) throws IOException {
+  public long close(AccumuloConfiguration conf, VolumeManager fs, Path path) {
     log.info("Recovering file {} by changing permission to readonly", path);
     FileSystem ns = fs.getVolumeByPath(path).getFileSystem();
     FsPermission roPerm = new FsPermission((short) 0444);
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/recovery/RecoveryPath.java b/server/base/src/main/java/org/apache/accumulo/server/master/recovery/RecoveryPath.java
index 3cdd569..e519731 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/recovery/RecoveryPath.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/recovery/RecoveryPath.java
@@ -16,8 +16,6 @@
  */
 package org.apache.accumulo.server.master.recovery;
 
-import java.io.IOException;
-
 import org.apache.accumulo.server.fs.VolumeManager;
 import org.apache.accumulo.server.fs.VolumeManager.FileType;
 import org.apache.hadoop.fs.Path;
@@ -25,7 +23,7 @@ import org.apache.hadoop.fs.Path;
 public class RecoveryPath {
 
   // given a wal path, transform it to a recovery path
-  public static Path getRecoveryPath(VolumeManager fs, Path walPath) throws IOException {
+  public static Path getRecoveryPath(VolumeManager fs, Path walPath) {
     if (walPath.depth() >= 3 && walPath.toUri().getScheme() != null) {
       // its a fully qualified path
       String uuid = walPath.getName();
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateStore.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateStore.java
index e505027..4b67163 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateStore.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateStore.java
@@ -100,8 +100,7 @@ public abstract class TabletStateStore implements Iterable<TabletLocationState>
         .setLocations(Collections.singletonList(assignment));
   }
 
-  protected static TabletStateStore getStoreForTablet(KeyExtent extent, ServerContext context)
-      throws DistributedStoreException {
+  protected static TabletStateStore getStoreForTablet(KeyExtent extent, ServerContext context) {
     if (extent.isRootTablet()) {
       return new ZooTabletStateStore(context);
     } else if (extent.isMeta()) {
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/ZooStore.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/ZooStore.java
index f7e1cc8..73bcdd6 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/ZooStore.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/ZooStore.java
@@ -18,7 +18,6 @@ package org.apache.accumulo.server.master.state;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
-import java.io.IOException;
 import java.util.List;
 
 import org.apache.accumulo.fate.zookeeper.IZooReaderWriter;
@@ -37,7 +36,7 @@ public class ZooStore implements DistributedStore {
   private String basePath;
   private ZooCache cache;
 
-  public ZooStore(ServerContext context) throws IOException {
+  public ZooStore(ServerContext context) {
     this.context = context;
     cache = new ZooCache(context.getZooReaderWriter(), null);
     String zkRoot = context.getZooKeeperRoot();
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/ZooTabletStateStore.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/ZooTabletStateStore.java
index 5dd981c..3389ea9 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/ZooTabletStateStore.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/ZooTabletStateStore.java
@@ -44,12 +44,8 @@ public class ZooTabletStateStore extends TabletStateStore {
     this.store = store;
   }
 
-  public ZooTabletStateStore(ServerContext context) throws DistributedStoreException {
-    try {
-      store = new ZooStore(context);
-    } catch (IOException ex) {
-      throw new DistributedStoreException(ex);
-    }
+  public ZooTabletStateStore(ServerContext context) {
+    store = new ZooStore(context);
   }
 
   @Override
@@ -204,7 +200,7 @@ public class ZooTabletStateStore extends TabletStateStore {
   }
 
   @Override
-  public void unsuspend(Collection<TabletLocationState> tablets) throws DistributedStoreException {
+  public void unsuspend(Collection<TabletLocationState> tablets) {
     // no support for suspending root tablet.
   }
 
diff --git a/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReportingIterator.java b/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReportingIterator.java
index 55717d6..6e7e72f 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReportingIterator.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReportingIterator.java
@@ -74,7 +74,7 @@ public class ProblemReportingIterator implements InterruptibleIterator {
 
   @Override
   public void init(SortedKeyValueIterator<Key,Value> source, Map<String,String> options,
-      IteratorEnvironment env) throws IOException {
+      IteratorEnvironment env) {
     throw new UnsupportedOperationException();
   }
 
diff --git a/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java b/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java
index 7893cce..d9f683f 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java
@@ -118,7 +118,7 @@ public class ProblemReports implements Iterable<ProblemReport> {
 
   }
 
-  public void printProblems() throws Exception {
+  public void printProblems() {
     for (ProblemReport pr : this) {
       System.out.println(pr.getTableId() + " " + pr.getProblemType() + " " + pr.getResource() + " "
           + pr.getException());
@@ -295,7 +295,7 @@ public class ProblemReports implements Iterable<ProblemReport> {
     return instance;
   }
 
-  public static void main(String args[]) throws Exception {
+  public static void main(String args[]) {
     ServerContext context = new ServerContext(new SiteConfiguration());
     getInstance(context).printProblems();
   }
diff --git a/server/base/src/main/java/org/apache/accumulo/server/replication/ReplicaSystemHelper.java b/server/base/src/main/java/org/apache/accumulo/server/replication/ReplicaSystemHelper.java
index 4f60224..64661ea 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/replication/ReplicaSystemHelper.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/replication/ReplicaSystemHelper.java
@@ -19,7 +19,6 @@ package org.apache.accumulo.server.replication;
 import static java.util.Objects.requireNonNull;
 
 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.TableNotFoundException;
@@ -55,7 +54,7 @@ public class ReplicaSystemHelper {
    *          Peer that was replicated to
    */
   public void recordNewStatus(Path filePath, Status status, ReplicationTarget target)
-      throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
+      throws AccumuloException, TableNotFoundException {
     try (BatchWriter bw = context.createBatchWriter(ReplicationTable.NAME,
         new BatchWriterConfig())) {
       log.debug("Recording new status for {}, {}", filePath, ProtobufUtil.toString(status));
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java b/server/base/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
index 510ae7e..fc33a3f 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
@@ -134,7 +134,7 @@ public class SecurityOperation {
   }
 
   public void initializeSecurity(TCredentials credentials, String rootPrincipal, byte[] token)
-      throws AccumuloSecurityException, ThriftSecurityException {
+      throws AccumuloSecurityException {
     if (!isSystemUser(credentials))
       throw new AccumuloSecurityException(credentials.getPrincipal(),
           SecurityErrorCode.PERMISSION_DENIED);
@@ -193,28 +193,23 @@ public class SecurityOperation {
       if (isKerberos) {
         // If we have kerberos credentials for a user from the network but no account
         // in the system, we need to make one before proceeding
-        try {
-          if (!authenticator.userExists(creds.getPrincipal())) {
-            // If we call the normal createUser method, it will loop back into this method
-            // when it tries to check if the user has permission to create users
-            try {
-              _createUser(credentials, creds, Authorizations.EMPTY);
-            } catch (ThriftSecurityException e) {
-              if (e.getCode() != SecurityErrorCode.USER_EXISTS) {
-                // For Kerberos, a user acct is automatically created because there is no notion of
-                // a password
-                // in the traditional sense of Accumulo users. As such, if a user acct already
-                // exists when we
-                // try to automatically create a user account, we should avoid returning this
-                // exception back to the user.
-                // We want to let USER_EXISTS code pass through and continue
-                throw e;
-              }
+        if (!authenticator.userExists(creds.getPrincipal())) {
+          // If we call the normal createUser method, it will loop back into this method
+          // when it tries to check if the user has permission to create users
+          try {
+            _createUser(credentials, creds, Authorizations.EMPTY);
+          } catch (ThriftSecurityException e) {
+            if (e.getCode() != SecurityErrorCode.USER_EXISTS) {
+              // For Kerberos, a user acct is automatically created because there is no notion of
+              // a password
+              // in the traditional sense of Accumulo users. As such, if a user acct already
+              // exists when we
+              // try to automatically create a user account, we should avoid returning this
+              // exception back to the user.
+              // We want to let USER_EXISTS code pass through and continue
+              throw e;
             }
           }
-        } catch (AccumuloSecurityException e) {
-          log.debug("Failed to determine if user exists", e);
-          throw e.asThriftException();
         }
       }
 
@@ -278,11 +273,7 @@ public class SecurityOperation {
       throw new ThriftSecurityException(credentials.getPrincipal(),
           SecurityErrorCode.PERMISSION_DENIED);
 
-    try {
-      return authorizor.getCachedUserAuthorizations(user);
-    } catch (AccumuloSecurityException e) {
-      throw e.asThriftException();
-    }
+    return authorizor.getCachedUserAuthorizations(user);
   }
 
   public Authorizations getUserAuthorizations(TCredentials credentials)
@@ -298,18 +289,13 @@ public class SecurityOperation {
   /**
    * Check if an already authenticated user has specified authorizations.
    */
-  public boolean authenticatedUserHasAuthorizations(TCredentials credentials, List<ByteBuffer> list)
-      throws ThriftSecurityException {
+  public boolean authenticatedUserHasAuthorizations(TCredentials credentials,
+      List<ByteBuffer> list) {
     if (isSystemUser(credentials)) {
       // system user doesn't need record-level authorizations for the tables it reads (for now)
       return list.isEmpty();
     }
-
-    try {
-      return authorizor.isValidAuthorizations(credentials.getPrincipal(), list);
-    } catch (AccumuloSecurityException e) {
-      throw e.asThriftException();
-    }
+    return authorizor.isValidAuthorizations(credentials.getPrincipal(), list);
   }
 
   private boolean hasSystemPermission(TCredentials credentials, SystemPermission permission,
@@ -351,13 +337,9 @@ public class SecurityOperation {
 
     targetUserExists(user);
 
-    try {
-      if (useCached)
-        return permHandle.hasCachedSystemPermission(user, permission);
-      return permHandle.hasSystemPermission(user, permission);
-    } catch (AccumuloSecurityException e) {
-      throw e.asThriftException();
-    }
+    if (useCached)
+      return permHandle.hasCachedSystemPermission(user, permission);
+    return permHandle.hasSystemPermission(user, permission);
   }
 
   /**
@@ -393,8 +375,6 @@ public class SecurityOperation {
       if (useCached)
         return permHandle.hasCachedTablePermission(user, table.canonicalID(), permission);
       return permHandle.hasTablePermission(user, table.canonicalID(), permission);
-    } catch (AccumuloSecurityException e) {
-      throw e.asThriftException();
     } catch (TableNotFoundException e) {
       throw new ThriftSecurityException(user, SecurityErrorCode.TABLE_DOESNT_EXIST);
     }
@@ -420,8 +400,6 @@ public class SecurityOperation {
       if (useCached)
         return permHandle.hasCachedNamespacePermission(user, namespace, permission);
       return permHandle.hasNamespacePermission(user, namespace, permission);
-    } catch (AccumuloSecurityException e) {
-      throw e.asThriftException();
     } catch (NamespaceNotFoundException e) {
       throw new ThriftSecurityException(user, SecurityErrorCode.NAMESPACE_DOESNT_EXIST);
     }
@@ -441,12 +419,8 @@ public class SecurityOperation {
   private void targetUserExists(String user) throws ThriftSecurityException {
     if (user.equals(getRootUsername()))
       return;
-    try {
-      if (!authenticator.userExists(user))
-        throw new ThriftSecurityException(user, SecurityErrorCode.USER_DOESNT_EXIST);
-    } catch (AccumuloSecurityException e) {
-      throw e.asThriftException();
-    }
+    if (!authenticator.userExists(user))
+      throw new ThriftSecurityException(user, SecurityErrorCode.USER_DOESNT_EXIST);
   }
 
   public boolean canScan(TCredentials credentials, Table.ID tableId, Namespace.ID namespaceId)
@@ -872,11 +846,7 @@ public class SecurityOperation {
 
   public Set<String> listUsers(TCredentials credentials) throws ThriftSecurityException {
     authenticate(credentials);
-    try {
-      return authenticator.listUsers();
-    } catch (AccumuloSecurityException e) {
-      throw e.asThriftException();
-    }
+    return authenticator.listUsers();
   }
 
   public void deleteTable(TCredentials credentials, Table.ID tableId, Namespace.ID namespaceId)
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/Authenticator.java b/server/base/src/main/java/org/apache/accumulo/server/security/handler/Authenticator.java
index 8022bad..07b3102 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/Authenticator.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/Authenticator.java
@@ -20,7 +20,6 @@ import java.util.Set;
 
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
-import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException;
 import org.apache.accumulo.core.securityImpl.thrift.TCredentials;
 import org.apache.accumulo.server.ServerContext;
 
@@ -35,13 +34,12 @@ public interface Authenticator {
 
   boolean validSecurityHandlers(Authorizor auth, PermissionHandler pm);
 
-  void initializeSecurity(TCredentials credentials, String principal, byte[] token)
-      throws AccumuloSecurityException, ThriftSecurityException;
+  void initializeSecurity(TCredentials credentials, String principal, byte[] token);
 
   boolean authenticateUser(String principal, AuthenticationToken token)
       throws AccumuloSecurityException;
 
-  Set<String> listUsers() throws AccumuloSecurityException;
+  Set<String> listUsers();
 
   /**
    * Creates a user with no initial permissions whatsoever
@@ -55,7 +53,7 @@ public interface Authenticator {
   /**
    * Checks if a user exists
    */
-  boolean userExists(String user) throws AccumuloSecurityException;
+  boolean userExists(String user);
 
   Set<Class<? extends AuthenticationToken>> getSupportedTokenTypes();
 
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/Authorizor.java b/server/base/src/main/java/org/apache/accumulo/server/security/handler/Authorizor.java
index 864cffc..8609d9c 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/Authorizor.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/Authorizor.java
@@ -20,7 +20,6 @@ import java.nio.ByteBuffer;
 import java.util.List;
 
 import org.apache.accumulo.core.client.AccumuloSecurityException;
-import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException;
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.core.securityImpl.thrift.TCredentials;
 import org.apache.accumulo.server.ServerContext;
@@ -46,7 +45,7 @@ public interface Authorizor {
    * Used to initialize security for the root user
    */
   void initializeSecurity(TCredentials credentials, String rootuser)
-      throws AccumuloSecurityException, ThriftSecurityException;
+      throws AccumuloSecurityException;
 
   /**
    * Used to change the authorizations for the user
@@ -57,13 +56,12 @@ public interface Authorizor {
   /**
    * Used to get the authorizations for the user
    */
-  Authorizations getCachedUserAuthorizations(String user) throws AccumuloSecurityException;
+  Authorizations getCachedUserAuthorizations(String user);
 
   /**
    * Used to check if a user has valid auths.
    */
-  boolean isValidAuthorizations(String user, List<ByteBuffer> list)
-      throws AccumuloSecurityException;
+  boolean isValidAuthorizations(String user, List<ByteBuffer> list);
 
   /**
    * Initializes a new user
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/InsecureAuthenticator.java b/server/base/src/main/java/org/apache/accumulo/server/security/handler/InsecureAuthenticator.java
index 14113ec..aed4b4a 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/InsecureAuthenticator.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/InsecureAuthenticator.java
@@ -20,7 +20,6 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
 import org.apache.accumulo.core.client.security.tokens.NullToken;
 import org.apache.accumulo.core.securityImpl.thrift.TCredentials;
@@ -42,8 +41,7 @@ public class InsecureAuthenticator implements Authenticator {
   }
 
   @Override
-  public void initializeSecurity(TCredentials credentials, String principal, byte[] token)
-      throws AccumuloSecurityException {}
+  public void initializeSecurity(TCredentials credentials, String principal, byte[] token) {}
 
   @Override
   public boolean authenticateUser(String principal, AuthenticationToken token) {
@@ -51,20 +49,18 @@ public class InsecureAuthenticator implements Authenticator {
   }
 
   @Override
-  public Set<String> listUsers() throws AccumuloSecurityException {
+  public Set<String> listUsers() {
     return Collections.emptySet();
   }
 
   @Override
-  public void createUser(String principal, AuthenticationToken token)
-      throws AccumuloSecurityException {}
+  public void createUser(String principal, AuthenticationToken token) {}
 
   @Override
-  public void dropUser(String user) throws AccumuloSecurityException {}
+  public void dropUser(String user) {}
 
   @Override
-  public void changePassword(String user, AuthenticationToken token)
-      throws AccumuloSecurityException {}
+  public void changePassword(String user, AuthenticationToken token) {}
 
   @Override
   public boolean userExists(String user) {
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/InsecurePermHandler.java b/server/base/src/main/java/org/apache/accumulo/server/security/handler/InsecurePermHandler.java
index 624654f..fcd7158 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/InsecurePermHandler.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/InsecurePermHandler.java
@@ -16,9 +16,6 @@
  */
 package org.apache.accumulo.server.security.handler;
 
-import org.apache.accumulo.core.client.AccumuloSecurityException;
-import org.apache.accumulo.core.client.NamespaceNotFoundException;
-import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.clientImpl.Namespace;
 import org.apache.accumulo.core.security.NamespacePermission;
 import org.apache.accumulo.core.security.SystemPermission;
@@ -41,86 +38,73 @@ public class InsecurePermHandler implements PermissionHandler {
   }
 
   @Override
-  public void initializeSecurity(TCredentials token, String rootuser)
-      throws AccumuloSecurityException {}
+  public void initializeSecurity(TCredentials token, String rootuser) {}
 
   @Override
-  public boolean hasSystemPermission(String user, SystemPermission permission)
-      throws AccumuloSecurityException {
+  public boolean hasSystemPermission(String user, SystemPermission permission) {
     return true;
   }
 
   @Override
-  public boolean hasCachedSystemPermission(String user, SystemPermission permission)
-      throws AccumuloSecurityException {
+  public boolean hasCachedSystemPermission(String user, SystemPermission permission) {
     return true;
   }
 
   @Override
-  public boolean hasTablePermission(String user, String table, TablePermission permission)
-      throws AccumuloSecurityException, TableNotFoundException {
+  public boolean hasTablePermission(String user, String table, TablePermission permission) {
     return true;
   }
 
   @Override
-  public boolean hasCachedTablePermission(String user, String table, TablePermission permission)
-      throws AccumuloSecurityException, TableNotFoundException {
+  public boolean hasCachedTablePermission(String user, String table, TablePermission permission) {
     return true;
   }
 
   @Override
-  public void grantSystemPermission(String user, SystemPermission permission)
-      throws AccumuloSecurityException {}
+  public void grantSystemPermission(String user, SystemPermission permission) {}
 
   @Override
-  public void revokeSystemPermission(String user, SystemPermission permission)
-      throws AccumuloSecurityException {}
+  public void revokeSystemPermission(String user, SystemPermission permission) {}
 
   @Override
-  public void grantTablePermission(String user, String table, TablePermission permission)
-      throws AccumuloSecurityException, TableNotFoundException {}
+  public void grantTablePermission(String user, String table, TablePermission permission) {}
 
   @Override
-  public void revokeTablePermission(String user, String table, TablePermission permission)
-      throws AccumuloSecurityException, TableNotFoundException {}
+  public void revokeTablePermission(String user, String table, TablePermission permission) {}
 
   @Override
-  public void cleanTablePermissions(String table)
-      throws AccumuloSecurityException, TableNotFoundException {}
+  public void cleanTablePermissions(String table) {}
 
   @Override
-  public void initUser(String user) throws AccumuloSecurityException {}
+  public void initUser(String user) {}
 
   @Override
-  public void cleanUser(String user) throws AccumuloSecurityException {}
+  public void cleanUser(String user) {}
 
   @Override
-  public void initTable(String table) throws AccumuloSecurityException {}
+  public void initTable(String table) {}
 
   @Override
   public boolean hasNamespacePermission(String user, Namespace.ID namespace,
-      NamespacePermission permission) throws AccumuloSecurityException, NamespaceNotFoundException {
+      NamespacePermission permission) {
     return true;
   }
 
   @Override
   public boolean hasCachedNamespacePermission(String user, Namespace.ID namespace,
-      NamespacePermission permission) throws AccumuloSecurityException, NamespaceNotFoundException {
+      NamespacePermission permission) {
     return true;
   }
 
   @Override
   public void grantNamespacePermission(String user, Namespace.ID namespace,
-      NamespacePermission permission)
-      throws AccumuloSecurityException, NamespaceNotFoundException {}
+      NamespacePermission permission) {}
 
   @Override
   public void revokeNamespacePermission(String user, Namespace.ID namespace,
-      NamespacePermission permission)
-      throws AccumuloSecurityException, NamespaceNotFoundException {}
+      NamespacePermission permission) {}
 
   @Override
-  public void cleanNamespacePermissions(Namespace.ID namespace)
-      throws AccumuloSecurityException, NamespaceNotFoundException {}
+  public void cleanNamespacePermissions(Namespace.ID namespace) {}
 
 }
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/KerberosAuthenticator.java b/server/base/src/main/java/org/apache/accumulo/server/security/handler/KerberosAuthenticator.java
index 2783536..49345ec 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/KerberosAuthenticator.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/KerberosAuthenticator.java
@@ -29,7 +29,6 @@ import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
 import org.apache.accumulo.core.client.security.tokens.KerberosToken;
 import org.apache.accumulo.core.clientImpl.DelegationTokenImpl;
 import org.apache.accumulo.core.clientImpl.thrift.SecurityErrorCode;
-import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException;
 import org.apache.accumulo.core.securityImpl.thrift.TCredentials;
 import org.apache.accumulo.fate.zookeeper.IZooReaderWriter;
 import org.apache.accumulo.fate.zookeeper.ZooCache;
@@ -84,8 +83,7 @@ public class KerberosAuthenticator implements Authenticator {
   }
 
   @Override
-  public void initializeSecurity(TCredentials credentials, String principal, byte[] token)
-      throws AccumuloSecurityException, ThriftSecurityException {
+  public void initializeSecurity(TCredentials credentials, String principal, byte[] token) {
     try {
       // remove old settings from zookeeper first, if any
       IZooReaderWriter zoo = context.getZooReaderWriter();
@@ -136,7 +134,7 @@ public class KerberosAuthenticator implements Authenticator {
   }
 
   @Override
-  public Set<String> listUsers() throws AccumuloSecurityException {
+  public Set<String> listUsers() {
     Set<String> base64Users = zkAuthenticator.listUsers();
     Set<String> readableUsers = new HashSet<>();
     for (String base64User : base64Users) {
@@ -178,13 +176,12 @@ public class KerberosAuthenticator implements Authenticator {
   }
 
   @Override
-  public void changePassword(String principal, AuthenticationToken token)
-      throws AccumuloSecurityException {
+  public void changePassword(String principal, AuthenticationToken token) {
     throw new UnsupportedOperationException("Cannot change password with Kerberos authenticaton");
   }
 
   @Override
-  public synchronized boolean userExists(String user) throws AccumuloSecurityException {
+  public synchronized boolean userExists(String user) {
     user = Base64.getEncoder().encodeToString(user.getBytes(UTF_8));
     return zkAuthenticator.userExists(user);
   }
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/KerberosAuthorizor.java b/server/base/src/main/java/org/apache/accumulo/server/security/handler/KerberosAuthorizor.java
index 29047cb..9e77a08 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/KerberosAuthorizor.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/KerberosAuthorizor.java
@@ -23,7 +23,6 @@ import java.util.Base64;
 import java.util.List;
 
 import org.apache.accumulo.core.client.AccumuloSecurityException;
-import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException;
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.core.securityImpl.thrift.TCredentials;
 import org.apache.accumulo.server.ServerContext;
@@ -52,7 +51,7 @@ public class KerberosAuthorizor implements Authorizor {
 
   @Override
   public void initializeSecurity(TCredentials credentials, String rootuser)
-      throws AccumuloSecurityException, ThriftSecurityException {
+      throws AccumuloSecurityException {
     zkAuthorizor.initializeSecurity(credentials,
         Base64.getEncoder().encodeToString(rootuser.getBytes(UTF_8)));
   }
@@ -65,14 +64,13 @@ public class KerberosAuthorizor implements Authorizor {
   }
 
   @Override
-  public Authorizations getCachedUserAuthorizations(String user) throws AccumuloSecurityException {
+  public Authorizations getCachedUserAuthorizations(String user) {
     return zkAuthorizor
         .getCachedUserAuthorizations(Base64.getEncoder().encodeToString(user.getBytes(UTF_8)));
   }
 
   @Override
-  public boolean isValidAuthorizations(String user, List<ByteBuffer> list)
-      throws AccumuloSecurityException {
+  public boolean isValidAuthorizations(String user, List<ByteBuffer> list) {
     return zkAuthorizor
         .isValidAuthorizations(Base64.getEncoder().encodeToString(user.getBytes(UTF_8)), list);
   }
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/KerberosPermissionHandler.java b/server/base/src/main/java/org/apache/accumulo/server/security/handler/KerberosPermissionHandler.java
index 7049ead..288f743 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/KerberosPermissionHandler.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/KerberosPermissionHandler.java
@@ -24,7 +24,6 @@ import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.NamespaceNotFoundException;
 import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.clientImpl.Namespace;
-import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException;
 import org.apache.accumulo.core.security.NamespacePermission;
 import org.apache.accumulo.core.security.SystemPermission;
 import org.apache.accumulo.core.security.TablePermission;
@@ -55,49 +54,46 @@ public class KerberosPermissionHandler implements PermissionHandler {
 
   @Override
   public void initializeSecurity(TCredentials credentials, String rootuser)
-      throws AccumuloSecurityException, ThriftSecurityException {
+      throws AccumuloSecurityException {
     zkPermissionHandler.initializeSecurity(credentials,
         Base64.getEncoder().encodeToString(rootuser.getBytes(UTF_8)));
   }
 
   @Override
-  public boolean hasSystemPermission(String user, SystemPermission permission)
-      throws AccumuloSecurityException {
+  public boolean hasSystemPermission(String user, SystemPermission permission) {
     return zkPermissionHandler
         .hasSystemPermission(Base64.getEncoder().encodeToString(user.getBytes(UTF_8)), permission);
   }
 
   @Override
-  public boolean hasCachedSystemPermission(String user, SystemPermission permission)
-      throws AccumuloSecurityException {
+  public boolean hasCachedSystemPermission(String user, SystemPermission permission) {
     return zkPermissionHandler.hasCachedSystemPermission(
         Base64.getEncoder().encodeToString(user.getBytes(UTF_8)), permission);
   }
 
   @Override
   public boolean hasTablePermission(String user, String table, TablePermission permission)
-      throws AccumuloSecurityException, TableNotFoundException {
+      throws TableNotFoundException {
     return zkPermissionHandler.hasTablePermission(
         Base64.getEncoder().encodeToString(user.getBytes(UTF_8)), table, permission);
   }
 
   @Override
-  public boolean hasCachedTablePermission(String user, String table, TablePermission permission)
-      throws AccumuloSecurityException, TableNotFoundException {
+  public boolean hasCachedTablePermission(String user, String table, TablePermission permission) {
     return zkPermissionHandler.hasCachedTablePermission(
         Base64.getEncoder().encodeToString(user.getBytes(UTF_8)), table, permission);
   }
 
   @Override
   public boolean hasNamespacePermission(String user, Namespace.ID namespace,
-      NamespacePermission permission) throws AccumuloSecurityException, NamespaceNotFoundException {
+      NamespacePermission permission) throws NamespaceNotFoundException {
     return zkPermissionHandler.hasNamespacePermission(
         Base64.getEncoder().encodeToString(user.getBytes(UTF_8)), namespace, permission);
   }
 
   @Override
   public boolean hasCachedNamespacePermission(String user, Namespace.ID namespace,
-      NamespacePermission permission) throws AccumuloSecurityException, NamespaceNotFoundException {
+      NamespacePermission permission) {
     return zkPermissionHandler.hasCachedNamespacePermission(
         Base64.getEncoder().encodeToString(user.getBytes(UTF_8)), namespace, permission);
   }
@@ -162,7 +158,7 @@ public class KerberosPermissionHandler implements PermissionHandler {
   }
 
   @Override
-  public void initTable(String table) throws AccumuloSecurityException {
+  public void initTable(String table) {
     zkPermissionHandler.initTable(table);
   }
 
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/PermissionHandler.java b/server/base/src/main/java/org/apache/accumulo/server/security/handler/PermissionHandler.java
index e81298f..0b1cd24 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/PermissionHandler.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/PermissionHandler.java
@@ -20,7 +20,6 @@ import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.NamespaceNotFoundException;
 import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.clientImpl.Namespace;
-import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException;
 import org.apache.accumulo.core.security.NamespacePermission;
 import org.apache.accumulo.core.security.SystemPermission;
 import org.apache.accumulo.core.security.TablePermission;
@@ -48,47 +47,44 @@ public interface PermissionHandler {
    * Used to initialize security for the root user
    */
   void initializeSecurity(TCredentials credentials, String rootuser)
-      throws AccumuloSecurityException, ThriftSecurityException;
+      throws AccumuloSecurityException;
 
   /**
    * Used to get the system permission for the user
    */
-  boolean hasSystemPermission(String user, SystemPermission permission)
-      throws AccumuloSecurityException;
+  boolean hasSystemPermission(String user, SystemPermission permission);
 
   /**
    * Used to get the system permission for the user, with caching due to high frequency operation.
    * NOTE: At this time, this method is unused but is included just in case we need it in the
    * future.
    */
-  boolean hasCachedSystemPermission(String user, SystemPermission permission)
-      throws AccumuloSecurityException;
+  boolean hasCachedSystemPermission(String user, SystemPermission permission);
 
   /**
    * Used to get the table permission of a user for a table
    */
   boolean hasTablePermission(String user, String table, TablePermission permission)
-      throws AccumuloSecurityException, TableNotFoundException;
+      throws TableNotFoundException;
 
   /**
    * Used to get the table permission of a user for a table, with caching. This method is for high
    * frequency operations
    */
-  boolean hasCachedTablePermission(String user, String table, TablePermission permission)
-      throws AccumuloSecurityException, TableNotFoundException;
+  boolean hasCachedTablePermission(String user, String table, TablePermission permission);
 
   /**
    * Used to get the namespace permission of a user for a namespace
    */
   boolean hasNamespacePermission(String user, Namespace.ID namespace,
-      NamespacePermission permission) throws AccumuloSecurityException, NamespaceNotFoundException;
+      NamespacePermission permission) throws NamespaceNotFoundException;
 
   /**
    * Used to get the namespace permission of a user for a namespace, with caching. This method is
    * for high frequency operations
    */
   boolean hasCachedNamespacePermission(String user, Namespace.ID namespace,
-      NamespacePermission permission) throws AccumuloSecurityException, NamespaceNotFoundException;
+      NamespacePermission permission);
 
   /**
    * Gives the user the given system permission
@@ -145,7 +141,7 @@ public interface PermissionHandler {
   /**
    * Initializes a new user
    */
-  void initTable(String table) throws AccumuloSecurityException;
+  void initTable(String table);
 
   /**
    * Deletes a user
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java
index a0ba280..c186bd6 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java
@@ -61,8 +61,7 @@ public final class ZKAuthenticator implements Authenticator {
   }
 
   @Override
-  public void initializeSecurity(TCredentials credentials, String principal, byte[] token)
-      throws AccumuloSecurityException {
+  public void initializeSecurity(TCredentials credentials, String principal, byte[] token) {
     try {
       // remove old settings from zookeeper first, if any
       IZooReaderWriter zoo = context.getZooReaderWriter();
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthorizor.java b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthorizor.java
index e11ee42..914ae6a 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthorizor.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthorizor.java
@@ -164,8 +164,7 @@ public class ZKAuthorizor implements Authorizor {
   }
 
   @Override
-  public boolean isValidAuthorizations(String user, List<ByteBuffer> auths)
-      throws AccumuloSecurityException {
+  public boolean isValidAuthorizations(String user, List<ByteBuffer> auths) {
     if (auths.isEmpty()) {
       // avoid deserializing auths from ZK cache
       return true;
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java
index 600c8d3..4ae95b2 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java
@@ -117,8 +117,7 @@ public class ZKPermHandler implements PermissionHandler {
   }
 
   @Override
-  public boolean hasCachedTablePermission(String user, String table, TablePermission permission)
-      throws AccumuloSecurityException, TableNotFoundException {
+  public boolean hasCachedTablePermission(String user, String table, TablePermission permission) {
     byte[] serializedPerms = zooCache.get(ZKUserPath + "/" + user + ZKUserTablePerms + "/" + table);
     if (serializedPerms != null) {
       return ZKSecurityTool.convertTablePermissions(serializedPerms).contains(permission);
@@ -170,7 +169,7 @@ public class ZKPermHandler implements PermissionHandler {
 
   @Override
   public boolean hasCachedNamespacePermission(String user, Namespace.ID namespace,
-      NamespacePermission permission) throws AccumuloSecurityException, NamespaceNotFoundException {
+      NamespacePermission permission) {
     byte[] serializedPerms = zooCache
         .get(ZKUserPath + "/" + user + ZKUserNamespacePerms + "/" + namespace);
     if (serializedPerms != null) {
@@ -491,8 +490,7 @@ public class ZKPermHandler implements PermissionHandler {
   }
 
   @Override
-  public boolean hasSystemPermission(String user, SystemPermission permission)
-      throws AccumuloSecurityException {
+  public boolean hasSystemPermission(String user, SystemPermission permission) {
     byte[] perms;
     try {
       String path = ZKUserPath + "/" + user + ZKUserSysPerms;
@@ -515,8 +513,7 @@ public class ZKPermHandler implements PermissionHandler {
   }
 
   @Override
-  public boolean hasCachedSystemPermission(String user, SystemPermission permission)
-      throws AccumuloSecurityException {
+  public boolean hasCachedSystemPermission(String user, SystemPermission permission) {
     byte[] perms = zooCache.get(ZKUserPath + "/" + user + ZKUserSysPerms);
     if (perms == null)
       return false;
@@ -529,7 +526,7 @@ public class ZKPermHandler implements PermissionHandler {
   }
 
   @Override
-  public void initTable(String table) throws AccumuloSecurityException {
+  public void initTable(String table) {
     // All proper housekeeping is done on delete and permission granting, no work needs to be done
     // here
   }
diff --git a/server/base/src/main/java/org/apache/accumulo/server/tablets/UniqueNameAllocator.java b/server/base/src/main/java/org/apache/accumulo/server/tablets/UniqueNameAllocator.java
index ae5d6d8..ce4e658 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/tablets/UniqueNameAllocator.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/tablets/UniqueNameAllocator.java
@@ -56,7 +56,7 @@ public class UniqueNameAllocator {
         byte[] max = context.getZooReaderWriter().mutate(nextNamePath, null, ZooUtil.PRIVATE,
             new ZooReaderWriter.Mutator() {
               @Override
-              public byte[] mutate(byte[] currentValue) throws Exception {
+              public byte[] mutate(byte[] currentValue) {
                 long l = Long.parseLong(new String(currentValue, UTF_8), Character.MAX_RADIX);
                 l += allocate;
                 return Long.toString(l, Character.MAX_RADIX).getBytes(UTF_8);
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java b/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
index d982d89..f581461 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
@@ -563,8 +563,7 @@ public class Admin implements KeywordExecutable {
     userWriter.close();
   }
 
-  private void printSystemConfiguration(File outputDirectory)
-      throws IOException, AccumuloException, AccumuloSecurityException {
+  private void printSystemConfiguration(File outputDirectory) throws IOException {
     TreeMap<String,String> conf = new TreeMap<>();
     TreeMap<String,String> site = new TreeMap<>(siteConfig);
     for (Entry<String,String> prop : site.entrySet()) {
@@ -591,8 +590,7 @@ public class Admin implements KeywordExecutable {
   @SuppressFBWarnings(value = "PATH_TRAVERSAL_IN",
       justification = "code runs in same security context as user who provided input")
   private void printTableConfiguration(AccumuloClient accumuloClient, String tableName,
-      File outputDirectory)
-      throws AccumuloException, TableNotFoundException, IOException, AccumuloSecurityException {
+      File outputDirectory) throws AccumuloException, TableNotFoundException, IOException {
     File tableBackup = new File(outputDirectory, tableName + ".cfg");
     FileWriter writer = new FileWriter(tableBackup);
     writer.write(createTableFormat.format(new String[] {tableName}));
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java b/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java
index 1bcfabd..961bbec 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java
@@ -24,7 +24,6 @@ import java.util.Set;
 import java.util.TreeSet;
 
 import org.apache.accumulo.core.client.AccumuloClient;
-import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.Scanner;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Value;
@@ -41,8 +40,7 @@ import org.apache.hadoop.io.Text;
 public class CheckForMetadataProblems {
   private static boolean sawProblems = false;
 
-  public static void checkTable(String tablename, TreeSet<KeyExtent> tablets, ServerUtilOpts opts)
-      throws AccumuloSecurityException {
+  public static void checkTable(String tablename, TreeSet<KeyExtent> tablets, ServerUtilOpts opts) {
     // sanity check of metadata table entries
     // make sure tablets has no holes, and that it starts and ends w/ null
 
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/DumpZookeeper.java b/server/base/src/main/java/org/apache/accumulo/server/util/DumpZookeeper.java
index a27de3b..24329ff 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/DumpZookeeper.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/DumpZookeeper.java
@@ -19,7 +19,6 @@ package org.apache.accumulo.server.util;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import java.io.PrintStream;
-import java.io.UnsupportedEncodingException;
 import java.util.Base64;
 
 import org.apache.accumulo.core.cli.Help;
@@ -74,7 +73,7 @@ public class DumpZookeeper {
   }
 
   private static void dump(PrintStream out, String root, String child, int indent)
-      throws KeeperException, InterruptedException, UnsupportedEncodingException {
+      throws KeeperException, InterruptedException {
     String path = root + "/" + child;
     if (root.endsWith("/"))
       path = root + child;
@@ -108,8 +107,7 @@ public class DumpZookeeper {
     }
   }
 
-  private static Encoded value(String path)
-      throws KeeperException, InterruptedException, UnsupportedEncodingException {
+  private static Encoded value(String path) throws KeeperException, InterruptedException {
     byte[] data = zk.getData(path, null);
     for (int i = 0; i < data.length; i++) {
       // does this look like simple ascii?
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/FindOfflineTablets.java b/server/base/src/main/java/org/apache/accumulo/server/util/FindOfflineTablets.java
index 471c8da..016888a 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/FindOfflineTablets.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/FindOfflineTablets.java
@@ -20,7 +20,6 @@ import java.util.Iterator;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.clientImpl.Table;
 import org.apache.accumulo.core.clientImpl.Tables;
@@ -34,7 +33,6 @@ import org.apache.accumulo.server.ServerContext;
 import org.apache.accumulo.server.cli.ServerUtilOpts;
 import org.apache.accumulo.server.master.LiveTServerSet;
 import org.apache.accumulo.server.master.LiveTServerSet.Listener;
-import org.apache.accumulo.server.master.state.DistributedStoreException;
 import org.apache.accumulo.server.master.state.MetaDataTableScanner;
 import org.apache.accumulo.server.master.state.TServerInstance;
 import org.apache.accumulo.server.master.state.TabletLocationState;
@@ -53,8 +51,7 @@ public class FindOfflineTablets {
     findOffline(context, null);
   }
 
-  static int findOffline(ServerContext context, String tableName)
-      throws AccumuloException, TableNotFoundException {
+  static int findOffline(ServerContext context, String tableName) throws TableNotFoundException {
 
     final AtomicBoolean scanning = new AtomicBoolean(false);
 
@@ -71,12 +68,7 @@ public class FindOfflineTablets {
     tservers.startListeningForTabletServerChanges();
     scanning.set(true);
 
-    Iterator<TabletLocationState> zooScanner;
-    try {
-      zooScanner = new ZooTabletStateStore(context).iterator();
-    } catch (DistributedStoreException e) {
-      throw new AccumuloException(e);
-    }
+    Iterator<TabletLocationState> zooScanner = new ZooTabletStateStore(context).iterator();
 
     int offline = 0;
 
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java
index f7739a7..41ce2ea 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java
@@ -19,7 +19,6 @@ package org.apache.accumulo.server.util;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -100,7 +99,7 @@ public class MasterMetadataUtil {
 
   public static KeyExtent fixSplit(ServerContext context, Text metadataEntry,
       SortedMap<ColumnFQ,Value> columns, TServerInstance tserver, ZooLock lock)
-      throws AccumuloException, IOException {
+      throws AccumuloException {
     log.info("Incomplete split {} attempting to fix", metadataEntry);
 
     Value oper = columns.get(TabletsSection.TabletColumnFamily.OLD_PREV_ROW_COLUMN);
@@ -147,7 +146,7 @@ public class MasterMetadataUtil {
 
   private static KeyExtent fixSplit(ServerContext context, Table.ID tableId, Text metadataEntry,
       Text metadataPrevEndRow, Value oper, double splitRatio, TServerInstance tserver, String time,
-      long initFlushID, long initCompactID, ZooLock lock) throws AccumuloException, IOException {
+      long initFlushID, long initCompactID, ZooLock lock) throws AccumuloException {
     if (metadataPrevEndRow == null)
       // something is wrong, this should not happen... if a tablet is split, it will always have a
       // prev end row....
@@ -212,8 +211,7 @@ public class MasterMetadataUtil {
 
   public static void replaceDatafiles(ServerContext context, KeyExtent extent,
       Set<FileRef> datafilesToDelete, Set<FileRef> scanFiles, FileRef path, Long compactionId,
-      DataFileValue size, String address, TServerInstance lastLocation, ZooLock zooLock)
-      throws IOException {
+      DataFileValue size, String address, TServerInstance lastLocation, ZooLock zooLock) {
     replaceDatafiles(context, extent, datafilesToDelete, scanFiles, path, compactionId, size,
         address, lastLocation, zooLock, true);
   }
@@ -221,7 +219,7 @@ public class MasterMetadataUtil {
   public static void replaceDatafiles(ServerContext context, KeyExtent extent,
       Set<FileRef> datafilesToDelete, Set<FileRef> scanFiles, FileRef path, Long compactionId,
       DataFileValue size, String address, TServerInstance lastLocation, ZooLock zooLock,
-      boolean insertDeleteFlags) throws IOException {
+      boolean insertDeleteFlags) {
 
     if (insertDeleteFlags) {
       // add delete flags for those paths before the data file reference is removed
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
index a559421..b549485 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
@@ -290,7 +290,7 @@ public class MetadataTableUtil {
   }
 
   public static SortedMap<FileRef,DataFileValue> getDataFileSizes(KeyExtent extent,
-      ServerContext context) throws IOException {
+      ServerContext context) {
     TreeMap<FileRef,DataFileValue> sizes = new TreeMap<>();
 
     try (Scanner mdScanner = new ScannerImpl(context, MetadataTable.ID, Authorizations.EMPTY)) {
@@ -359,7 +359,7 @@ public class MetadataTableUtil {
   }
 
   public static void addDeleteEntries(KeyExtent extent, Set<FileRef> datafilesToDelete,
-      ServerContext context) throws IOException {
+      ServerContext context) {
 
     Table.ID tableId = extent.getTableId();
 
@@ -371,14 +371,13 @@ public class MetadataTableUtil {
     }
   }
 
-  public static void addDeleteEntry(ServerContext context, Table.ID tableId, String path)
-      throws IOException {
+  public static void addDeleteEntry(ServerContext context, Table.ID tableId, String path) {
     update(context, createDeleteMutation(context, tableId, path),
         new KeyExtent(tableId, null, null));
   }
 
   public static Mutation createDeleteMutation(ServerContext context, Table.ID tableId,
-      String pathToRemove) throws IOException {
+      String pathToRemove) {
     Path path = context.getVolumeManager().getFullPath(tableId, pathToRemove);
     Mutation delFlag = new Mutation(new Text(MetadataSchema.DeletesSection.getRowPrefix() + path));
     delFlag.put(EMPTY_TEXT, EMPTY_TEXT, new Value(new byte[] {}));
@@ -445,7 +444,7 @@ public class MetadataTableUtil {
   }
 
   public static void deleteTable(Table.ID tableId, boolean insertDeletes, ServerContext context,
-      ZooLock lock) throws AccumuloException, IOException {
+      ZooLock lock) throws AccumuloException {
     try (Scanner ms = new ScannerImpl(context, MetadataTable.ID, Authorizations.EMPTY);
         BatchWriter bw = new BatchWriterImpl(context, MetadataTable.ID,
             new BatchWriterConfig().setMaxMemory(1000000)
@@ -686,8 +685,7 @@ public class MetadataTableUtil {
     if (extent.isRootTablet()) {
       retryZooKeeperUpdate(context, zooLock, new ZooOperation() {
         @Override
-        public void run(IZooReaderWriter rw)
-            throws KeeperException, InterruptedException, IOException {
+        public void run(IZooReaderWriter rw) throws KeeperException, InterruptedException {
           String root = getZookeeperLogLocation(context);
           for (LogEntry entry : entries) {
             String path = root + "/" + entry.getUniqueID();
@@ -957,7 +955,7 @@ public class MetadataTableUtil {
   }
 
   public static List<FileRef> getBulkFilesLoaded(ServerContext context, AccumuloClient client,
-      KeyExtent extent, long tid) throws IOException {
+      KeyExtent extent, long tid) {
     List<FileRef> result = new ArrayList<>();
     try (Scanner mscanner = new IsolatedScanner(client.createScanner(
         extent.isMeta() ? RootTable.NAME : MetadataTable.NAME, Authorizations.EMPTY))) {
@@ -978,7 +976,7 @@ public class MetadataTableUtil {
   }
 
   public static Map<Long,? extends Collection<FileRef>> getBulkFilesLoaded(ServerContext context,
-      KeyExtent extent) throws IOException {
+      KeyExtent extent) {
     Text metadataRow = extent.getMetadataEntry();
     Map<Long,List<FileRef>> result = new HashMap<>();
 
@@ -1024,7 +1022,7 @@ public class MetadataTableUtil {
   /**
    * During an upgrade from 1.6 to 1.7, we need to add the replication table
    */
-  public static void createReplicationTable(ServerContext context) throws IOException {
+  public static void createReplicationTable(ServerContext context) {
 
     VolumeChooserEnvironment chooserEnv = new VolumeChooserEnvironment(ReplicationTable.ID,
         context);
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java b/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
index 5f781cf..7dffb21 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
@@ -35,7 +35,6 @@ import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.apache.zookeeper.KeeperException;
 import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
 
 import com.beust.jcommander.Parameter;
@@ -55,8 +54,7 @@ public class RestoreZookeeper {
     }
 
     @Override
-    public void startElement(String uri, String localName, String name, Attributes attributes)
-        throws SAXException {
+    public void startElement(String uri, String localName, String name, Attributes attributes) {
       if ("node".equals(name)) {
         String child = attributes.getValue("name");
         if (child == null)
@@ -81,7 +79,7 @@ public class RestoreZookeeper {
     }
 
     @Override
-    public void endElement(String uri, String localName, String name) throws SAXException {
+    public void endElement(String uri, String localName, String name) {
       cwd.pop();
     }
 
diff --git a/server/base/src/test/java/org/apache/accumulo/server/AccumuloTest.java b/server/base/src/test/java/org/apache/accumulo/server/AccumuloTest.java
index abf10cd..2bea34e 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/AccumuloTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/AccumuloTest.java
@@ -39,7 +39,7 @@ public class AccumuloTest {
   private Path path;
 
   @Before
-  public void setUp() throws Exception {
+  public void setUp() {
     fs = createMock(FileSystem.class);
     path = createMock(Path.class);
   }
diff --git a/server/base/src/test/java/org/apache/accumulo/server/ServerOptsTest.java b/server/base/src/test/java/org/apache/accumulo/server/ServerOptsTest.java
index 2ab0da0..3722eec 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/ServerOptsTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/ServerOptsTest.java
@@ -28,7 +28,7 @@ public class ServerOptsTest {
   private ServerOpts opts;
 
   @Before
-  public void setUp() throws Exception {
+  public void setUp() {
     opts = new ServerOpts();
   }
 
diff --git a/server/base/src/test/java/org/apache/accumulo/server/client/BulkImporterTest.java b/server/base/src/test/java/org/apache/accumulo/server/client/BulkImporterTest.java
index 75eb277..4ed1344 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/client/BulkImporterTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/client/BulkImporterTest.java
@@ -26,9 +26,6 @@ import java.util.Map;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import org.apache.accumulo.core.client.AccumuloException;
-import org.apache.accumulo.core.client.AccumuloSecurityException;
-import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.clientImpl.ClientContext;
 import org.apache.accumulo.core.clientImpl.Table;
 import org.apache.accumulo.core.clientImpl.TabletLocator;
@@ -72,22 +69,20 @@ public class BulkImporterTest {
 
     @Override
     public TabletLocation locateTablet(ClientContext context, Text row, boolean skipRow,
-        boolean retry) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
+        boolean retry) {
       return new TabletLocation(fakeMetaData.tailSet(new KeyExtent(tableId, row, null)).first(),
           "localhost", "1");
     }
 
     @Override
     public <T extends Mutation> void binMutations(ClientContext context, List<T> mutations,
-        Map<String,TabletServerMutations<T>> binnedMutations, List<T> failures)
-        throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
+        Map<String,TabletServerMutations<T>> binnedMutations, List<T> failures) {
       throw new NotImplementedException();
     }
 
     @Override
     public List<Range> binRanges(ClientContext context, List<Range> ranges,
-        Map<String,Map<KeyExtent,List<Range>>> binnedRanges)
-        throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
+        Map<String,Map<KeyExtent,List<Range>>> binnedRanges) {
       throw new NotImplementedException();
     }
 
@@ -177,7 +172,7 @@ public class BulkImporterTest {
   }
 
   @Test
-  public void testSequentialTablets() throws Exception {
+  public void testSequentialTablets() {
     // ACCUMULO-3967 make sure that the startRow we compute in BulkImporter is actually giving
     // a correct startRow so that findOverlappingTablets works as intended.
 
diff --git a/server/base/src/test/java/org/apache/accumulo/server/conf/ServerConfigurationFactoryTest.java b/server/base/src/test/java/org/apache/accumulo/server/conf/ServerConfigurationFactoryTest.java
index 627648e..83b708f 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/conf/ServerConfigurationFactoryTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/conf/ServerConfigurationFactoryTest.java
@@ -53,7 +53,7 @@ public class ServerConfigurationFactoryTest {
   private static SiteConfiguration siteConfig = new SiteConfiguration();
 
   @BeforeClass
-  public static void setUpClass() throws Exception {
+  public static void setUpClass() {
     zcf = createMock(ZooCacheFactory.class);
     zc = createMock(ZooCache.class);
     expect(zcf.getZooCache(eq(ZK_HOST), eq(ZK_TIMEOUT), anyObject(NamespaceConfWatcher.class)))
@@ -74,7 +74,7 @@ public class ServerConfigurationFactoryTest {
   private ServerConfigurationFactory scf;
 
   @Before
-  public void setUp() throws Exception {
+  public void setUp() {
     context = createMock(ServerContext.class);
     expect(context.getInstanceID()).andReturn(IID).anyTimes();
     expect(context.getProperties()).andReturn(new Properties()).anyTimes();
@@ -83,7 +83,7 @@ public class ServerConfigurationFactoryTest {
   }
 
   @After
-  public void tearDown() throws Exception {
+  public void tearDown() {
     ServerConfigurationFactory.clearCachedConfigurations();
   }
 
diff --git a/server/base/src/test/java/org/apache/accumulo/server/constraints/MetadataConstraintsTest.java b/server/base/src/test/java/org/apache/accumulo/server/constraints/MetadataConstraintsTest.java
index 2dfce17..8db6d75 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/constraints/MetadataConstraintsTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/constraints/MetadataConstraintsTest.java
@@ -44,14 +44,14 @@ public class MetadataConstraintsTest {
       return new Arbitrator() {
 
         @Override
-        public boolean transactionAlive(String type, long tid) throws Exception {
+        public boolean transactionAlive(String type, long tid) {
           if (tid == 9)
             throw new RuntimeException("txid 9 reserved for future use");
           return tid == 5 || tid == 7;
         }
 
         @Override
-        public boolean transactionComplete(String type, long tid) throws Exception {
+        public boolean transactionComplete(String type, long tid) {
           return tid != 5 && tid != 7;
         }
       };
diff --git a/server/base/src/test/java/org/apache/accumulo/server/fs/PerTableVolumeChooserTest.java b/server/base/src/test/java/org/apache/accumulo/server/fs/PerTableVolumeChooserTest.java
index a177493..89e8f9e 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/fs/PerTableVolumeChooserTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/fs/PerTableVolumeChooserTest.java
@@ -73,7 +73,7 @@ public class PerTableVolumeChooserTest {
   }
 
   @After
-  public void after() throws Exception {
+  public void after() {
     verify(confFactory, tableConf, systemConf);
   }
 
@@ -88,14 +88,14 @@ public class PerTableVolumeChooserTest {
   }
 
   @Test
-  public void testInitScopeSelectsRandomChooser() throws Exception {
+  public void testInitScopeSelectsRandomChooser() {
     replay(confFactory, tableConf, systemConf);
     VolumeChooser delegate = getDelegate(ChooserScope.INIT);
     assertSame(RandomVolumeChooser.class, delegate.getClass());
   }
 
   @Test
-  public void testTableScopeUsingTableProperty() throws Exception {
+  public void testTableScopeUsingTableProperty() {
     expect(tableConf.get(PerTableVolumeChooser.TABLE_VOLUME_CHOOSER))
         .andReturn(MockChooser1.class.getName());
     replay(confFactory, tableConf, systemConf);
@@ -105,7 +105,7 @@ public class PerTableVolumeChooserTest {
   }
 
   @Test
-  public void testTableScopeUsingDefaultScopeProperty() throws Exception {
+  public void testTableScopeUsingDefaultScopeProperty() {
     expect(tableConf.get(PerTableVolumeChooser.TABLE_VOLUME_CHOOSER)).andReturn(null).once();
     expect(systemConf.get(PerTableVolumeChooser.getPropertyNameForScope(ChooserScope.DEFAULT)))
         .andReturn(MockChooser2.class.getName()).once();
@@ -116,7 +116,7 @@ public class PerTableVolumeChooserTest {
   }
 
   @Test
-  public void testTableScopeWithNoConfig() throws Exception {
+  public void testTableScopeWithNoConfig() {
     expect(tableConf.get(PerTableVolumeChooser.TABLE_VOLUME_CHOOSER)).andReturn(null).once();
     expect(systemConf.get(PerTableVolumeChooser.getPropertyNameForScope(ChooserScope.DEFAULT)))
         .andReturn(null).once();
@@ -128,7 +128,7 @@ public class PerTableVolumeChooserTest {
   }
 
   @Test
-  public void testTableScopeWithBadDelegate() throws Exception {
+  public void testTableScopeWithBadDelegate() {
     expect(tableConf.get(PerTableVolumeChooser.TABLE_VOLUME_CHOOSER)).andReturn(null).once();
     expect(systemConf.get(PerTableVolumeChooser.getPropertyNameForScope(ChooserScope.DEFAULT)))
         .andReturn("not a valid class name").once();
@@ -140,7 +140,7 @@ public class PerTableVolumeChooserTest {
   }
 
   @Test
-  public void testLoggerScopeUsingLoggerProperty() throws Exception {
+  public void testLoggerScopeUsingLoggerProperty() {
     expect(systemConf.get(PerTableVolumeChooser.getPropertyNameForScope(ChooserScope.LOGGER)))
         .andReturn(MockChooser1.class.getName()).once();
     replay(confFactory, tableConf, systemConf);
@@ -150,7 +150,7 @@ public class PerTableVolumeChooserTest {
   }
 
   @Test
-  public void testLoggerScopeUsingDefaultProperty() throws Exception {
+  public void testLoggerScopeUsingDefaultProperty() {
     expect(systemConf.get(PerTableVolumeChooser.getPropertyNameForScope(ChooserScope.LOGGER)))
         .andReturn(null).once();
     expect(systemConf.get(PerTableVolumeChooser.getPropertyNameForScope(ChooserScope.DEFAULT)))
@@ -162,7 +162,7 @@ public class PerTableVolumeChooserTest {
   }
 
   @Test
-  public void testLoggerScopeWithNoConfig() throws Exception {
+  public void testLoggerScopeWithNoConfig() {
     expect(systemConf.get(PerTableVolumeChooser.getPropertyNameForScope(ChooserScope.LOGGER)))
         .andReturn(null).once();
     expect(systemConf.get(PerTableVolumeChooser.getPropertyNameForScope(ChooserScope.DEFAULT)))
@@ -175,7 +175,7 @@ public class PerTableVolumeChooserTest {
   }
 
   @Test
-  public void testLoggerScopeWithBadDelegate() throws Exception {
+  public void testLoggerScopeWithBadDelegate() {
     expect(systemConf.get(PerTableVolumeChooser.getPropertyNameForScope(ChooserScope.LOGGER)))
         .andReturn(null).once();
     expect(systemConf.get(PerTableVolumeChooser.getPropertyNameForScope(ChooserScope.DEFAULT)))
diff --git a/server/base/src/test/java/org/apache/accumulo/server/fs/PreferredVolumeChooserTest.java b/server/base/src/test/java/org/apache/accumulo/server/fs/PreferredVolumeChooserTest.java
index a745ad6..076b29a 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/fs/PreferredVolumeChooserTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/fs/PreferredVolumeChooserTest.java
@@ -69,7 +69,7 @@ public class PreferredVolumeChooserTest {
   }
 
   @After
-  public void after() throws Exception {
+  public void after() {
     verify(confFactory, tableConf, systemConf);
   }
 
@@ -84,14 +84,14 @@ public class PreferredVolumeChooserTest {
   }
 
   @Test
-  public void testInitScopeSelectsRandomlyFromAll() throws Exception {
+  public void testInitScopeSelectsRandomlyFromAll() {
     replay(confFactory, tableConf, systemConf);
     String[] volumes = choose(ChooserScope.INIT);
     assertSame(ALL_OPTIONS, volumes);
   }
 
   @Test
-  public void testTableScopeUsingTableProperty() throws Exception {
+  public void testTableScopeUsingTableProperty() {
     expect(tableConf.get(PreferredVolumeChooser.TABLE_PREFERRED_VOLUMES)).andReturn("2,1");
     replay(confFactory, tableConf, systemConf);
 
@@ -101,7 +101,7 @@ public class PreferredVolumeChooserTest {
   }
 
   @Test
-  public void testTableScopeUsingDefaultScopeProperty() throws Exception {
+  public void testTableScopeUsingDefaultScopeProperty() {
     expect(tableConf.get(PreferredVolumeChooser.TABLE_PREFERRED_VOLUMES)).andReturn(null).once();
     expect(systemConf.get(PreferredVolumeChooser.getPropertyNameForScope(ChooserScope.DEFAULT)))
         .andReturn("3,2").once();
@@ -113,7 +113,7 @@ public class PreferredVolumeChooserTest {
   }
 
   @Test
-  public void testTableScopeWithNoConfig() throws Exception {
+  public void testTableScopeWithNoConfig() {
     expect(tableConf.get(PreferredVolumeChooser.TABLE_PREFERRED_VOLUMES)).andReturn(null).once();
     expect(systemConf.get(PreferredVolumeChooser.getPropertyNameForScope(ChooserScope.DEFAULT)))
         .andReturn(null).once();
@@ -125,7 +125,7 @@ public class PreferredVolumeChooserTest {
   }
 
   @Test
-  public void testTableScopeWithEmptySet() throws Exception {
+  public void testTableScopeWithEmptySet() {
     expect(tableConf.get(PreferredVolumeChooser.TABLE_PREFERRED_VOLUMES)).andReturn(",").once();
     replay(confFactory, tableConf, systemConf);
 
@@ -135,7 +135,7 @@ public class PreferredVolumeChooserTest {
   }
 
   @Test
-  public void testTableScopeWithUnrecognizedVolumes() throws Exception {
+  public void testTableScopeWithUnrecognizedVolumes() {
     expect(tableConf.get(PreferredVolumeChooser.TABLE_PREFERRED_VOLUMES)).andReturn(null).once();
     expect(systemConf.get(PreferredVolumeChooser.getPropertyNameForScope(ChooserScope.DEFAULT)))
         .andReturn("4").once();
@@ -147,7 +147,7 @@ public class PreferredVolumeChooserTest {
   }
 
   @Test
-  public void testLoggerScopeUsingLoggerProperty() throws Exception {
+  public void testLoggerScopeUsingLoggerProperty() {
     expect(systemConf.get(PreferredVolumeChooser.getPropertyNameForScope(ChooserScope.LOGGER)))
         .andReturn("2,1").once();
     replay(confFactory, tableConf, systemConf);
@@ -158,7 +158,7 @@ public class PreferredVolumeChooserTest {
   }
 
   @Test
-  public void testLoggerScopeUsingDefaultProperty() throws Exception {
+  public void testLoggerScopeUsingDefaultProperty() {
     expect(systemConf.get(PreferredVolumeChooser.getPropertyNameForScope(ChooserScope.LOGGER)))
         .andReturn(null).once();
     expect(systemConf.get(PreferredVolumeChooser.getPropertyNameForScope(ChooserScope.DEFAULT)))
@@ -171,7 +171,7 @@ public class PreferredVolumeChooserTest {
   }
 
   @Test
-  public void testLoggerScopeWithNoConfig() throws Exception {
+  public void testLoggerScopeWithNoConfig() {
     expect(systemConf.get(PreferredVolumeChooser.getPropertyNameForScope(ChooserScope.LOGGER)))
         .andReturn(null).once();
     expect(systemConf.get(PreferredVolumeChooser.getPropertyNameForScope(ChooserScope.DEFAULT)))
@@ -184,7 +184,7 @@ public class PreferredVolumeChooserTest {
   }
 
   @Test
-  public void testLoggerScopeWithEmptySet() throws Exception {
+  public void testLoggerScopeWithEmptySet() {
     expect(systemConf.get(PreferredVolumeChooser.getPropertyNameForScope(ChooserScope.LOGGER)))
         .andReturn(",").once();
     replay(confFactory, tableConf, systemConf);
@@ -195,7 +195,7 @@ public class PreferredVolumeChooserTest {
   }
 
   @Test
-  public void testLoggerScopeWithUnrecognizedVolumes() throws Exception {
+  public void testLoggerScopeWithUnrecognizedVolumes() {
     expect(systemConf.get(PreferredVolumeChooser.getPropertyNameForScope(ChooserScope.LOGGER)))
         .andReturn(null).once();
     expect(systemConf.get(PreferredVolumeChooser.getPropertyNameForScope(ChooserScope.DEFAULT)))
diff --git a/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeManagerImplTest.java b/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeManagerImplTest.java
index e7a1a5a..5a01a83 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeManagerImplTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeManagerImplTest.java
@@ -46,25 +46,25 @@ public class VolumeManagerImplTest {
   }
 
   @Test
-  public void defaultTabletDirWithoutTableId() throws Exception {
+  public void defaultTabletDirWithoutTableId() {
     thrown.expect(IllegalArgumentException.class);
     fs.getFullPath(FileType.TABLE, "/default_tablet/");
   }
 
   @Test
-  public void tabletDirWithoutTableId() throws Exception {
+  public void tabletDirWithoutTableId() {
     thrown.expect(IllegalArgumentException.class);
     fs.getFullPath(FileType.TABLE, "/t-0000001/");
   }
 
   @Test
-  public void defaultTabletFileWithoutTableId() throws Exception {
+  public void defaultTabletFileWithoutTableId() {
     thrown.expect(IllegalArgumentException.class);
     fs.getFullPath(FileType.TABLE, "/default_tablet/C0000001.rf");
   }
 
   @Test
-  public void tabletFileWithoutTableId() throws Exception {
+  public void tabletFileWithoutTableId() {
     thrown.expect(IllegalArgumentException.class);
     fs.getFullPath(FileType.TABLE, "/t-0000001/C0000001.rf");
   }
diff --git a/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeUtilTest.java b/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeUtilTest.java
index b0ea26a..5444ea5 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeUtilTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeUtilTest.java
@@ -226,7 +226,7 @@ public class VolumeUtilTest {
   }
 
   @Test
-  public void testRootTableReplacement() throws IOException {
+  public void testRootTableReplacement() {
     List<Pair<Path,Path>> replacements = new ArrayList<>();
     replacements.add(new Pair<>(new Path("file:/foo/v1"), new Path("file:/foo/v8")));
     replacements.add(new Pair<>(new Path("file:/foo/v2"), new Path("file:/foo/v9")));
diff --git a/server/base/src/test/java/org/apache/accumulo/server/init/InitializeTest.java b/server/base/src/test/java/org/apache/accumulo/server/init/InitializeTest.java
index 2ef34b6..674a942 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/init/InitializeTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/init/InitializeTest.java
@@ -49,7 +49,7 @@ public class InitializeTest {
 
   @SuppressWarnings("deprecation")
   @Before
-  public void setUp() throws Exception {
+  public void setUp() {
     conf = createMock(Configuration.class);
     fs = createMock(VolumeManager.class);
     sconf = createMock(SiteConfiguration.class);
diff --git a/server/base/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java b/server/base/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java
index 1fb6577..b70acc8 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java
@@ -41,12 +41,12 @@ import org.junit.Test;
 public class MetadataBulkLoadFilterTest {
   static class TestArbitrator implements Arbitrator {
     @Override
-    public boolean transactionAlive(String type, long tid) throws Exception {
+    public boolean transactionAlive(String type, long tid) {
       return tid == 5;
     }
 
     @Override
-    public boolean transactionComplete(String type, long tid) throws Exception {
+    public boolean transactionComplete(String type, long tid) {
       if (tid == 9)
         throw new RuntimeException();
       return tid != 5 && tid != 7;
diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java
index d5c661d..3fadbe4 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java
@@ -37,7 +37,6 @@ import org.apache.accumulo.core.clientImpl.ClientContext;
 import org.apache.accumulo.core.clientImpl.Namespace;
 import org.apache.accumulo.core.clientImpl.Table;
 import org.apache.accumulo.core.clientImpl.TableOperationsImpl;
-import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException;
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.conf.ConfigurationCopy;
 import org.apache.accumulo.core.conf.DefaultConfiguration;
@@ -53,7 +52,6 @@ import org.apache.accumulo.server.conf.ServerConfigurationFactory;
 import org.apache.accumulo.server.conf.TableConfiguration;
 import org.apache.accumulo.server.master.state.TServerInstance;
 import org.apache.hadoop.io.Text;
-import org.apache.thrift.TException;
 import org.easymock.EasyMock;
 
 public abstract class BaseHostRegexTableLoadBalancerTest extends HostRegexTableLoadBalancer {
@@ -142,8 +140,7 @@ public abstract class BaseHostRegexTableLoadBalancerTest extends HostRegexTableL
 
   protected class TestDefaultBalancer extends DefaultLoadBalancer {
     @Override
-    public List<TabletStats> getOnlineTabletsForTable(TServerInstance tserver, Table.ID tableId)
-        throws ThriftSecurityException, TException {
+    public List<TabletStats> getOnlineTabletsForTable(TServerInstance tserver, Table.ID tableId) {
       String tableName = idToTableName(tableId);
       TServerInstance initialLocation = initialTableLocation.get(tableName);
       if (tserver.equals(initialLocation)) {
diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancerTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancerTest.java
index 0abb1dc..9d5a123 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancerTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancerTest.java
@@ -29,7 +29,6 @@ import java.util.SortedMap;
 import java.util.TreeMap;
 
 import org.apache.accumulo.core.clientImpl.Table;
-import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException;
 import org.apache.accumulo.core.dataImpl.KeyExtent;
 import org.apache.accumulo.core.master.thrift.TableInfo;
 import org.apache.accumulo.core.master.thrift.TabletServerStatus;
@@ -38,7 +37,6 @@ import org.apache.accumulo.core.util.HostAndPort;
 import org.apache.accumulo.server.master.state.TServerInstance;
 import org.apache.accumulo.server.master.state.TabletMigration;
 import org.apache.hadoop.io.Text;
-import org.apache.thrift.TException;
 import org.junit.Test;
 
 public class ChaoticLoadBalancerTest {
@@ -68,8 +66,7 @@ public class ChaoticLoadBalancerTest {
   class TestChaoticLoadBalancer extends ChaoticLoadBalancer {
 
     @Override
-    public List<TabletStats> getOnlineTabletsForTable(TServerInstance tserver, Table.ID table)
-        throws ThriftSecurityException, TException {
+    public List<TabletStats> getOnlineTabletsForTable(TServerInstance tserver, Table.ID table) {
       List<TabletStats> result = new ArrayList<>();
       for (KeyExtent extent : servers.get(tserver).extents) {
         if (extent.getTableId().equals(table)) {
diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancerTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancerTest.java
index 3096e8a..045e93a 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancerTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancerTest.java
@@ -32,7 +32,6 @@ import java.util.SortedMap;
 import java.util.TreeMap;
 
 import org.apache.accumulo.core.clientImpl.Table;
-import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException;
 import org.apache.accumulo.core.dataImpl.KeyExtent;
 import org.apache.accumulo.core.master.thrift.TableInfo;
 import org.apache.accumulo.core.master.thrift.TabletServerStatus;
@@ -41,7 +40,6 @@ import org.apache.accumulo.core.util.HostAndPort;
 import org.apache.accumulo.server.master.state.TServerInstance;
 import org.apache.accumulo.server.master.state.TabletMigration;
 import org.apache.hadoop.io.Text;
-import org.apache.thrift.TException;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -73,8 +71,7 @@ public class DefaultLoadBalancerTest {
   class TestDefaultLoadBalancer extends DefaultLoadBalancer {
 
     @Override
-    public List<TabletStats> getOnlineTabletsForTable(TServerInstance tserver, Table.ID table)
-        throws ThriftSecurityException, TException {
+    public List<TabletStats> getOnlineTabletsForTable(TServerInstance tserver, Table.ID table) {
       List<TabletStats> result = new ArrayList<>();
       for (KeyExtent extent : servers.get(tserver).extents) {
         if (extent.getTableId().equals(table)) {
diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerReconfigurationTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerReconfigurationTest.java
index 5222a30..06c21fa 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerReconfigurationTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerReconfigurationTest.java
@@ -32,14 +32,12 @@ import java.util.Map.Entry;
 import java.util.Set;
 
 import org.apache.accumulo.core.clientImpl.Table;
-import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException;
 import org.apache.accumulo.core.dataImpl.KeyExtent;
 import org.apache.accumulo.core.tabletserver.thrift.TabletStats;
 import org.apache.accumulo.fate.util.UtilWaitThread;
 import org.apache.accumulo.server.ServerContext;
 import org.apache.accumulo.server.master.state.TServerInstance;
 import org.apache.accumulo.server.master.state.TabletMigration;
-import org.apache.thrift.TException;
 import org.junit.Test;
 
 public class HostRegexTableLoadBalancerReconfigurationTest
@@ -108,8 +106,7 @@ public class HostRegexTableLoadBalancerReconfigurationTest
   }
 
   @Override
-  public List<TabletStats> getOnlineTabletsForTable(TServerInstance tserver, Table.ID tableId)
-      throws ThriftSecurityException, TException {
+  public List<TabletStats> getOnlineTabletsForTable(TServerInstance tserver, Table.ID tableId) {
     List<TabletStats> tablets = new ArrayList<>();
     // Report assignment information
     for (Entry<KeyExtent,TServerInstance> e : this.assignments.entrySet()) {
diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java
index 995bc48..776b39f 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java
@@ -52,7 +52,6 @@ import org.apache.accumulo.server.conf.ServerConfigurationFactory;
 import org.apache.accumulo.server.conf.TableConfiguration;
 import org.apache.accumulo.server.master.state.TServerInstance;
 import org.apache.accumulo.server.master.state.TabletMigration;
-import org.apache.thrift.TException;
 import org.junit.Test;
 
 public class HostRegexTableLoadBalancerTest extends BaseHostRegexTableLoadBalancerTest {
@@ -512,8 +511,7 @@ public class HostRegexTableLoadBalancerTest extends BaseHostRegexTableLoadBalanc
   }
 
   @Override
-  public List<TabletStats> getOnlineTabletsForTable(TServerInstance tserver, Table.ID tableId)
-      throws TException {
+  public List<TabletStats> getOnlineTabletsForTable(TServerInstance tserver, Table.ID tableId) {
     // Report incorrect information so that balance will create an assignment
     List<TabletStats> tablets = new ArrayList<>();
     if (tableId.equals(BAR.getId()) && tserver.host().equals("192.168.0.1")) {
diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java
index 94cc5fa..f0749ec 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java
@@ -32,7 +32,6 @@ import java.util.UUID;
 
 import org.apache.accumulo.core.client.admin.TableOperations;
 import org.apache.accumulo.core.clientImpl.Table;
-import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException;
 import org.apache.accumulo.core.conf.DefaultConfiguration;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.conf.SiteConfiguration;
@@ -48,7 +47,6 @@ import org.apache.accumulo.server.conf.TableConfiguration;
 import org.apache.accumulo.server.master.state.TServerInstance;
 import org.apache.accumulo.server.master.state.TabletMigration;
 import org.apache.hadoop.io.Text;
-import org.apache.thrift.TException;
 import org.easymock.EasyMock;
 import org.junit.Test;
 
@@ -59,7 +57,7 @@ public class TableLoadBalancerTest {
   private static Map<String,String> TABLE_ID_MAP = ImmutableMap.of("t1", "a1", "t2", "b12", "t3",
       "c4");
 
-  private static TServerInstance mkts(String address, String session) throws Exception {
+  private static TServerInstance mkts(String address, String session) {
     return new TServerInstance(HostAndPort.fromParts(address, 1234), session);
   }
 
@@ -107,8 +105,7 @@ public class TableLoadBalancerTest {
     public void init(ServerContext context) {}
 
     @Override
-    public List<TabletStats> getOnlineTabletsForTable(TServerInstance tserver, Table.ID tableId)
-        throws ThriftSecurityException, TException {
+    public List<TabletStats> getOnlineTabletsForTable(TServerInstance tserver, Table.ID tableId) {
       return generateFakeTablets(tserver, tableId);
     }
   }
@@ -124,8 +121,7 @@ public class TableLoadBalancerTest {
 
     // we don't have real tablet servers to ask: invent some online tablets
     @Override
-    public List<TabletStats> getOnlineTabletsForTable(TServerInstance tserver, Table.ID tableId)
-        throws ThriftSecurityException, TException {
+    public List<TabletStats> getOnlineTabletsForTable(TServerInstance tserver, Table.ID tableId) {
       return generateFakeTablets(tserver, tableId);
     }
 
@@ -151,7 +147,7 @@ public class TableLoadBalancerTest {
   }
 
   @Test
-  public void test() throws Exception {
+  public void test() {
     final ServerContext context = createMockContext();
     replay(context);
     ServerConfigurationFactory confFactory = new ServerConfigurationFactory(context,
diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/state/MergeInfoTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/state/MergeInfoTest.java
index 293c8e6..b702c45 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/master/state/MergeInfoTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/master/state/MergeInfoTest.java
@@ -45,7 +45,7 @@ public class MergeInfoTest {
   private MergeInfo mi;
 
   @Before
-  public void setUp() throws Exception {
+  public void setUp() {
     keyExtent = createMock(KeyExtent.class);
   }
 
@@ -204,7 +204,7 @@ public class MergeInfoTest {
   }
 
   @Test
-  public void testNeedsToBeChopped() throws Exception {
+  public void testNeedsToBeChopped() {
     MergeInfo info = new MergeInfo(ke("x", "b", "a"), MergeInfo.Operation.DELETE);
     assertTrue(info.needsToBeChopped(ke("x", "c", "b")));
     assertTrue(info.overlaps(ke("x", "c", "b")));
diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/state/TabletLocationStateTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/state/TabletLocationStateTest.java
index 28c8ae8..ea084ae 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/master/state/TabletLocationStateTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/master/state/TabletLocationStateTest.java
@@ -51,7 +51,7 @@ public class TabletLocationStateTest {
   private TabletLocationState tls;
 
   @Before
-  public void setUp() throws Exception {
+  public void setUp() {
     keyExtent = createMock(KeyExtent.class);
     future = createMock(TServerInstance.class);
     current = createMock(TServerInstance.class);
diff --git a/server/base/src/test/java/org/apache/accumulo/server/problems/ProblemReportTest.java b/server/base/src/test/java/org/apache/accumulo/server/problems/ProblemReportTest.java
index 16d6b11..8808567 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/problems/ProblemReportTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/problems/ProblemReportTest.java
@@ -53,7 +53,7 @@ public class ProblemReportTest {
   private ProblemReport r;
 
   @Before
-  public void setUp() throws Exception {
+  public void setUp() {
     context = createMock(ServerContext.class);
     zoorw = createMock(ZooReaderWriter.class);
     expect(context.getZooKeeperRoot()).andReturn("/accumulo/instance");
diff --git a/server/base/src/test/java/org/apache/accumulo/server/problems/ProblemReportingIteratorTest.java b/server/base/src/test/java/org/apache/accumulo/server/problems/ProblemReportingIteratorTest.java
index 245789d..ff84d5a 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/problems/ProblemReportingIteratorTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/problems/ProblemReportingIteratorTest.java
@@ -45,7 +45,7 @@ public class ProblemReportingIteratorTest {
   private ProblemReportingIterator pri;
 
   @Before
-  public void setUp() throws Exception {
+  public void setUp() {
     ii = EasyMock.createMock(InterruptibleIterator.class);
     pri = new ProblemReportingIterator(null, TABLE_ID, RESOURCE, false, ii);
   }
@@ -66,7 +66,7 @@ public class ProblemReportingIteratorTest {
   }
 
   @Test(expected = UnsupportedOperationException.class)
-  public void testInit() throws Exception {
+  public void testInit() {
     pri.init(null, null, null);
   }
 
diff --git a/server/base/src/test/java/org/apache/accumulo/server/rpc/SaslDigestCallbackHandlerTest.java b/server/base/src/test/java/org/apache/accumulo/server/rpc/SaslDigestCallbackHandlerTest.java
index 74f753d..b1006e5 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/rpc/SaslDigestCallbackHandlerTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/rpc/SaslDigestCallbackHandlerTest.java
@@ -26,7 +26,6 @@ import java.util.Map.Entry;
 
 import javax.crypto.KeyGenerator;
 import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.UnsupportedCallbackException;
 
 import org.apache.accumulo.core.client.admin.DelegationTokenConfig;
 import org.apache.accumulo.core.clientImpl.AuthenticationTokenIdentifier;
@@ -45,7 +44,7 @@ public class SaslDigestCallbackHandlerTest {
    */
   private static class SaslTestDigestCallbackHandler extends SaslDigestCallbackHandler {
     @Override
-    public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
+    public void handle(Callback[] callbacks) {
       throw new UnsupportedOperationException();
     }
   }
diff --git a/server/base/src/test/java/org/apache/accumulo/server/security/UserImpersonationTest.java b/server/base/src/test/java/org/apache/accumulo/server/security/UserImpersonationTest.java
index c76e54b..72535cd 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/security/UserImpersonationTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/security/UserImpersonationTest.java
@@ -275,7 +275,7 @@ public class UserImpersonationTest {
   }
 
   @Test
-  public void testSingleUser() throws Exception {
+  public void testSingleUser() {
     final String server = "server/hostname@EXAMPLE.COM", client = "client@EXAMPLE.COM";
     cc.set(Property.INSTANCE_RPC_SASL_ALLOWED_USER_IMPERSONATION, server + ":" + client);
     cc.set(Property.INSTANCE_RPC_SASL_ALLOWED_HOST_IMPERSONATION, "*");
diff --git a/server/base/src/test/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyWatcherTest.java b/server/base/src/test/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyWatcherTest.java
index b0e379c..156cd7e 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyWatcherTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyWatcherTest.java
@@ -132,7 +132,7 @@ public class ZooAuthenticationKeyWatcherTest {
   }
 
   @Test
-  public void testBaseNodeDeleted() throws Exception {
+  public void testBaseNodeDeleted() {
     WatchedEvent event = new WatchedEvent(EventType.NodeDeleted, null, baseNode);
     AuthenticationKey key1 = new AuthenticationKey(1, 0L, 10000L, keyGen.generateKey()),
         key2 = new AuthenticationKey(2, key1.getExpirationDate(), 20000L, keyGen.generateKey());
@@ -151,7 +151,7 @@ public class ZooAuthenticationKeyWatcherTest {
   }
 
   @Test
-  public void testBaseNodeDataChanged() throws Exception {
+  public void testBaseNodeDataChanged() {
     WatchedEvent event = new WatchedEvent(EventType.NodeDataChanged, null, baseNode);
 
     replay(zk);
@@ -185,7 +185,7 @@ public class ZooAuthenticationKeyWatcherTest {
   }
 
   @Test
-  public void testChildDeleted() throws Exception {
+  public void testChildDeleted() {
     WatchedEvent event = new WatchedEvent(EventType.NodeDeleted, null, baseNode + "/1");
     AuthenticationKey key1 = new AuthenticationKey(1, 0L, 10000L, keyGen.generateKey()),
         key2 = new AuthenticationKey(2, key1.getExpirationDate(), 20000L, keyGen.generateKey());
@@ -204,7 +204,7 @@ public class ZooAuthenticationKeyWatcherTest {
   }
 
   @Test
-  public void testChildChildrenChanged() throws Exception {
+  public void testChildChildrenChanged() {
     WatchedEvent event = new WatchedEvent(EventType.NodeChildrenChanged, null, baseNode + "/2");
     AuthenticationKey key1 = new AuthenticationKey(1, 0L, 10000L, keyGen.generateKey()),
         key2 = new AuthenticationKey(2, key1.getExpirationDate(), 20000L, keyGen.generateKey());
diff --git a/server/base/src/test/java/org/apache/accumulo/server/tablets/LogicalTimeTest.java b/server/base/src/test/java/org/apache/accumulo/server/tablets/LogicalTimeTest.java
index 1076249..defb7da 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/tablets/LogicalTimeTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/tablets/LogicalTimeTest.java
@@ -34,7 +34,7 @@ public class LogicalTimeTest {
   private LogicalTime ltime;
 
   @Before
-  public void setUp() throws Exception {
+  public void setUp() {
     ltime = (LogicalTime) TabletTime.getInstance("L1234");
   }
 
diff --git a/server/base/src/test/java/org/apache/accumulo/server/tablets/MillisTimeTest.java b/server/base/src/test/java/org/apache/accumulo/server/tablets/MillisTimeTest.java
index 49f5913..1fee2a0 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/tablets/MillisTimeTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/tablets/MillisTimeTest.java
@@ -36,7 +36,7 @@ public class MillisTimeTest {
   private MillisTime mtime;
 
   @Before
-  public void setUp() throws Exception {
+  public void setUp() {
     mtime = new MillisTime(TIME);
   }
 
diff --git a/server/base/src/test/java/org/apache/accumulo/server/tablets/TabletTimeTest.java b/server/base/src/test/java/org/apache/accumulo/server/tablets/TabletTimeTest.java
index 46068e3..e8fff7c 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/tablets/TabletTimeTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/tablets/TabletTimeTest.java
@@ -34,7 +34,7 @@ public class TabletTimeTest {
   private MillisTime mtime;
 
   @Before
-  public void setUp() throws Exception {
+  public void setUp() {
     mtime = new MillisTime(TIME);
   }
 
diff --git a/server/base/src/test/java/org/apache/accumulo/server/zookeeper/TransactionWatcherTest.java b/server/base/src/test/java/org/apache/accumulo/server/zookeeper/TransactionWatcherTest.java
index 633f27d..d607250 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/zookeeper/TransactionWatcherTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/zookeeper/TransactionWatcherTest.java
@@ -70,7 +70,7 @@ public class TransactionWatcherTest {
     }
 
     @Override
-    public synchronized boolean transactionAlive(String txType, long tid) throws Exception {
+    public synchronized boolean transactionAlive(String txType, long tid) {
       List<Long> txids = started.get(txType);
       if (txids == null)
         return false;
@@ -78,7 +78,7 @@ public class TransactionWatcherTest {
     }
 
     @Override
-    public boolean transactionComplete(String txType, long tid) throws Exception {
+    public boolean transactionComplete(String txType, long tid) {
       List<Long> txids = cleanedUp.get(txType);
       if (txids == null)
         return true;
diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/GCExecutable.java b/server/gc/src/main/java/org/apache/accumulo/gc/GCExecutable.java
index 0f8d397..8bc45bd 100644
--- a/server/gc/src/main/java/org/apache/accumulo/gc/GCExecutable.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/GCExecutable.java
@@ -16,8 +16,6 @@
  */
 package org.apache.accumulo.gc;
 
-import java.io.IOException;
-
 import org.apache.accumulo.start.spi.KeywordExecutable;
 
 import com.google.auto.service.AutoService;
@@ -40,7 +38,7 @@ public class GCExecutable implements KeywordExecutable {
   }
 
   @Override
-  public void execute(final String[] args) throws IOException {
+  public void execute(final String[] args) {
     SimpleGarbageCollector.main(args);
   }
 }
diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
index ef8f486..06044d0 100644
--- a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
@@ -58,7 +58,6 @@ import org.apache.accumulo.server.master.state.TabletState;
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.Text;
-import org.apache.zookeeper.KeeperException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -85,8 +84,7 @@ public class GarbageCollectWriteAheadLogs {
    * @param useTrash
    *          true to move files to trash rather than delete them
    */
-  GarbageCollectWriteAheadLogs(final ServerContext context, VolumeManager fs, boolean useTrash)
-      throws IOException {
+  GarbageCollectWriteAheadLogs(final ServerContext context, VolumeManager fs, boolean useTrash) {
     this.context = context;
     this.fs = fs;
     this.useTrash = useTrash;
@@ -114,8 +112,8 @@ public class GarbageCollectWriteAheadLogs {
    */
   @VisibleForTesting
   GarbageCollectWriteAheadLogs(ServerContext context, VolumeManager fs, boolean useTrash,
-      LiveTServerSet liveTServerSet, WalStateManager walMarker, Iterable<TabletLocationState> store)
-      throws IOException {
+      LiveTServerSet liveTServerSet, WalStateManager walMarker,
+      Iterable<TabletLocationState> store) {
     this.context = context;
     this.fs = fs;
     this.useTrash = useTrash;
@@ -276,7 +274,7 @@ public class GarbageCollectWriteAheadLogs {
 
   private Map<UUID,TServerInstance> removeEntriesInUse(Map<TServerInstance,Set<UUID>> candidates,
       Set<TServerInstance> liveServers, Map<UUID,Pair<WalState,Path>> logsState,
-      Map<UUID,Path> recoveryLogs) throws IOException, KeeperException, InterruptedException {
+      Map<UUID,Path> recoveryLogs) {
 
     Map<UUID,TServerInstance> result = new HashMap<>();
     for (Entry<TServerInstance,Set<UUID>> entry : candidates.entrySet()) {
@@ -335,8 +333,7 @@ public class GarbageCollectWriteAheadLogs {
     return result;
   }
 
-  protected int removeReplicationEntries(Map<UUID,TServerInstance> candidates)
-      throws IOException, KeeperException, InterruptedException {
+  protected int removeReplicationEntries(Map<UUID,TServerInstance> candidates) {
     try {
       try {
         final Scanner s = ReplicationTable.getScanner(context);
diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
index 532ee28..d193840 100644
--- a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
@@ -29,8 +29,6 @@ import java.util.SortedMap;
 import java.util.TreeMap;
 
 import org.apache.accumulo.core.Constants;
-import org.apache.accumulo.core.client.AccumuloException;
-import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.clientImpl.Table;
 import org.apache.accumulo.core.trace.Span;
@@ -126,8 +124,7 @@ public class GarbageCollectionAlgorithm {
   }
 
   private void confirmDeletes(GarbageCollectionEnvironment gce,
-      SortedMap<String,String> candidateMap)
-      throws TableNotFoundException, AccumuloException, AccumuloSecurityException {
+      SortedMap<String,String> candidateMap) throws TableNotFoundException {
     boolean checkForBulkProcessingFiles = false;
     Iterator<String> relativePaths = candidateMap.keySet().iterator();
     while (!checkForBulkProcessingFiles && relativePaths.hasNext())
@@ -268,8 +265,7 @@ public class GarbageCollectionAlgorithm {
   }
 
   private boolean getCandidates(GarbageCollectionEnvironment gce, String lastCandidate,
-      List<String> candidates)
-      throws TableNotFoundException, AccumuloException, AccumuloSecurityException {
+      List<String> candidates) throws TableNotFoundException {
     Span candidatesSpan = Trace.start("getCandidates");
     try {
       return gce.getCandidates(lastCandidate, candidates);
@@ -279,8 +275,7 @@ public class GarbageCollectionAlgorithm {
   }
 
   private void confirmDeletesTrace(GarbageCollectionEnvironment gce,
-      SortedMap<String,String> candidateMap)
-      throws TableNotFoundException, AccumuloException, AccumuloSecurityException {
+      SortedMap<String,String> candidateMap) throws TableNotFoundException {
     Span confirmDeletesSpan = Trace.start("confirmDeletes");
     try {
       confirmDeletes(gce, candidateMap);
@@ -290,8 +285,7 @@ public class GarbageCollectionAlgorithm {
   }
 
   private void deleteConfirmed(GarbageCollectionEnvironment gce,
-      SortedMap<String,String> candidateMap)
-      throws IOException, AccumuloException, AccumuloSecurityException, TableNotFoundException {
+      SortedMap<String,String> candidateMap) throws IOException, TableNotFoundException {
     Span deleteSpan = Trace.start("deleteFiles");
     try {
       gce.delete(candidateMap);
@@ -302,8 +296,7 @@ public class GarbageCollectionAlgorithm {
     cleanUpDeletedTableDirs(gce, candidateMap);
   }
 
-  public void collect(GarbageCollectionEnvironment gce)
-      throws TableNotFoundException, AccumuloException, AccumuloSecurityException, IOException {
+  public void collect(GarbageCollectionEnvironment gce) throws TableNotFoundException, IOException {
 
     String lastCandidate = "";
 
diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java
index a7ec9fe..4f59a60 100644
--- a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java
@@ -25,8 +25,6 @@ import java.util.Set;
 import java.util.SortedMap;
 import java.util.stream.Stream;
 
-import org.apache.accumulo.core.client.AccumuloException;
-import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.clientImpl.Table;
 import org.apache.accumulo.core.clientImpl.Table.ID;
@@ -53,7 +51,7 @@ public interface GarbageCollectionEnvironment {
    * @return true if the results are short due to insufficient memory, otherwise false
    */
   boolean getCandidates(String continuePoint, List<String> candidates)
-      throws TableNotFoundException, AccumuloException, AccumuloSecurityException;
+      throws TableNotFoundException;
 
   /**
    * Fetch a list of paths for all bulk loads in progress (blip) from a given table,
@@ -61,8 +59,7 @@ public interface GarbageCollectionEnvironment {
    *
    * @return The list of files for each bulk load currently in progress.
    */
-  Iterator<String> getBlipIterator()
-      throws TableNotFoundException, AccumuloException, AccumuloSecurityException;
+  Iterator<String> getBlipIterator() throws TableNotFoundException;
 
   static class Reference {
     public final ID id;
@@ -83,8 +80,7 @@ public interface GarbageCollectionEnvironment {
    * @return An {@link Iterator} of {@link Entry}&lt;{@link Key}, {@link Value}&gt; which constitute
    *         a reference to a file.
    */
-  Stream<Reference> getReferences()
-      throws TableNotFoundException, AccumuloException, AccumuloSecurityException;
+  Stream<Reference> getReferences();
 
   /**
    * Return the set of tableIDs for the given instance this GarbageCollector is running over
@@ -100,8 +96,7 @@ public interface GarbageCollectionEnvironment {
    * @param candidateMap
    *          A Map from relative path to absolute path for files to be deleted.
    */
-  void delete(SortedMap<String,String> candidateMap)
-      throws IOException, AccumuloException, AccumuloSecurityException, TableNotFoundException;
+  void delete(SortedMap<String,String> candidateMap) throws TableNotFoundException;
 
   /**
    * Delete a table's directory if it is empty.
@@ -132,6 +127,5 @@ public interface GarbageCollectionEnvironment {
    *
    * @return True if the file still needs to be replicated
    */
-  Iterator<Entry<String,Status>> getReplicationNeededIterator()
-      throws AccumuloException, AccumuloSecurityException;
+  Iterator<Entry<String,Status>> getReplicationNeededIterator();
 }
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 9eab1c8..07f8eb0 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
@@ -20,7 +20,6 @@ import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.net.UnknownHostException;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
@@ -34,8 +33,6 @@ import java.util.stream.Stream;
 
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.AccumuloClient;
-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.IsolatedScanner;
@@ -234,7 +231,7 @@ public class SimpleGarbageCollector implements Iface {
 
     @Override
     public boolean getCandidates(String continuePoint, List<String> result)
-        throws TableNotFoundException, AccumuloException, AccumuloSecurityException {
+        throws TableNotFoundException {
       // want to ensure GC makes progress... if the 1st N deletes are stable and we keep processing
       // them,
       // then will never inspect deletes after N
@@ -264,8 +261,7 @@ public class SimpleGarbageCollector implements Iface {
     }
 
     @Override
-    public Iterator<String> getBlipIterator()
-        throws TableNotFoundException, AccumuloException, AccumuloSecurityException {
+    public Iterator<String> getBlipIterator() throws TableNotFoundException {
       @SuppressWarnings("resource")
       IsolatedScanner scanner = new IsolatedScanner(
           getClient().createScanner(tableName, Authorizations.EMPTY));
@@ -277,8 +273,7 @@ public class SimpleGarbageCollector implements Iface {
     }
 
     @Override
-    public Stream<Reference> getReferences()
-        throws TableNotFoundException, AccumuloException, AccumuloSecurityException {
+    public Stream<Reference> getReferences() {
 
       Stream<TabletMetadata> tabletStream = TabletsMetadata.builder().scanTable(tableName)
           .checkConsistency().fetchDir().fetchFiles().fetchScans().build(getClient()).stream();
@@ -301,8 +296,7 @@ public class SimpleGarbageCollector implements Iface {
     }
 
     @Override
-    public void delete(SortedMap<String,String> confirmedDeletes)
-        throws IOException, AccumuloException, AccumuloSecurityException, TableNotFoundException {
+    public void delete(SortedMap<String,String> confirmedDeletes) throws TableNotFoundException {
 
       if (opts.safeMode) {
         if (opts.verbose)
@@ -482,8 +476,7 @@ public class SimpleGarbageCollector implements Iface {
     }
 
     @Override
-    public Iterator<Entry<String,Status>> getReplicationNeededIterator()
-        throws AccumuloException, AccumuloSecurityException {
+    public Iterator<Entry<String,Status>> getReplicationNeededIterator() {
       AccumuloClient client = getClient();
       try {
         Scanner s = ReplicationTable.getScanner(client);
@@ -664,7 +657,7 @@ public class SimpleGarbageCollector implements Iface {
     }
   }
 
-  private HostAndPort startStatsService() throws UnknownHostException {
+  private HostAndPort startStatsService() {
     Iface rpcProxy = TraceWrap.service(this);
     final Processor<Iface> processor;
     if (context.getThriftServerType() == ThriftServerType.SASL) {
diff --git a/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogsTest.java b/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogsTest.java
index dfca409..055479e 100644
--- a/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogsTest.java
+++ b/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogsTest.java
@@ -16,7 +16,6 @@
  */
 package org.apache.accumulo.gc;
 
-import java.io.IOException;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
@@ -46,7 +45,6 @@ import org.apache.accumulo.server.master.state.TServerInstance;
 import org.apache.accumulo.server.master.state.TabletLocationState;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.Text;
-import org.apache.zookeeper.KeeperException;
 import org.easymock.EasyMock;
 import org.junit.Test;
 
@@ -101,13 +99,12 @@ public class GarbageCollectWriteAheadLogsTest {
     GarbageCollectWriteAheadLogs gc = new GarbageCollectWriteAheadLogs(context, fs, false,
         tserverSet, marker, tabletOnServer1List) {
       @Override
-      protected int removeReplicationEntries(Map<UUID,TServerInstance> candidates)
-          throws IOException, KeeperException, InterruptedException {
+      protected int removeReplicationEntries(Map<UUID,TServerInstance> candidates) {
         return 0;
       }
 
       @Override
-      protected Map<UUID,Path> getSortedWALogs() throws IOException {
+      protected Map<UUID,Path> getSortedWALogs() {
         return Collections.emptyMap();
       }
     };
@@ -131,13 +128,12 @@ public class GarbageCollectWriteAheadLogsTest {
     GarbageCollectWriteAheadLogs gc = new GarbageCollectWriteAheadLogs(context, fs, false,
         tserverSet, marker, tabletOnServer1List) {
       @Override
-      protected int removeReplicationEntries(Map<UUID,TServerInstance> candidates)
-          throws IOException, KeeperException, InterruptedException {
+      protected int removeReplicationEntries(Map<UUID,TServerInstance> candidates) {
         return 0;
       }
 
       @Override
-      protected Map<UUID,Path> getSortedWALogs() throws IOException {
+      protected Map<UUID,Path> getSortedWALogs() {
         return Collections.emptyMap();
       }
     };
@@ -181,7 +177,7 @@ public class GarbageCollectWriteAheadLogsTest {
     GarbageCollectWriteAheadLogs gc = new GarbageCollectWriteAheadLogs(context, fs, false,
         tserverSet, marker, tabletOnServer1List) {
       @Override
-      protected Map<UUID,Path> getSortedWALogs() throws IOException {
+      protected Map<UUID,Path> getSortedWALogs() {
         return Collections.emptyMap();
       }
     };
@@ -220,7 +216,7 @@ public class GarbageCollectWriteAheadLogsTest {
     GarbageCollectWriteAheadLogs gc = new GarbageCollectWriteAheadLogs(context, fs, false,
         tserverSet, marker, tabletOnServer2List) {
       @Override
-      protected Map<UUID,Path> getSortedWALogs() throws IOException {
+      protected Map<UUID,Path> getSortedWALogs() {
         return Collections.emptyMap();
       }
     };
@@ -265,7 +261,7 @@ public class GarbageCollectWriteAheadLogsTest {
     GarbageCollectWriteAheadLogs gc = new GarbageCollectWriteAheadLogs(context, fs, false,
         tserverSet, marker, tabletOnServer1List) {
       @Override
-      protected Map<UUID,Path> getSortedWALogs() throws IOException {
+      protected Map<UUID,Path> getSortedWALogs() {
         return Collections.emptyMap();
       }
     };
diff --git a/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java b/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java
index d929995..5e1c17c 100644
--- a/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java
+++ b/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java
@@ -32,8 +32,6 @@ import java.util.TreeMap;
 import java.util.TreeSet;
 import java.util.stream.Stream;
 
-import org.apache.accumulo.core.client.AccumuloException;
-import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.clientImpl.Table;
 import org.apache.accumulo.server.replication.StatusUtil;
 import org.apache.accumulo.server.replication.proto.Replication.Status;
@@ -110,8 +108,7 @@ public class GarbageCollectionTest {
     public void incrementInUseStat(long i) {}
 
     @Override
-    public Iterator<Entry<String,Status>> getReplicationNeededIterator()
-        throws AccumuloException, AccumuloSecurityException {
+    public Iterator<Entry<String,Status>> getReplicationNeededIterator() {
       return filesToReplicate.entrySet().iterator();
     }
   }
diff --git a/server/gc/src/test/java/org/apache/accumulo/gc/SimpleGarbageCollectorTest.java b/server/gc/src/test/java/org/apache/accumulo/gc/SimpleGarbageCollectorTest.java
index 8a79477..376bb59 100644
--- a/server/gc/src/test/java/org/apache/accumulo/gc/SimpleGarbageCollectorTest.java
+++ b/server/gc/src/test/java/org/apache/accumulo/gc/SimpleGarbageCollectorTest.java
@@ -96,7 +96,7 @@ public class SimpleGarbageCollectorTest {
   }
 
   @Test
-  public void testInit() throws Exception {
+  public void testInit() {
     assertSame(volMgr, gc.getVolumeManager());
     assertEquals(credentials, gc.getContext().getCredentials());
     assertTrue(gc.isUsingTrash());
diff --git a/server/master/src/main/java/org/apache/accumulo/master/Master.java b/server/master/src/main/java/org/apache/accumulo/master/Master.java
index 53f3eb2..4fcde71 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/Master.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java
@@ -42,8 +42,6 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.AccumuloClient;
-import org.apache.accumulo.core.client.AccumuloException;
-import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.Scanner;
 import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.clientImpl.Namespace;
@@ -740,7 +738,7 @@ public class Master
   }
 
   public void setMergeState(MergeInfo info, MergeState state)
-      throws IOException, KeeperException, InterruptedException {
+      throws KeeperException, InterruptedException {
     synchronized (mergeLock) {
       String path = getZooKeeperRoot() + Constants.ZTABLES + "/" + info.getExtent().getTableId()
           + "/merge";
@@ -763,8 +761,7 @@ public class Master
     nextEvent.event("Merge state of %s set to %s", info.getExtent(), state);
   }
 
-  public void clearMergeState(Table.ID tableId)
-      throws IOException, KeeperException, InterruptedException {
+  public void clearMergeState(Table.ID tableId) throws KeeperException, InterruptedException {
     synchronized (mergeLock) {
       String path = getZooKeeperRoot() + Constants.ZTABLES + "/" + tableId + "/merge";
       context.getZooReaderWriter().recursiveDelete(path, NodeMissingPolicy.SKIP);
@@ -945,7 +942,7 @@ public class Master
      * the metadata table and remove any migrating tablets that no longer exist.
      */
     private void cleanupNonexistentMigrations(final AccumuloClient accumuloClient)
-        throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
+        throws TableNotFoundException {
       Scanner scanner = accumuloClient.createScanner(MetadataTable.NAME, Authorizations.EMPTY);
       TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN.fetch(scanner);
       Set<KeyExtent> found = new HashSet<>();
@@ -1085,8 +1082,7 @@ public class Master
       }
     }
 
-    private long updateStatus()
-        throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
+    private long updateStatus() {
       Set<TServerInstance> currentServers = tserverSet.getCurrentServers();
       tserverStatus = gatherTableInformation(currentServers);
       checkForHeldServer(tserverStatus);
@@ -1401,12 +1397,7 @@ public class Master
     replicationWorkDriver.start();
 
     // Start the daemon to assign work to tservers to replicate to our peers
-    try {
-      replicationWorkAssigner = new WorkDriver(this);
-    } catch (AccumuloException | AccumuloSecurityException e) {
-      log.error("Caught exception trying to initialize replication WorkDriver", e);
-      throw new RuntimeException(e);
-    }
+    replicationWorkAssigner = new WorkDriver(this);
     replicationWorkAssigner.start();
 
     // Advertise that port we used so peers don't have to be told what it is
diff --git a/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java b/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
index c6b6d55..47ccf71 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
@@ -122,7 +122,7 @@ public class MasterClientServiceHandler extends FateServiceHandler
     try {
       fid = zoo.mutate(zTablePath, null, null, new Mutator() {
         @Override
-        public byte[] mutate(byte[] currentValue) throws Exception {
+        public byte[] mutate(byte[] currentValue) {
           long flushID = Long.parseLong(new String(currentValue));
           flushID++;
           return ("" + flushID).getBytes();
@@ -228,8 +228,7 @@ public class MasterClientServiceHandler extends FateServiceHandler
   }
 
   @Override
-  public MasterMonitorInfo getMasterStats(TInfo info, TCredentials credentials)
-      throws ThriftSecurityException {
+  public MasterMonitorInfo getMasterStats(TInfo info, TCredentials credentials) {
     return master.getMasterMonitorInfo();
   }
 
@@ -451,12 +450,12 @@ public class MasterClientServiceHandler extends FateServiceHandler
   }
 
   @Override
-  public void waitForBalance(TInfo tinfo) throws TException {
+  public void waitForBalance(TInfo tinfo) {
     master.waitForBalance(tinfo);
   }
 
   @Override
-  public List<String> getActiveTservers(TInfo tinfo, TCredentials credentials) throws TException {
+  public List<String> getActiveTservers(TInfo tinfo, TCredentials credentials) {
     Set<TServerInstance> tserverInstances = master.onlineTabletServers();
     List<String> servers = new ArrayList<>();
     for (TServerInstance tserverInstance : tserverInstances) {
diff --git a/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java b/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
index cea3618..100f6f1 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
@@ -676,7 +676,7 @@ abstract class TabletGroupWatcher extends Daemon {
             new KeyExtent(extent.getTableId(), null, extent.getPrevEndRow()), tdir,
             master.getContext(), timeType, this.master.masterLock);
       }
-    } catch (RuntimeException | IOException | TableNotFoundException ex) {
+    } catch (RuntimeException | TableNotFoundException ex) {
       throw new AccumuloException(ex);
     }
   }
diff --git a/server/master/src/main/java/org/apache/accumulo/master/metrics/Metrics2ReplicationMetrics.java b/server/master/src/main/java/org/apache/accumulo/master/metrics/Metrics2ReplicationMetrics.java
index bda9ae6..afb1772 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/metrics/Metrics2ReplicationMetrics.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/metrics/Metrics2ReplicationMetrics.java
@@ -103,7 +103,7 @@ public class Metrics2ReplicationMetrics implements Metrics, MetricsSource {
   }
 
   @Override
-  public void register() throws Exception {
+  public void register() {
     system.register(NAME, DESCRIPTION, this);
   }
 
diff --git a/server/master/src/main/java/org/apache/accumulo/master/recovery/RecoveryManager.java b/server/master/src/main/java/org/apache/accumulo/master/recovery/RecoveryManager.java
index 2ba3974..b36d963 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/recovery/RecoveryManager.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/recovery/RecoveryManager.java
@@ -117,7 +117,7 @@ public class RecoveryManager {
   }
 
   private void initiateSort(String sortId, String source, final String destination)
-      throws KeeperException, InterruptedException, IOException {
+      throws KeeperException, InterruptedException {
     String work = source + "|" + destination;
     new DistributedWorkQueue(master.getZooKeeperRoot() + Constants.ZRECOVERY,
         master.getConfiguration()).addWork(sortId, work.getBytes(UTF_8));
diff --git a/server/master/src/main/java/org/apache/accumulo/master/replication/WorkDriver.java b/server/master/src/main/java/org/apache/accumulo/master/replication/WorkDriver.java
index 94937e1..0f1eb9b 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/replication/WorkDriver.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/replication/WorkDriver.java
@@ -21,8 +21,6 @@ import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.accumulo.core.client.AccumuloClient;
-import org.apache.accumulo.core.client.AccumuloException;
-import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.util.Daemon;
@@ -44,7 +42,7 @@ public class WorkDriver extends Daemon {
   private WorkAssigner assigner;
   private String assignerImplName;
 
-  public WorkDriver(Master master) throws AccumuloException, AccumuloSecurityException {
+  public WorkDriver(Master master) {
     super();
     this.master = master;
     this.client = master.getContext();
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/ChangeTableState.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/ChangeTableState.java
index 06a0211..8452009 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/ChangeTableState.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/ChangeTableState.java
@@ -49,7 +49,7 @@ public class ChangeTableState extends MasterRepo {
   }
 
   @Override
-  public Repo<Master> call(long tid, Master env) throws Exception {
+  public Repo<Master> call(long tid, Master env) {
     TableState ts = TableState.ONLINE;
     if (top == TableOperation.OFFLINE)
       ts = TableState.OFFLINE;
@@ -63,7 +63,7 @@ public class ChangeTableState extends MasterRepo {
   }
 
   @Override
-  public void undo(long tid, Master env) throws Exception {
+  public void undo(long tid, Master env) {
     Utils.unreserveNamespace(env, namespaceId, tid, false);
     Utils.unreserveTable(env, tableId, tid, true);
   }
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/Utils.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/Utils.java
index adbcd3a..34f3f35 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/Utils.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/Utils.java
@@ -102,15 +102,14 @@ public class Utils {
       return 100;
   }
 
-  public static void unreserveTable(Master env, Table.ID tableId, long tid, boolean writeLock)
-      throws Exception {
+  public static void unreserveTable(Master env, Table.ID tableId, long tid, boolean writeLock) {
     getLock(env.getContext(), tableId, tid, writeLock).unlock();
     log.info("table {} ({}) unlocked for ", tableId, Long.toHexString(tid),
         (writeLock ? "write" : "read"));
   }
 
   public static void unreserveNamespace(Master env, Namespace.ID namespaceId, long id,
-      boolean writeLock) throws Exception {
+      boolean writeLock) {
     getLock(env.getContext(), namespaceId, id, writeLock).unlock();
     log.info("namespace {} ({}) unlocked for {}", namespaceId, Long.toHexString(id),
         (writeLock ? "write" : "read"));
@@ -154,8 +153,7 @@ public class Utils {
         String.format("%016x", tid));
   }
 
-  private static Lock getLock(ServerContext context, AbstractId id, long tid, boolean writeLock)
-      throws Exception {
+  private static Lock getLock(ServerContext context, AbstractId id, long tid, boolean writeLock) {
     byte[] lockData = String.format("%016x", tid).getBytes(UTF_8);
     ZooQueueLock qlock = new ZooQueueLock(context.getZooReaderWriter(),
         context.getZooKeeperRoot() + Constants.ZTABLE_LOCKS + "/" + id, false);
@@ -178,7 +176,7 @@ public class Utils {
     return tableNameLock;
   }
 
-  public static Lock getReadLock(Master env, AbstractId tableId, long tid) throws Exception {
+  public static Lock getReadLock(Master env, AbstractId tableId, long tid) {
     return Utils.getLock(env.getContext(), tableId, tid, false);
   }
 
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer1/CopyFailed.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer1/CopyFailed.java
index 191869c..51d26e4 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer1/CopyFailed.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer1/CopyFailed.java
@@ -68,7 +68,7 @@ class CopyFailed extends MasterRepo {
   }
 
   @Override
-  public long isReady(long tid, Master master) throws Exception {
+  public long isReady(long tid, Master master) {
     Set<TServerInstance> finished = new HashSet<>();
     Set<TServerInstance> running = master.onlineTabletServers();
     for (TServerInstance server : running) {
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer1/LoadFiles.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer1/LoadFiles.java
index 2b6b81a..1b786af 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer1/LoadFiles.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer1/LoadFiles.java
@@ -81,7 +81,7 @@ class LoadFiles extends MasterRepo {
   }
 
   @Override
-  public long isReady(long tid, Master master) throws Exception {
+  public long isReady(long tid, Master master) {
     if (master.onlineTabletServers().size() == 0)
       return 500;
     return 0;
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/LoadFiles.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/LoadFiles.java
index 63a46f4..b65b389 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/LoadFiles.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/LoadFiles.java
@@ -93,7 +93,7 @@ class LoadFiles extends MasterRepo {
   }
 
   @Override
-  public Repo<Master> call(final long tid, final Master master) throws Exception {
+  public Repo<Master> call(final long tid, final Master master) {
     if (bulkInfo.tableState == TableState.ONLINE) {
       return new CompleteBulkImport(bulkInfo);
     } else {
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/PrepBulkImport.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/PrepBulkImport.java
index c608a96..3cecdf4 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/PrepBulkImport.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/PrepBulkImport.java
@@ -95,7 +95,7 @@ public class PrepBulkImport extends MasterRepo {
 
   @VisibleForTesting
   interface TabletIterFactory {
-    Iterator<KeyExtent> newTabletIter(Text startRow) throws Exception;
+    Iterator<KeyExtent> newTabletIter(Text startRow);
   }
 
   private static boolean equals(Function<KeyExtent,Text> extractor, KeyExtent ke1, KeyExtent ke2) {
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/clone/CloneMetadata.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/clone/CloneMetadata.java
index 2549f67..a71f9cf 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/clone/CloneMetadata.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/clone/CloneMetadata.java
@@ -32,7 +32,7 @@ class CloneMetadata extends MasterRepo {
   }
 
   @Override
-  public long isReady(long tid, Master environment) throws Exception {
+  public long isReady(long tid, Master environment) {
     return 0;
   }
 
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/clone/ClonePermissions.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/clone/ClonePermissions.java
index 682f1c4..d5475c5 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/clone/ClonePermissions.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/clone/ClonePermissions.java
@@ -39,7 +39,7 @@ class ClonePermissions extends MasterRepo {
   }
 
   @Override
-  public long isReady(long tid, Master environment) throws Exception {
+  public long isReady(long tid, Master environment) {
     return 0;
   }
 
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/clone/CloneTable.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/clone/CloneTable.java
index dd25f67..413adbc 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/clone/CloneTable.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/clone/CloneTable.java
@@ -67,7 +67,7 @@ public class CloneTable extends MasterRepo {
   }
 
   @Override
-  public void undo(long tid, Master environment) throws Exception {
+  public void undo(long tid, Master environment) {
     Utils.unreserveNamespace(environment, cloneInfo.srcNamespaceId, tid, false);
     Utils.unreserveTable(environment, cloneInfo.srcTableId, tid, false);
   }
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/clone/FinishCloneTable.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/clone/FinishCloneTable.java
index 346bcae..6957c00 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/clone/FinishCloneTable.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/clone/FinishCloneTable.java
@@ -33,12 +33,12 @@ class FinishCloneTable extends MasterRepo {
   }
 
   @Override
-  public long isReady(long tid, Master environment) throws Exception {
+  public long isReady(long tid, Master environment) {
     return 0;
   }
 
   @Override
-  public Repo<Master> call(long tid, Master environment) throws Exception {
+  public Repo<Master> call(long tid, Master environment) {
     // directories are intentionally not created.... this is done because directories should be
     // unique
     // because they occupy a different namespace than normal tablet directories... also some clones
@@ -63,6 +63,6 @@ class FinishCloneTable extends MasterRepo {
   }
 
   @Override
-  public void undo(long tid, Master environment) throws Exception {}
+  public void undo(long tid, Master environment) {}
 
 }
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/compact/CompactRange.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/compact/CompactRange.java
index ebfa027..0f60ac5 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/compact/CompactRange.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/compact/CompactRange.java
@@ -151,7 +151,7 @@ public class CompactRange extends MasterRepo {
 
     zoo.mutate(zTablePath, null, null, new Mutator() {
       @Override
-      public byte[] mutate(byte[] currentValue) throws Exception {
+      public byte[] mutate(byte[] currentValue) {
         String cvs = new String(currentValue, UTF_8);
         String[] tokens = cvs.split(",");
         long flushID = Long.parseLong(tokens[0]);
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/compact/CompactionDriver.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/compact/CompactionDriver.java
index 2cb3f23..d22efbd 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/compact/CompactionDriver.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/compact/CompactionDriver.java
@@ -146,7 +146,7 @@ class CompactionDriver extends MasterRepo {
   }
 
   @Override
-  public void undo(long tid, Master environment) throws Exception {
+  public void undo(long tid, Master environment) {
 
   }
 
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/compact/cancel/CancelCompactions.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/compact/cancel/CancelCompactions.java
index b567dea..4eb2575 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/compact/cancel/CancelCompactions.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/compact/cancel/CancelCompactions.java
@@ -63,7 +63,7 @@ public class CancelCompactions extends MasterRepo {
 
     zoo.mutate(zCancelID, null, null, new Mutator() {
       @Override
-      public byte[] mutate(byte[] currentValue) throws Exception {
+      public byte[] mutate(byte[] currentValue) {
         long cid = Long.parseLong(new String(currentValue, UTF_8));
 
         if (cid < flushID)
@@ -77,7 +77,7 @@ public class CancelCompactions extends MasterRepo {
   }
 
   @Override
-  public void undo(long tid, Master env) throws Exception {
+  public void undo(long tid, Master env) {
     Utils.unreserveTable(env, tableId, tid, false);
     Utils.unreserveNamespace(env, namespaceId, tid, false);
   }
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/compact/cancel/FinishCancelCompaction.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/compact/cancel/FinishCancelCompaction.java
index 9ad77cc..83da00d 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/compact/cancel/FinishCancelCompaction.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/compact/cancel/FinishCancelCompaction.java
@@ -34,14 +34,14 @@ class FinishCancelCompaction extends MasterRepo {
   }
 
   @Override
-  public Repo<Master> call(long tid, Master environment) throws Exception {
+  public Repo<Master> call(long tid, Master environment) {
     Utils.unreserveTable(environment, tableId, tid, false);
     Utils.unreserveNamespace(environment, namespaceId, tid, false);
     return null;
   }
 
   @Override
-  public void undo(long tid, Master environment) throws Exception {
+  public void undo(long tid, Master environment) {
 
   }
 }
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/create/ChooseDir.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/create/ChooseDir.java
index 7d58930..9725f71 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/create/ChooseDir.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/create/ChooseDir.java
@@ -45,7 +45,7 @@ class ChooseDir extends MasterRepo {
   }
 
   @Override
-  public long isReady(long tid, Master environment) throws Exception {
+  public long isReady(long tid, Master environment) {
     return 0;
   }
 
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/create/CreateDir.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/create/CreateDir.java
index 742af08..3904149 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/create/CreateDir.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/create/CreateDir.java
@@ -38,7 +38,7 @@ class CreateDir extends MasterRepo {
   }
 
   @Override
-  public long isReady(long tid, Master environment) throws Exception {
+  public long isReady(long tid, Master environment) {
     return 0;
   }
 
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/create/CreateTable.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/create/CreateTable.java
index 7eda253..3850ba6 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/create/CreateTable.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/create/CreateTable.java
@@ -76,7 +76,7 @@ public class CreateTable extends MasterRepo {
   }
 
   @Override
-  public void undo(long tid, Master env) throws Exception {
+  public void undo(long tid, Master env) {
     Utils.unreserveNamespace(env, tableInfo.getNamespaceId(), tid, false);
   }
 
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/create/FinishCreateTable.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/create/FinishCreateTable.java
index b588e0d..06afa18 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/create/FinishCreateTable.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/create/FinishCreateTable.java
@@ -40,7 +40,7 @@ class FinishCreateTable extends MasterRepo {
   }
 
   @Override
-  public long isReady(long tid, Master environment) throws Exception {
+  public long isReady(long tid, Master environment) {
     return 0;
   }
 
@@ -79,6 +79,6 @@ class FinishCreateTable extends MasterRepo {
   }
 
   @Override
-  public void undo(long tid, Master env) throws Exception {}
+  public void undo(long tid, Master env) {}
 
 }
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/create/PopulateMetadata.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/create/PopulateMetadata.java
index 26c0b7e..22ff43f 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/create/PopulateMetadata.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/create/PopulateMetadata.java
@@ -53,7 +53,7 @@ class PopulateMetadata extends MasterRepo {
   }
 
   @Override
-  public long isReady(long tid, Master environment) throws Exception {
+  public long isReady(long tid, Master environment) {
     return 0;
   }
 
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/delete/CleanUp.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/delete/CleanUp.java
index 7999f41..750b1cf 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/delete/CleanUp.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/delete/CleanUp.java
@@ -117,7 +117,7 @@ class CleanUp extends MasterRepo {
   }
 
   @Override
-  public Repo<Master> call(long tid, Master master) throws Exception {
+  public Repo<Master> call(long tid, Master master) {
 
     master.clearMigrations(tableId);
 
@@ -240,7 +240,7 @@ class CleanUp extends MasterRepo {
   }
 
   @Override
-  public void undo(long tid, Master environment) throws Exception {
+  public void undo(long tid, Master environment) {
     // nothing to do
   }
 
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/delete/DeleteTable.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/delete/DeleteTable.java
index d2e2e20..6e1f661 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/delete/DeleteTable.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/delete/DeleteTable.java
@@ -44,14 +44,14 @@ public class DeleteTable extends MasterRepo {
   }
 
   @Override
-  public Repo<Master> call(long tid, Master env) throws Exception {
+  public Repo<Master> call(long tid, Master env) {
     env.getTableManager().transitionTableState(tableId, TableState.DELETING);
     env.getEventCoordinator().event("deleting table %s ", tableId);
     return new CleanUp(tableId, namespaceId);
   }
 
   @Override
-  public void undo(long tid, Master env) throws Exception {
+  public void undo(long tid, Master env) {
     Utils.unreserveTable(env, tableId, tid, true);
     Utils.unreserveNamespace(env, namespaceId, tid, false);
   }
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/merge/TableRangeOp.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/merge/TableRangeOp.java
index 8a89deb..ae2f15d 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/merge/TableRangeOp.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/merge/TableRangeOp.java
@@ -53,7 +53,7 @@ public class TableRangeOp extends MasterRepo {
   }
 
   public TableRangeOp(MergeInfo.Operation op, Namespace.ID namespaceId, Table.ID tableId,
-      Text startRow, Text endRow) throws AcceptableThriftTableOperationException {
+      Text startRow, Text endRow) {
     this.tableId = tableId;
     this.namespaceId = namespaceId;
     this.startRow = TextUtil.getBytes(startRow);
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/merge/TableRangeOpWait.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/merge/TableRangeOpWait.java
index afc8ddd..5f94b18 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/merge/TableRangeOpWait.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/merge/TableRangeOpWait.java
@@ -57,7 +57,7 @@ class TableRangeOpWait extends MasterRepo {
   }
 
   @Override
-  public long isReady(long tid, Master env) throws Exception {
+  public long isReady(long tid, Master env) {
     if (!env.getMergeInfo(tableId).getState().equals(MergeState.NONE)) {
       return 50;
     }
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/namespace/create/CreateNamespace.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/namespace/create/CreateNamespace.java
index 8dbb35f..ccc08a3 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/namespace/create/CreateNamespace.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/namespace/create/CreateNamespace.java
@@ -37,7 +37,7 @@ public class CreateNamespace extends MasterRepo {
   }
 
   @Override
-  public long isReady(long tid, Master environment) throws Exception {
+  public long isReady(long tid, Master environment) {
     return 0;
   }
 
@@ -55,7 +55,7 @@ public class CreateNamespace extends MasterRepo {
   }
 
   @Override
-  public void undo(long tid, Master env) throws Exception {
+  public void undo(long tid, Master env) {
     // nothing to do, the namespace id was allocated!
   }
 
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/namespace/create/FinishCreateNamespace.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/namespace/create/FinishCreateNamespace.java
index c4a21c2..f52380d 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/namespace/create/FinishCreateNamespace.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/namespace/create/FinishCreateNamespace.java
@@ -33,12 +33,12 @@ class FinishCreateNamespace extends MasterRepo {
   }
 
   @Override
-  public long isReady(long tid, Master environment) throws Exception {
+  public long isReady(long tid, Master environment) {
     return 0;
   }
 
   @Override
-  public Repo<Master> call(long id, Master env) throws Exception {
+  public Repo<Master> call(long id, Master env) {
 
     Utils.unreserveNamespace(env, namespaceInfo.namespaceId, id, true);
 
@@ -56,6 +56,6 @@ class FinishCreateNamespace extends MasterRepo {
   }
 
   @Override
-  public void undo(long tid, Master env) throws Exception {}
+  public void undo(long tid, Master env) {}
 
 }
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/namespace/delete/DeleteNamespace.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/namespace/delete/DeleteNamespace.java
index 56e9224..b9d081b 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/namespace/delete/DeleteNamespace.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/namespace/delete/DeleteNamespace.java
@@ -39,13 +39,13 @@ public class DeleteNamespace extends MasterRepo {
   }
 
   @Override
-  public Repo<Master> call(long tid, Master environment) throws Exception {
+  public Repo<Master> call(long tid, Master environment) {
     environment.getEventCoordinator().event("deleting namespace %s ", namespaceId);
     return new NamespaceCleanUp(namespaceId);
   }
 
   @Override
-  public void undo(long id, Master environment) throws Exception {
+  public void undo(long id, Master environment) {
     Utils.unreserveNamespace(environment, namespaceId, id, true);
   }
 
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/namespace/delete/NamespaceCleanUp.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/namespace/delete/NamespaceCleanUp.java
index cc3e283..483c039 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/namespace/delete/NamespaceCleanUp.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/namespace/delete/NamespaceCleanUp.java
@@ -40,12 +40,12 @@ class NamespaceCleanUp extends MasterRepo {
   }
 
   @Override
-  public long isReady(long tid, Master master) throws Exception {
+  public long isReady(long tid, Master master) {
     return 0;
   }
 
   @Override
-  public Repo<Master> call(long id, Master master) throws Exception {
+  public Repo<Master> call(long id, Master master) {
 
     // remove from zookeeper
     try {
@@ -71,7 +71,7 @@ class NamespaceCleanUp extends MasterRepo {
   }
 
   @Override
-  public void undo(long tid, Master environment) throws Exception {
+  public void undo(long tid, Master environment) {
     // nothing to do
   }
 
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/namespace/rename/RenameNamespace.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/namespace/rename/RenameNamespace.java
index 8d30093..2697e98 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/namespace/rename/RenameNamespace.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/namespace/rename/RenameNamespace.java
@@ -87,7 +87,7 @@ public class RenameNamespace extends MasterRepo {
   }
 
   @Override
-  public void undo(long tid, Master env) throws Exception {
+  public void undo(long tid, Master env) {
     Utils.unreserveNamespace(env, namespaceId, tid, true);
   }
 
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/rename/RenameTable.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/rename/RenameTable.java
index d324121..0eaac74 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/rename/RenameTable.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/rename/RenameTable.java
@@ -107,7 +107,7 @@ public class RenameTable extends MasterRepo {
   }
 
   @Override
-  public void undo(long tid, Master env) throws Exception {
+  public void undo(long tid, Master env) {
     Utils.unreserveTable(env, tableId, tid, true);
     Utils.unreserveNamespace(env, namespaceId, tid, false);
   }
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/tableExport/ExportTable.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/tableExport/ExportTable.java
index ccb49a9..faa5cdf 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/tableExport/ExportTable.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/tableExport/ExportTable.java
@@ -18,7 +18,6 @@ package org.apache.accumulo.master.tableOps.tableExport;
 
 import org.apache.accumulo.core.clientImpl.Namespace;
 import org.apache.accumulo.core.clientImpl.Table;
-import org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException;
 import org.apache.accumulo.fate.Repo;
 import org.apache.accumulo.master.Master;
 import org.apache.accumulo.master.tableOps.MasterRepo;
@@ -30,8 +29,8 @@ public class ExportTable extends MasterRepo {
 
   private final ExportInfo tableInfo;
 
-  public ExportTable(Namespace.ID namespaceId, String tableName, Table.ID tableId, String exportDir)
-      throws ThriftTableOperationException {
+  public ExportTable(Namespace.ID namespaceId, String tableName, Table.ID tableId,
+      String exportDir) {
     tableInfo = new ExportInfo();
     tableInfo.tableName = tableName;
     tableInfo.exportDir = exportDir;
@@ -45,7 +44,7 @@ public class ExportTable extends MasterRepo {
   }
 
   @Override
-  public Repo<Master> call(long tid, Master env) throws Exception {
+  public Repo<Master> call(long tid, Master env) {
     return new WriteExportFiles(tableInfo);
   }
 
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/tableExport/WriteExportFiles.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/tableExport/WriteExportFiles.java
index 68af2fb..3614588 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/tableExport/WriteExportFiles.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/tableExport/WriteExportFiles.java
@@ -140,7 +140,7 @@ class WriteExportFiles extends MasterRepo {
   }
 
   @Override
-  public void undo(long tid, Master env) throws Exception {
+  public void undo(long tid, Master env) {
     Utils.unreserveNamespace(env, tableInfo.namespaceID, tid, false);
     Utils.unreserveTable(env, tableInfo.tableID, tid, false);
   }
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/tableImport/FinishImportTable.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/tableImport/FinishImportTable.java
index 1c0a48b..4345d80 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/tableImport/FinishImportTable.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/tableImport/FinishImportTable.java
@@ -35,7 +35,7 @@ class FinishImportTable extends MasterRepo {
   }
 
   @Override
-  public long isReady(long tid, Master environment) throws Exception {
+  public long isReady(long tid, Master environment) {
     return 0;
   }
 
@@ -65,6 +65,6 @@ class FinishImportTable extends MasterRepo {
   }
 
   @Override
-  public void undo(long tid, Master env) throws Exception {}
+  public void undo(long tid, Master env) {}
 
 }
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/tableImport/ImportSetupPermissions.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/tableImport/ImportSetupPermissions.java
index f88708d..6ebdbb1 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/tableImport/ImportSetupPermissions.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/tableImport/ImportSetupPermissions.java
@@ -36,7 +36,7 @@ class ImportSetupPermissions extends MasterRepo {
   }
 
   @Override
-  public long isReady(long tid, Master environment) throws Exception {
+  public long isReady(long tid, Master environment) {
     return 0;
   }
 
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tserverOps/ShutdownTServer.java b/server/master/src/main/java/org/apache/accumulo/master/tserverOps/ShutdownTServer.java
index 66d2259..51f4431 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tserverOps/ShutdownTServer.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tserverOps/ShutdownTServer.java
@@ -45,7 +45,7 @@ public class ShutdownTServer extends MasterRepo {
   }
 
   @Override
-  public long isReady(long tid, Master master) throws Exception {
+  public long isReady(long tid, Master master) {
     // suppress assignment of tablets to the server
     if (force) {
       return 0;
@@ -96,5 +96,5 @@ public class ShutdownTServer extends MasterRepo {
   }
 
   @Override
-  public void undo(long tid, Master m) throws Exception {}
+  public void undo(long tid, Master m) {}
 }
diff --git a/server/master/src/test/java/org/apache/accumulo/master/replication/SequentialWorkAssignerTest.java b/server/master/src/test/java/org/apache/accumulo/master/replication/SequentialWorkAssignerTest.java
index 603a332..8e6df6a 100644
--- a/server/master/src/test/java/org/apache/accumulo/master/replication/SequentialWorkAssignerTest.java
+++ b/server/master/src/test/java/org/apache/accumulo/master/replication/SequentialWorkAssignerTest.java
@@ -43,14 +43,14 @@ public class SequentialWorkAssignerTest {
   private SequentialWorkAssigner assigner;
 
   @Before
-  public void init() throws Exception {
+  public void init() {
     AccumuloConfiguration conf = createMock(AccumuloConfiguration.class);
     client = createMock(AccumuloClient.class);
     assigner = new SequentialWorkAssigner(conf, client);
   }
 
   @Test
-  public void basicZooKeeperCleanup() throws Exception {
+  public void basicZooKeeperCleanup() {
     DistributedWorkQueue workQueue = createMock(DistributedWorkQueue.class);
     ZooCache zooCache = createMock(ZooCache.class);
 
diff --git a/server/master/src/test/java/org/apache/accumulo/master/replication/UnorderedWorkAssignerTest.java b/server/master/src/test/java/org/apache/accumulo/master/replication/UnorderedWorkAssignerTest.java
index adcc2f7..87e04fe 100644
--- a/server/master/src/test/java/org/apache/accumulo/master/replication/UnorderedWorkAssignerTest.java
+++ b/server/master/src/test/java/org/apache/accumulo/master/replication/UnorderedWorkAssignerTest.java
@@ -50,7 +50,7 @@ public class UnorderedWorkAssignerTest {
   private UnorderedWorkAssigner assigner;
 
   @Before
-  public void init() throws Exception {
+  public void init() {
     AccumuloConfiguration conf = createMock(AccumuloConfiguration.class);
     client = createMock(AccumuloClient.class);
     assigner = new UnorderedWorkAssigner(conf, client);
diff --git a/server/master/src/test/java/org/apache/accumulo/master/replication/WorkMakerTest.java b/server/master/src/test/java/org/apache/accumulo/master/replication/WorkMakerTest.java
index fffc487..2be33cb 100644
--- a/server/master/src/test/java/org/apache/accumulo/master/replication/WorkMakerTest.java
+++ b/server/master/src/test/java/org/apache/accumulo/master/replication/WorkMakerTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
 public class WorkMakerTest {
 
   @Test
-  public void closedStatusRecordsStillMakeWork() throws Exception {
+  public void closedStatusRecordsStillMakeWork() {
     WorkMaker workMaker = new WorkMaker(null, null);
 
     assertFalse(workMaker.shouldCreateWork(StatusUtil.fileCreated(System.currentTimeMillis())));
diff --git a/server/master/src/test/java/org/apache/accumulo/master/state/RootTabletStateStoreTest.java b/server/master/src/test/java/org/apache/accumulo/master/state/RootTabletStateStoreTest.java
index a2c9a85..c14e88c 100644
--- a/server/master/src/test/java/org/apache/accumulo/master/state/RootTabletStateStoreTest.java
+++ b/server/master/src/test/java/org/apache/accumulo/master/state/RootTabletStateStoreTest.java
@@ -78,7 +78,7 @@ public class RootTabletStateStoreTest {
     }
 
     @Override
-    public List<String> getChildren(String path) throws DistributedStoreException {
+    public List<String> getChildren(String path) {
       Node node = navigate(path);
       if (node == null)
         return Collections.emptyList();
@@ -89,7 +89,7 @@ public class RootTabletStateStoreTest {
     }
 
     @Override
-    public void put(String path, byte[] bs) throws DistributedStoreException {
+    public void put(String path, byte[] bs) {
       create(path).value = bs;
     }
 
@@ -110,7 +110,7 @@ public class RootTabletStateStoreTest {
     }
 
     @Override
-    public void remove(String path) throws DistributedStoreException {
+    public void remove(String path) {
       String[] parts = path.split("/");
       String[] parentPath = Arrays.copyOf(parts, parts.length - 1);
       Node parent = recurse(root, parentPath, 1);
@@ -122,7 +122,7 @@ public class RootTabletStateStoreTest {
     }
 
     @Override
-    public byte[] get(String path) throws DistributedStoreException {
+    public byte[] get(String path) {
       Node node = navigate(path);
       if (node != null)
         return node.value;
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
index 3c3d6af..e05e5f3 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@ -427,7 +427,7 @@ public class Monitor implements HighlyAvailableService {
     return result;
   }
 
-  public static void main(String[] args) throws Exception {
+  public static void main(String[] args) {
 
     final String app = "monitor";
     ServerOpts opts = new ServerOpts();
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/MonitorExecutable.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/MonitorExecutable.java
index ddd34c5..65c0a31 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/MonitorExecutable.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/MonitorExecutable.java
@@ -39,7 +39,7 @@ public class MonitorExecutable implements KeywordExecutable {
   }
 
   @Override
-  public void execute(final String[] args) throws Exception {
+  public void execute(final String[] args) {
     Monitor.main(args);
   }
 
diff --git a/server/monitor/src/test/java/org/apache/accumulo/monitor/util/ParameterValidatorTest.java b/server/monitor/src/test/java/org/apache/accumulo/monitor/util/ParameterValidatorTest.java
index e7edc50..65c60b7 100644
--- a/server/monitor/src/test/java/org/apache/accumulo/monitor/util/ParameterValidatorTest.java
+++ b/server/monitor/src/test/java/org/apache/accumulo/monitor/util/ParameterValidatorTest.java
@@ -42,7 +42,7 @@ public class ParameterValidatorTest {
   }
 
   @Test
-  public void testServerRegex() throws Exception {
+  public void testServerRegex() {
     Pattern p = Pattern.compile(ParameterValidator.HOSTNAME_PORT_REGEX);
     assertTrue("Did not match hostname with dots", p.matcher("ab3cd.12d34.3xyz.net:12").matches());
     assertTrue("Did not match hostname with dash",
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/AsyncSpanReceiver.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/AsyncSpanReceiver.java
index 6105e59..7531d69 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/AsyncSpanReceiver.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/AsyncSpanReceiver.java
@@ -62,7 +62,7 @@ public abstract class AsyncSpanReceiver<SpanKey,Destination> implements SpanRece
   protected String host = null;
   protected String service = null;
 
-  protected abstract Destination createDestination(SpanKey key) throws Exception;
+  protected abstract Destination createDestination(SpanKey key);
 
   protected abstract void send(Destination resource, RemoteSpan span) throws Exception;
 
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/SendSpansViaThrift.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/SendSpansViaThrift.java
index 3016a1d..ea84825 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/SendSpansViaThrift.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/SendSpansViaThrift.java
@@ -51,7 +51,7 @@ public class SendSpansViaThrift extends AsyncSpanReceiver<String,Client> {
   @SuppressFBWarnings(value = "UNENCRYPTED_SOCKET",
       justification = "insecure, known risk; this is user-configurable to avoid insecure transfer")
   @Override
-  protected Client createDestination(String destination) throws Exception {
+  protected Client createDestination(String destination) {
     if (destination == null)
       return null;
     try {
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
index eac6d30..2f71169 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
@@ -72,7 +72,6 @@ import org.apache.thrift.server.TThreadPoolServer;
 import org.apache.thrift.transport.TServerSocket;
 import org.apache.thrift.transport.TServerTransport;
 import org.apache.thrift.transport.TTransport;
-import org.apache.thrift.transport.TTransportException;
 import org.apache.zookeeper.WatchedEvent;
 import org.apache.zookeeper.Watcher;
 import org.apache.zookeeper.Watcher.Event.EventType;
@@ -98,7 +97,7 @@ public class TraceServer implements Watcher, AutoCloseable {
   }
 
   @Override
-  public void close() throws Exception {
+  public void close() {
     if (accumuloClient != null) {
       accumuloClient.close();
     }
@@ -113,7 +112,7 @@ public class TraceServer implements Watcher, AutoCloseable {
     }
 
     @Override
-    public void open() throws TTransportException {}
+    public void open() {}
 
     @Override
     public void close() {}
@@ -124,7 +123,7 @@ public class TraceServer implements Watcher, AutoCloseable {
     }
 
     @Override
-    public void write(byte[] buf, int off, int len) throws TTransportException {
+    public void write(byte[] buf, int off, int len) {
       out.write(buf, off, len);
     }
 
@@ -303,7 +302,7 @@ public class TraceServer implements Watcher, AutoCloseable {
     return accumuloClient;
   }
 
-  public void run() throws Exception {
+  public void run() {
     SimpleTimer.getInstance(serverConfiguration.getSystemConfiguration()).schedule(() -> flush(),
         SCHEDULE_DELAY, SCHEDULE_PERIOD);
     server.serve();
diff --git a/server/tracer/src/test/java/org/apache/accumulo/tracer/AsyncSpanReceiverTest.java b/server/tracer/src/test/java/org/apache/accumulo/tracer/AsyncSpanReceiverTest.java
index 5785c1c..ad58ce3 100644
--- a/server/tracer/src/test/java/org/apache/accumulo/tracer/AsyncSpanReceiverTest.java
+++ b/server/tracer/src/test/java/org/apache/accumulo/tracer/AsyncSpanReceiverTest.java
@@ -41,12 +41,12 @@ public class AsyncSpanReceiverTest {
     }
 
     @Override
-    protected String createDestination(String o) throws Exception {
+    protected String createDestination(String o) {
       return "DEST";
     }
 
     @Override
-    protected void send(String resource, RemoteSpan span) throws Exception {
+    protected void send(String resource, RemoteSpan span) {
       spansSent.incrementAndGet();
     }
 
diff --git a/server/tracer/src/test/java/org/apache/accumulo/tracer/TracerTest.java b/server/tracer/src/test/java/org/apache/accumulo/tracer/TracerTest.java
index ef08361..02637f1 100644
--- a/server/tracer/src/test/java/org/apache/accumulo/tracer/TracerTest.java
+++ b/server/tracer/src/test/java/org/apache/accumulo/tracer/TracerTest.java
@@ -42,7 +42,6 @@ import org.apache.htrace.HTraceConfiguration;
 import org.apache.htrace.Sampler;
 import org.apache.htrace.SpanReceiver;
 import org.apache.htrace.wrappers.TraceProxy;
-import org.apache.thrift.TException;
 import org.apache.thrift.protocol.TBinaryProtocol;
 import org.apache.thrift.server.TServer;
 import org.apache.thrift.server.TThreadPoolServer;
@@ -99,7 +98,7 @@ public class TracerTest {
     }
 
     @Override
-    public void close() throws IOException {}
+    public void close() {}
   }
 
   @Test
@@ -149,7 +148,7 @@ public class TracerTest {
 
   static class Service implements TestService.Iface {
     @Override
-    public boolean checkTrace(TInfo t, String message) throws TException {
+    public boolean checkTrace(TInfo t, String message) {
       Span trace = Trace.start(message);
       try {
         return Trace.isTracing();
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java
index 6ad3690..17b68a4 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java
@@ -72,14 +72,13 @@ class CompactionQueue extends AbstractQueue<TraceRunnable> implements BlockingQu
   }
 
   @Override
-  public synchronized void put(TraceRunnable e) throws InterruptedException {
+  public synchronized void put(TraceRunnable e) {
     task.add(e);
     notify();
   }
 
   @Override
-  public synchronized boolean offer(TraceRunnable e, long timeout, TimeUnit unit)
-      throws InterruptedException {
+  public synchronized boolean offer(TraceRunnable e, long timeout, TimeUnit unit) {
     task.add(e);
     notify();
     return true;
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java
index 1023bd0..f3224af 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java
@@ -17,7 +17,6 @@
 package org.apache.accumulo.tserver;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.AbstractMap.SimpleImmutableEntry;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -708,7 +707,7 @@ public class NativeMap implements Iterable<Map.Entry<Key,Value>> {
     }
 
     @Override
-    public void next() throws IOException {
+    public void next() {
 
       if (entry == null)
         throw new IllegalStateException();
@@ -729,8 +728,7 @@ public class NativeMap implements Iterable<Map.Entry<Key,Value>> {
     }
 
     @Override
-    public void seek(Range range, Collection<ByteSequence> columnFamilies, boolean inclusive)
-        throws IOException {
+    public void seek(Range range, Collection<ByteSequence> columnFamilies, boolean inclusive) {
 
       if (interruptFlag != null && interruptFlag.get())
         throw new IterationInterruptedException();
@@ -760,7 +758,7 @@ public class NativeMap implements Iterable<Map.Entry<Key,Value>> {
 
     @Override
     public void init(SortedKeyValueIterator<Key,Value> source, Map<String,String> options,
-        IteratorEnvironment env) throws IOException {
+        IteratorEnvironment env) {
       throw new UnsupportedOperationException();
     }
 
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index 6d80347..cd7476e 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@ -806,9 +806,6 @@ public class TabletServer implements Runnable {
       MultiScanResult result;
       try {
         result = continueMultiScan(tinfo, sid, mss);
-      } catch (NoSuchScanIDException e) {
-        log.error("the impossible happened", e);
-        throw new RuntimeException("the impossible happened", e);
       } finally {
         sessionManager.unreserveSession(sid);
       }
@@ -834,7 +831,7 @@ public class TabletServer implements Runnable {
     }
 
     private MultiScanResult continueMultiScan(TInfo tinfo, long scanID, MultiScanSession session)
-        throws NoSuchScanIDException, TSampleNotPresentException {
+        throws TSampleNotPresentException {
 
       if (session.lookupTask == null) {
         session.lookupTask = new LookupTask(TabletServer.this, scanID);
@@ -1571,7 +1568,7 @@ public class TabletServer implements Runnable {
     }
 
     @Override
-    public void invalidateConditionalUpdate(TInfo tinfo, long sessID) throws TException {
+    public void invalidateConditionalUpdate(TInfo tinfo, long sessID) {
       // this method should wait for any running conditional update to complete
       // after this method returns a conditional update should not be able to start
 
@@ -1585,7 +1582,7 @@ public class TabletServer implements Runnable {
     }
 
     @Override
-    public void closeConditionalUpdate(TInfo tinfo, long sessID) throws TException {
+    public void closeConditionalUpdate(TInfo tinfo, long sessID) {
       sessionManager.removeSession(sessID, false);
     }
 
@@ -1621,14 +1618,12 @@ public class TabletServer implements Runnable {
     }
 
     @Override
-    public TabletServerStatus getTabletServerStatus(TInfo tinfo, TCredentials credentials)
-        throws ThriftSecurityException, TException {
+    public TabletServerStatus getTabletServerStatus(TInfo tinfo, TCredentials credentials) {
       return getStats(sessionManager.getActiveScansPerTable());
     }
 
     @Override
-    public List<TabletStats> getTabletStats(TInfo tinfo, TCredentials credentials, String tableId)
-        throws ThriftSecurityException, TException {
+    public List<TabletStats> getTabletStats(TInfo tinfo, TCredentials credentials, String tableId) {
       TreeMap<KeyExtent,Tablet> onlineTabletsCopy;
       synchronized (onlineTablets) {
         onlineTabletsCopy = new TreeMap<>(onlineTablets);
@@ -1850,8 +1845,8 @@ public class TabletServer implements Runnable {
     }
 
     @Override
-    public void flushTablet(TInfo tinfo, TCredentials credentials, String lock, TKeyExtent textent)
-        throws TException {
+    public void flushTablet(TInfo tinfo, TCredentials credentials, String lock,
+        TKeyExtent textent) {
       try {
         checkPermission(credentials, lock, "flushTablet");
       } catch (ThriftSecurityException e) {
@@ -1902,8 +1897,7 @@ public class TabletServer implements Runnable {
     }
 
     @Override
-    public TabletStats getHistoricalStats(TInfo tinfo, TCredentials credentials)
-        throws ThriftSecurityException, TException {
+    public TabletStats getHistoricalStats(TInfo tinfo, TCredentials credentials) {
       return statsKeeper.getTabletStats();
     }
 
@@ -1921,8 +1915,7 @@ public class TabletServer implements Runnable {
     }
 
     @Override
-    public void chop(TInfo tinfo, TCredentials credentials, String lock, TKeyExtent textent)
-        throws TException {
+    public void chop(TInfo tinfo, TCredentials credentials, String lock, TKeyExtent textent) {
       try {
         checkPermission(credentials, lock, "chop");
       } catch (ThriftSecurityException e) {
@@ -1940,7 +1933,7 @@ public class TabletServer implements Runnable {
 
     @Override
     public void compact(TInfo tinfo, TCredentials credentials, String lock, String tableId,
-        ByteBuffer startRow, ByteBuffer endRow) throws TException {
+        ByteBuffer startRow, ByteBuffer endRow) {
       try {
         checkPermission(credentials, lock, "compact");
       } catch (ThriftSecurityException e) {
@@ -1996,7 +1989,7 @@ public class TabletServer implements Runnable {
     }
 
     @Override
-    public List<String> getActiveLogs(TInfo tinfo, TCredentials credentials) throws TException {
+    public List<String> getActiveLogs(TInfo tinfo, TCredentials credentials) {
       String log = logger.getLogFile();
       // Might be null if there no active logger
       if (log == null) {
@@ -2006,8 +1999,7 @@ public class TabletServer implements Runnable {
     }
 
     @Override
-    public void removeLogs(TInfo tinfo, TCredentials credentials, List<String> filenames)
-        throws TException {
+    public void removeLogs(TInfo tinfo, TCredentials credentials, List<String> filenames) {
       log.warn("Garbage collector is attempting to remove logs through the tablet server");
       log.warn("This is probably because your file"
           + " Garbage Collector is an older version than your tablet servers.\n"
@@ -2050,8 +2042,8 @@ public class TabletServer implements Runnable {
 
     @Override
     public TSummaries startGetSummaries(TInfo tinfo, TCredentials credentials,
-        TSummaryRequest request) throws ThriftSecurityException, ThriftTableOperationException,
-        NoSuchScanIDException, TException {
+        TSummaryRequest request)
+        throws ThriftSecurityException, ThriftTableOperationException, TException {
       Namespace.ID namespaceId;
       Table.ID tableId = Table.ID.of(request.getTableId());
       try {
@@ -2077,7 +2069,7 @@ public class TabletServer implements Runnable {
     @Override
     public TSummaries startGetSummariesForPartition(TInfo tinfo, TCredentials credentials,
         TSummaryRequest request, int modulus, int remainder)
-        throws ThriftSecurityException, NoSuchScanIDException, TException {
+        throws ThriftSecurityException, TException {
       // do not expect users to call this directly, expect other tservers to call this method
       if (!security.canPerformSystemActions(credentials)) {
         throw new AccumuloSecurityException(credentials.getPrincipal(),
@@ -2096,7 +2088,7 @@ public class TabletServer implements Runnable {
     @Override
     public TSummaries startGetSummariesFromFiles(TInfo tinfo, TCredentials credentials,
         TSummaryRequest request, Map<String,List<TRowRange>> files)
-        throws ThriftSecurityException, NoSuchScanIDException, TException {
+        throws ThriftSecurityException, TException {
       // do not expect users to call this directly, expect other tservers to call this method
       if (!security.canPerformSystemActions(credentials)) {
         throw new AccumuloSecurityException(credentials.getPrincipal(),
@@ -2593,7 +2585,7 @@ public class TabletServer implements Runnable {
     }
   }
 
-  private void acquireRecoveryMemory(KeyExtent extent) throws InterruptedException {
+  private void acquireRecoveryMemory(KeyExtent extent) {
     if (!extent.isMeta()) {
       recoveryLock.lock();
     }
@@ -2978,7 +2970,7 @@ public class TabletServer implements Runnable {
   }
 
   private static Pair<Text,KeyExtent> verifyRootTablet(ServerContext context, KeyExtent extent,
-      TServerInstance instance) throws DistributedStoreException, AccumuloException {
+      TServerInstance instance) throws AccumuloException {
     ZooTabletStateStore store = new ZooTabletStateStore(context);
     if (!store.iterator().hasNext()) {
       throw new AccumuloException("Illegal state: location is not set in zookeeper");
@@ -3001,8 +2993,7 @@ public class TabletServer implements Runnable {
 
   public static Pair<Text,KeyExtent> verifyTabletInformation(ServerContext context,
       KeyExtent extent, TServerInstance instance, final SortedMap<Key,Value> tabletsKeyValues,
-      String clientAddress, ZooLock lock)
-      throws AccumuloSecurityException, DistributedStoreException, AccumuloException {
+      String clientAddress, ZooLock lock) throws DistributedStoreException, AccumuloException {
     Objects.requireNonNull(tabletsKeyValues);
 
     log.debug("verifying extent {}", extent);
@@ -3048,14 +3039,8 @@ public class TabletServer implements Runnable {
       SortedMap<Text,SortedMap<ColumnFQ,Value>> tabletEntries;
       tabletEntries = MetadataTableUtil.getTabletEntries(tabletsKeyValues, columnsToFetch);
 
-      KeyExtent fke;
-      try {
-        fke = MasterMetadataUtil.fixSplit(context, metadataEntry, tabletEntries.get(metadataEntry),
-            instance, lock);
-      } catch (IOException e) {
-        log.error("Error fixing split {}", metadataEntry);
-        throw new AccumuloException(e.toString());
-      }
+      KeyExtent fke = MasterMetadataUtil.fixSplit(context, metadataEntry,
+          tabletEntries.get(metadataEntry), instance, lock);
 
       if (!fke.equals(extent)) {
         return new Pair<>(null, fke);
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TservConstraintEnv.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TservConstraintEnv.java
index 3ec6de0..21e8af6 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TservConstraintEnv.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TservConstraintEnv.java
@@ -19,7 +19,6 @@ package org.apache.accumulo.tserver;
 import java.nio.ByteBuffer;
 import java.util.Collections;
 
-import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException;
 import org.apache.accumulo.core.data.ByteSequence;
 import org.apache.accumulo.core.dataImpl.KeyExtent;
 import org.apache.accumulo.core.security.AuthorizationContainer;
@@ -60,12 +59,8 @@ public class TservConstraintEnv implements SystemEnvironment {
     return new AuthorizationContainer() {
       @Override
       public boolean contains(ByteSequence auth) {
-        try {
-          return security.authenticatedUserHasAuthorizations(credentials, Collections.singletonList(
-              ByteBuffer.wrap(auth.getBackingArray(), auth.offset(), auth.length())));
-        } catch (ThriftSecurityException e) {
-          throw new RuntimeException(e);
-        }
+        return security.authenticatedUserHasAuthorizations(credentials, Collections
+            .singletonList(ByteBuffer.wrap(auth.getBackingArray(), auth.offset(), auth.length())));
       }
     };
   }
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/EverythingCompactionStrategy.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/EverythingCompactionStrategy.java
index 2972941..7ea1ff7 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/EverythingCompactionStrategy.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/EverythingCompactionStrategy.java
@@ -17,8 +17,6 @@
 
 package org.apache.accumulo.tserver.compaction;
 
-import java.io.IOException;
-
 /**
  * The default compaction strategy for user initiated compactions. This strategy will always select
  * all files.
@@ -27,12 +25,12 @@ import java.io.IOException;
 public class EverythingCompactionStrategy extends CompactionStrategy {
 
   @Override
-  public boolean shouldCompact(MajorCompactionRequest request) throws IOException {
+  public boolean shouldCompact(MajorCompactionRequest request) {
     return true; // ACCUMULO-3645 compact for empty files too
   }
 
   @Override
-  public CompactionPlan getCompactionPlan(MajorCompactionRequest request) throws IOException {
+  public CompactionPlan getCompactionPlan(MajorCompactionRequest request) {
     CompactionPlan plan = new CompactionPlan();
     plan.inputFiles.addAll(request.getFiles().keySet());
     return plan;
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/MajorCompactionRequest.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/MajorCompactionRequest.java
index 44c3b7e..be01620 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/MajorCompactionRequest.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/MajorCompactionRequest.java
@@ -147,7 +147,7 @@ public class MajorCompactionRequest implements Cloneable {
    * @see WriterOptions#withSummarizers(SummarizerConfiguration...)
    */
   public List<Summary> getSummaries(Collection<FileRef> files,
-      Predicate<SummarizerConfiguration> summarySelector) throws IOException {
+      Predicate<SummarizerConfiguration> summarySelector) {
     Preconditions.checkState(volumeManager != null,
         "Getting summaries is not" + " supported at this time. It's only supported when"
             + " CompactionStrategy.gatherInformation() is called.");
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/strategies/ConfigurableCompactionStrategy.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/strategies/ConfigurableCompactionStrategy.java
index d64ce82..491d73e 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/strategies/ConfigurableCompactionStrategy.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/strategies/ConfigurableCompactionStrategy.java
@@ -87,12 +87,8 @@ public class ConfigurableCompactionStrategy extends CompactionStrategy {
         for (FileRef fref : request.getFiles().keySet()) {
           Map<SummarizerConfiguration,Summary> sMap = new HashMap<>();
           Collection<Summary> summaries;
-          try {
-            summaries = request.getSummaries(Collections.singletonList(fref),
-                conf -> configsSet.contains(conf));
-          } catch (IOException e) {
-            throw new UncheckedIOException(e);
-          }
+          summaries = request.getSummaries(Collections.singletonList(fref),
+              conf -> configsSet.contains(conf));
           for (Summary summary : summaries) {
             sMap.put(summary.getSummarizerConfiguration(), summary);
           }
@@ -327,12 +323,12 @@ public class ConfigurableCompactionStrategy extends CompactionStrategy {
   }
 
   @Override
-  public boolean shouldCompact(MajorCompactionRequest request) throws IOException {
+  public boolean shouldCompact(MajorCompactionRequest request) {
     return getFilesToCompact(request).size() >= minFiles;
   }
 
   @Override
-  public void gatherInformation(MajorCompactionRequest request) throws IOException {
+  public void gatherInformation(MajorCompactionRequest request) {
     // Gather any information that requires blocking calls here. This is only called before
     // getCompactionPlan() is called.
     for (Test test : tests) {
@@ -341,7 +337,7 @@ public class ConfigurableCompactionStrategy extends CompactionStrategy {
   }
 
   @Override
-  public CompactionPlan getCompactionPlan(MajorCompactionRequest request) throws IOException {
+  public CompactionPlan getCompactionPlan(MajorCompactionRequest request) {
     List<FileRef> filesToCompact = getFilesToCompact(request);
     if (filesToCompact.size() >= minFiles) {
       CompactionPlan plan = new CompactionPlan();
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
index 776639e..fc8e067 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
@@ -289,7 +289,7 @@ public class DfsLogger implements Comparable<DfsLogger> {
     }
 
     @Override
-    public void await() throws IOException {
+    public void await() {
       return;
     }
   }
@@ -335,7 +335,7 @@ public class DfsLogger implements Comparable<DfsLogger> {
   }
 
   public DfsLogger(ServerContext context, ServerResources conf, AtomicLong syncCounter,
-      AtomicLong flushCounter) throws IOException {
+      AtomicLong flushCounter) {
     this(context, conf);
     this.syncCounter = syncCounter;
     this.flushCounter = flushCounter;
@@ -347,8 +347,7 @@ public class DfsLogger implements Comparable<DfsLogger> {
    * @param meta
    *          the cq for the "log" entry in +r/!0
    */
-  public DfsLogger(ServerContext context, ServerResources conf, String filename, String meta)
-      throws IOException {
+  public DfsLogger(ServerContext context, ServerResources conf, String filename, String meta) {
     this(context, conf);
     this.logPath = filename;
     metaReference = meta;
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
index 101521f..ad6f802 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
@@ -171,17 +171,13 @@ public class TabletServerLogger {
       }
 
       @Override
-      void withWriteLock() throws IOException {
-        try {
-          createLogger();
-          result.set(currentLog);
-          if (currentLog != null)
-            logIdOut.set(logId.get());
-          else
-            logIdOut.set(-1);
-        } catch (IOException e) {
-          log.error("Unable to create loggers", e);
-        }
+      void withWriteLock() {
+        createLogger();
+        result.set(currentLog);
+        if (currentLog != null)
+          logIdOut.set(logId.get());
+        else
+          logIdOut.set(-1);
       }
     });
     return result.get();
@@ -204,7 +200,7 @@ public class TabletServerLogger {
     }
   }
 
-  private synchronized void createLogger() throws IOException {
+  private synchronized void createLogger() {
     if (!logIdLock.isWriteLockedByCurrentThread()) {
       throw new IllegalStateException("createLoggers should be called with write lock held!");
     }
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
index b89e04a..f1308f2 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
@@ -840,7 +840,7 @@ public class AccumuloReplicaSystem implements ReplicaSystem {
     return mutationsToSend;
   }
 
-  protected DataInputStream getRFileInputStream(Path p) throws IOException {
+  protected DataInputStream getRFileInputStream(Path p) {
     throw new UnsupportedOperationException("Not yet implemented");
   }
 
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/BatchWriterReplicationReplayer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/BatchWriterReplicationReplayer.java
index d011213..894657c 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/BatchWriterReplicationReplayer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/BatchWriterReplicationReplayer.java
@@ -23,8 +23,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
-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.MutationsRejectedException;
@@ -55,7 +53,7 @@ public class BatchWriterReplicationReplayer implements AccumuloReplicationReplay
 
   @Override
   public long replicateLog(ClientContext context, String tableName, WalEdits data)
-      throws RemoteReplicationException, AccumuloException, AccumuloSecurityException {
+      throws RemoteReplicationException {
     final LogFileKey key = new LogFileKey();
     final LogFileValue value = new LogFileValue();
     final long memoryInBytes = context.getConfiguration()
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/ReplicationServicerHandler.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/ReplicationServicerHandler.java
index b0d6592..0abe464 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/ReplicationServicerHandler.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/ReplicationServicerHandler.java
@@ -119,8 +119,7 @@ public class ReplicationServicerHandler implements Iface {
   }
 
   @Override
-  public long replicateKeyValues(String tableId, KeyValues data, TCredentials creds)
-      throws RemoteReplicationException, TException {
+  public long replicateKeyValues(String tableId, KeyValues data, TCredentials creds) {
     throw new UnsupportedOperationException();
   }
 
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java
index ae5201d..c46d988 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java
@@ -344,7 +344,7 @@ class DatafileManager {
   }
 
   void bringMinorCompactionOnline(FileRef tmpDatafile, FileRef newDatafile, FileRef absMergeFile,
-      DataFileValue dfv, CommitSession commitSession, long flushId) throws IOException {
+      DataFileValue dfv, CommitSession commitSession, long flushId) {
 
     IZooReaderWriter zoo = tablet.getContext().getZooReaderWriter();
     if (tablet.getExtent().isRootTablet()) {
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
index facf55d..a769061 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
@@ -1745,7 +1745,7 @@ public class Tablet implements TabletCommitter {
   }
 
   List<FileRef> findChopFiles(KeyExtent extent, Map<FileRef,Pair<Key,Key>> firstAndLastKeys,
-      Collection<FileRef> allFiles) throws IOException {
+      Collection<FileRef> allFiles) {
     List<FileRef> result = new ArrayList<>();
     if (firstAndLastKeys == null) {
       result.addAll(allFiles);
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletMemory.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletMemory.java
index cf1d1eb..08695df 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletMemory.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletMemory.java
@@ -17,7 +17,6 @@
 package org.apache.accumulo.tserver.tablet;
 
 import java.io.Closeable;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -190,7 +189,7 @@ class TabletMemory implements Closeable {
   }
 
   @Override
-  public void close() throws IOException {
+  public void close() {
     commitSession = null;
   }
 
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/InMemoryMapTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/InMemoryMapTest.java
index 1b82887..44465a2 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/InMemoryMapTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/InMemoryMapTest.java
@@ -103,7 +103,7 @@ public class InMemoryMapTest {
   public ExpectedException thrown = ExpectedException.none();
 
   @BeforeClass
-  public static void setUp() throws Exception {
+  public static void setUp() {
     // suppress log messages having to do with not having an instance
     Logger.getLogger(ZooConfiguration.class).setLevel(Level.OFF);
   }
@@ -153,7 +153,7 @@ public class InMemoryMapTest {
   }
 
   static void assertEqualsNoNext(SortedKeyValueIterator<Key,Value> dc, String row, String column,
-      int ts, String val) throws IOException {
+      int ts, String val) {
     assertTrue(dc.hasTop());
     assertEquals(newKey(row, column, ts), dc.getTopKey());
     assertEquals(new Value(val.getBytes()), dc.getTopValue());
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/LargestFirstMemoryManagerTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/LargestFirstMemoryManagerTest.java
index 08ccc64..f1b9a93 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/LargestFirstMemoryManagerTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/LargestFirstMemoryManagerTest.java
@@ -59,7 +59,7 @@ public class LargestFirstMemoryManagerTest {
   }
 
   @Test
-  public void test() throws Exception {
+  public void test() {
     LargestFirstMemoryManagerUnderTest mgr = new LargestFirstMemoryManagerUnderTest();
     ServerConfiguration config = new ServerConfiguration() {
       ServerConfigurationFactory delegate = context.getServerConfFactory();
@@ -191,7 +191,7 @@ public class LargestFirstMemoryManagerTest {
   }
 
   @Test
-  public void testDeletedTable() throws Exception {
+  public void testDeletedTable() {
     final String deletedTableId = "1";
     Function<Table.ID,Boolean> existenceCheck = tableId -> !deletedTableId
         .contentEquals(tableId.canonicalID());
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/MemValueTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/MemValueTest.java
index 1705e4e..7356bdf 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/MemValueTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/MemValueTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
 public class MemValueTest {
 
   @Test
-  public void testDecodeDoesntModifyInputValue() throws Exception {
+  public void testDecodeDoesntModifyInputValue() {
     Value v = new Value("2.0".getBytes(Charset.forName("UTF-8")));
     Value encodedValue = MemValue.encode(v, 3);
     MemValue m1 = MemValue.decode(encodedValue);
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/TabletResourceManagerTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/TabletResourceManagerTest.java
index 2a80ccf..a63896e 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/TabletResourceManagerTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/TabletResourceManagerTest.java
@@ -32,7 +32,7 @@ public class TabletResourceManagerTest {
   private TableConfiguration conf;
 
   @Before
-  public void setUp() throws Exception {
+  public void setUp() {
     tsrm = createMock(TabletServerResourceManager.class);
     extent = createMock(KeyExtent.class);
     conf = createMock(TableConfiguration.class);
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/TabletServerSyncCheckTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/TabletServerSyncCheckTest.java
index a775884..646a84d 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/TabletServerSyncCheckTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/TabletServerSyncCheckTest.java
@@ -16,7 +16,6 @@
  */
 package org.apache.accumulo.tserver;
 
-import java.io.IOException;
 import java.util.Collections;
 import java.util.Map;
 
@@ -81,54 +80,53 @@ public class TabletServerSyncCheckTest {
     }
 
     @Override
-    public void close() throws IOException {
+    public void close() {
 
     }
 
     @Override
-    public FSDataOutputStream create(Path dest) throws IOException {
+    public FSDataOutputStream create(Path dest) {
       return null;
     }
 
     @Override
-    public FSDataOutputStream create(Path path, boolean b) throws IOException {
+    public FSDataOutputStream create(Path path, boolean b) {
       return null;
     }
 
     @Override
-    public FSDataOutputStream create(Path path, boolean b, int int1, short int2, long long1)
-        throws IOException {
+    public FSDataOutputStream create(Path path, boolean b, int int1, short int2, long long1) {
       return null;
     }
 
     @Override
-    public boolean createNewFile(Path writable) throws IOException {
+    public boolean createNewFile(Path writable) {
       return false;
     }
 
     @Override
     public FSDataOutputStream createSyncable(Path logPath, int buffersize, short replication,
-        long blockSize) throws IOException {
+        long blockSize) {
       return null;
     }
 
     @Override
-    public boolean delete(Path path) throws IOException {
+    public boolean delete(Path path) {
       return false;
     }
 
     @Override
-    public boolean deleteRecursively(Path path) throws IOException {
+    public boolean deleteRecursively(Path path) {
       return false;
     }
 
     @Override
-    public boolean exists(Path path) throws IOException {
+    public boolean exists(Path path) {
       return false;
     }
 
     @Override
-    public FileStatus getFileStatus(Path path) throws IOException {
+    public FileStatus getFileStatus(Path path) {
       return null;
     }
 
@@ -143,27 +141,27 @@ public class TabletServerSyncCheckTest {
     }
 
     @Override
-    public FileStatus[] listStatus(Path path) throws IOException {
+    public FileStatus[] listStatus(Path path) {
       return null;
     }
 
     @Override
-    public boolean mkdirs(Path directory) throws IOException {
+    public boolean mkdirs(Path directory) {
       return false;
     }
 
     @Override
-    public FSDataInputStream open(Path path) throws IOException {
+    public FSDataInputStream open(Path path) {
       return null;
     }
 
     @Override
-    public boolean rename(Path path, Path newPath) throws IOException {
+    public boolean rename(Path path, Path newPath) {
       return false;
     }
 
     @Override
-    public boolean moveToTrash(Path sourcePath) throws IOException {
+    public boolean moveToTrash(Path sourcePath) {
       return false;
     }
 
@@ -173,12 +171,12 @@ public class TabletServerSyncCheckTest {
     }
 
     @Override
-    public boolean isReady() throws IOException {
+    public boolean isReady() {
       return false;
     }
 
     @Override
-    public FileStatus[] globStatus(Path path) throws IOException {
+    public FileStatus[] globStatus(Path path) {
       return null;
     }
 
@@ -198,7 +196,7 @@ public class TabletServerSyncCheckTest {
     }
 
     @Override
-    public ContentSummary getContentSummary(Path dir) throws IOException {
+    public ContentSummary getContentSummary(Path dir) {
       return null;
     }
 
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/TservConstraintEnvTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/TservConstraintEnvTest.java
index 45236ee..1f1cd0d 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/TservConstraintEnvTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/TservConstraintEnvTest.java
@@ -26,7 +26,6 @@ import java.nio.ByteBuffer;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException;
 import org.apache.accumulo.core.data.ArrayByteSequence;
 import org.apache.accumulo.core.data.ByteSequence;
 import org.apache.accumulo.core.securityImpl.thrift.TCredentials;
@@ -36,7 +35,7 @@ import org.junit.Test;
 public class TservConstraintEnvTest {
 
   @Test
-  public void testGetAuthorizationsContainer() throws ThriftSecurityException {
+  public void testGetAuthorizationsContainer() {
     SecurityOperation security = createMock(SecurityOperation.class);
     TCredentials goodCred = createMock(TCredentials.class);
     TCredentials badCred = createMock(TCredentials.class);
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/WalRemovalOrderTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/WalRemovalOrderTest.java
index 435de4f..eedb0df 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/WalRemovalOrderTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/WalRemovalOrderTest.java
@@ -18,8 +18,6 @@ package org.apache.accumulo.tserver;
 
 import static org.junit.Assert.assertEquals;
 
-import java.io.IOException;
-import java.io.UncheckedIOException;
 import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -49,12 +47,7 @@ public class WalRemovalOrderTest {
         throw new UnsupportedOperationException();
       }
     };
-
-    try {
-      return new DfsLogger(null, conf, filename, null);
-    } catch (IOException e) {
-      throw new UncheckedIOException(e);
-    }
+    return new DfsLogger(null, conf, filename, null);
   }
 
   private static LinkedHashSet<DfsLogger> mockLoggers(String... logs) {
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategyTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategyTest.java
index a4efc22..cd0d614 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategyTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategyTest.java
@@ -20,7 +20,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.io.DataInputStream;
-import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
@@ -38,7 +37,6 @@ import org.apache.accumulo.core.data.Range;
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.dataImpl.KeyExtent;
 import org.apache.accumulo.core.file.FileSKVIterator;
-import org.apache.accumulo.core.file.NoSuchMetaStoreException;
 import org.apache.accumulo.core.iterators.IteratorEnvironment;
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 import org.apache.accumulo.core.metadata.schema.DataFileValue;
@@ -92,7 +90,7 @@ public class DefaultCompactionStrategyTest {
 
     @Override
     public void init(SortedKeyValueIterator<Key,Value> source, Map<String,String> options,
-        IteratorEnvironment env) throws IOException {}
+        IteratorEnvironment env) {}
 
     @Override
     public boolean hasTop() {
@@ -100,11 +98,10 @@ public class DefaultCompactionStrategyTest {
     }
 
     @Override
-    public void next() throws IOException {}
+    public void next() {}
 
     @Override
-    public void seek(Range range, Collection<ByteSequence> columnFamilies, boolean inclusive)
-        throws IOException {}
+    public void seek(Range range, Collection<ByteSequence> columnFamilies, boolean inclusive) {}
 
     @Override
     public Key getTopKey() {
@@ -122,7 +119,7 @@ public class DefaultCompactionStrategyTest {
     }
 
     @Override
-    public Key getFirstKey() throws IOException {
+    public Key getFirstKey() {
       Pair<Key,Key> pair = fakeFiles.get(filename);
       if (pair == null)
         return null;
@@ -130,7 +127,7 @@ public class DefaultCompactionStrategyTest {
     }
 
     @Override
-    public Key getLastKey() throws IOException {
+    public Key getLastKey() {
       Pair<Key,Key> pair = fakeFiles.get(filename);
       if (pair == null)
         return null;
@@ -138,15 +135,15 @@ public class DefaultCompactionStrategyTest {
     }
 
     @Override
-    public DataInputStream getMetaStore(String name) throws IOException, NoSuchMetaStoreException {
+    public DataInputStream getMetaStore(String name) {
       return null;
     }
 
     @Override
-    public void closeDeepCopies() throws IOException {}
+    public void closeDeepCopies() {}
 
     @Override
-    public void close() throws IOException {}
+    public void close() {}
 
     @Override
     public FileSKVIterator getSample(SamplerConfigurationImpl sampleConfig) {
@@ -159,7 +156,7 @@ public class DefaultCompactionStrategyTest {
 
   private static class TestCompactionRequest extends MajorCompactionRequest {
     @Override
-    public FileSKVIterator openReader(FileRef ref) throws IOException {
+    public FileSKVIterator openReader(FileRef ref) {
       return new TestFileSKVIterator(ref.toString());
     }
 
@@ -171,13 +168,12 @@ public class DefaultCompactionStrategyTest {
 
   }
 
-  private MajorCompactionRequest createRequest(MajorCompactionReason reason, Object... objs)
-      throws IOException {
+  private MajorCompactionRequest createRequest(MajorCompactionReason reason, Object... objs) {
     return createRequest(new KeyExtent(Table.ID.of("0"), null, null), reason, objs);
   }
 
   private MajorCompactionRequest createRequest(KeyExtent extent, MajorCompactionReason reason,
-      Object... objs) throws IOException {
+      Object... objs) {
     Map<FileRef,DataFileValue> files = new HashMap<>();
     for (int i = 0; i < objs.length; i += 2) {
       files.put(new FileRef("hdfs://nn1/accumulo/tables/5/t-0001/" + objs[i]),
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategyTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategyTest.java
index 4e2b91f..ded5837 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategyTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategyTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-import java.io.IOException;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -50,7 +49,7 @@ public class SizeLimitCompactionStrategyTest {
   }
 
   @Test
-  public void testLimits() throws IOException {
+  public void testLimits() {
     SizeLimitCompactionStrategy slcs = new SizeLimitCompactionStrategy();
     HashMap<String,String> opts = new HashMap<>();
     opts.put(SizeLimitCompactionStrategy.SIZE_LIMIT_OPT, "1G");
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/TwoTierCompactionStrategyTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/TwoTierCompactionStrategyTest.java
index 3eab55c..54ebdd9 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/TwoTierCompactionStrategyTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/TwoTierCompactionStrategyTest.java
@@ -22,7 +22,6 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import java.io.IOException;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -68,7 +67,7 @@ public class TwoTierCompactionStrategyTest {
   }
 
   @Test
-  public void testDefaultCompaction() throws IOException {
+  public void testDefaultCompaction() {
     ttcs.init(opts);
     conf = DefaultConfiguration.getInstance();
     KeyExtent ke = new KeyExtent(Table.ID.of("0"), null, null);
@@ -88,7 +87,7 @@ public class TwoTierCompactionStrategyTest {
   }
 
   @Test
-  public void testLargeCompaction() throws IOException {
+  public void testLargeCompaction() {
     ttcs.init(opts);
     conf = DefaultConfiguration.getInstance();
     KeyExtent ke = new KeyExtent(Table.ID.of("0"), null, null);
@@ -119,7 +118,7 @@ public class TwoTierCompactionStrategyTest {
   }
 
   @Test
-  public void testFileSubsetCompaction() throws IOException {
+  public void testFileSubsetCompaction() {
     ttcs.init(opts);
     conf = DefaultConfiguration.getInstance();
     KeyExtent ke = new KeyExtent(Table.ID.of("0"), null, null);
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/strategies/ConfigurableCompactionStrategyTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/strategies/ConfigurableCompactionStrategyTest.java
index 7ff0e32..5154a8e 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/strategies/ConfigurableCompactionStrategyTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/strategies/ConfigurableCompactionStrategyTest.java
@@ -40,7 +40,7 @@ public class ConfigurableCompactionStrategyTest {
   // file selection options are adequately tested by ShellServerIT
 
   @Test
-  public void testOutputOptions() throws Exception {
+  public void testOutputOptions() {
     MajorCompactionRequest mcr = new MajorCompactionRequest(
         new KeyExtent(Table.ID.of("1"), null, null), MajorCompactionReason.USER, null,
         getServerContext());
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/constraints/ConstraintCheckerTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/constraints/ConstraintCheckerTest.java
index 8e6505b..6e34722 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/constraints/ConstraintCheckerTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/constraints/ConstraintCheckerTest.java
@@ -51,7 +51,7 @@ public class ConstraintCheckerTest {
   private Mutation m;
 
   @Before
-  public void setup() throws NoSuchMethodException, SecurityException {
+  public void setup() throws SecurityException {
     cc = createMockBuilder(ConstraintChecker.class).addMockedMethod("getConstraints").createMock();
     constraints = new ArrayList<>();
     expect(cc.getConstraints()).andReturn(constraints);
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystemTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystemTest.java
index 2fccc7e..335c931 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystemTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystemTest.java
@@ -514,7 +514,7 @@ public class AccumuloReplicaSystemTest {
   }
 
   @Test
-  public void testUserPassword() throws Exception {
+  public void testUserPassword() {
     AccumuloReplicaSystem ars = new AccumuloReplicaSystem();
     ReplicationTarget target = new ReplicationTarget("peer", "peer_table", Table.ID.of("1"));
     String user = "user", password = "password";
@@ -529,7 +529,7 @@ public class AccumuloReplicaSystemTest {
   }
 
   @Test
-  public void testUserKeytab() throws Exception {
+  public void testUserKeytab() {
     AccumuloReplicaSystem ars = new AccumuloReplicaSystem();
     ReplicationTarget target = new ReplicationTarget("peer", "peer_table", Table.ID.of("1"));
     String user = "user", keytab = "/etc/security/keytabs/replication.keytab";
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/tablet/DatafileManagerTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/tablet/DatafileManagerTest.java
index 214a92a..9cf4495 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/tablet/DatafileManagerTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/tablet/DatafileManagerTest.java
@@ -19,7 +19,6 @@ package org.apache.accumulo.tserver.tablet;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
-import java.io.IOException;
 import java.util.SortedMap;
 import java.util.TreeMap;
 
@@ -66,7 +65,7 @@ public class DatafileManagerTest {
    * reserveMergingMinorCompactionFile
    */
   @Test
-  public void testReserveMergingMinorCompactionFile_MaxExceeded() throws IOException {
+  public void testReserveMergingMinorCompactionFile_MaxExceeded() {
     String maxMergeFileSize = "1000B";
     EasyMock.expect(tablet.getTableConfiguration()).andReturn(tableConf);
     EasyMock.expect(tableConf.get(Property.TABLE_MINC_MAX_MERGE_FILE_SIZE))
@@ -88,7 +87,7 @@ public class DatafileManagerTest {
    * Test max files not reached (table.file.max) when calling reserveMergingMinorCompactionFile
    */
   @Test
-  public void testReserveMergingMinorCompactionFile_MaxFilesNotReached() throws IOException {
+  public void testReserveMergingMinorCompactionFile_MaxFilesNotReached() {
     EasyMock.replay(tablet, tableConf);
 
     SortedMap<FileRef,DataFileValue> testFiles = createFileMap("smallfile", "100B", "file2", "100M",
@@ -106,7 +105,7 @@ public class DatafileManagerTest {
    * Test the smallest file is chosen for merging minor compaction
    */
   @Test
-  public void testReserveMergingMinorCompactionFile() throws IOException {
+  public void testReserveMergingMinorCompactionFile() {
     String maxMergeFileSize = "1000B";
     EasyMock.expect(tablet.getTableConfiguration()).andReturn(tableConf);
     EasyMock.expect(tableConf.get(Property.TABLE_MINC_MAX_MERGE_FILE_SIZE))
@@ -128,7 +127,7 @@ public class DatafileManagerTest {
    * Test disabled max file size for merging minor compaction
    */
   @Test
-  public void testReserveMergingMinorCompactionFileDisabled() throws IOException {
+  public void testReserveMergingMinorCompactionFileDisabled() {
     String maxMergeFileSize = "0";
     EasyMock.expect(tablet.getTableConfiguration()).andReturn(tableConf);
     EasyMock.expect(tableConf.get(Property.TABLE_MINC_MAX_MERGE_FILE_SIZE))
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/MockReplicaSystem.java b/test/src/main/java/org/apache/accumulo/test/replication/MockReplicaSystem.java
index dbdab12..2d0cb75 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/MockReplicaSystem.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/MockReplicaSystem.java
@@ -17,7 +17,6 @@
 package org.apache.accumulo.test.replication;
 
 import org.apache.accumulo.core.client.AccumuloException;
-import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.protobuf.ProtobufUtil;
 import org.apache.accumulo.core.replication.ReplicationTarget;
@@ -76,7 +75,7 @@ public class MockReplicaSystem implements ReplicaSystem {
           "Tried to update status in replication table for {} as {}, but the table did not exist",
           p, ProtobufUtil.toString(newStatus), e);
       return status;
-    } catch (AccumuloException | AccumuloSecurityException e) {
+    } catch (AccumuloException e) {
       log.error("Tried to record new status in replication table for {} as {}, but got an error", p,
           ProtobufUtil.toString(newStatus), e);
       return status;


Mime
View raw message