[accumulo] branch master updated: Use ServerContext instead of conf factory (#1592)

[mm...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new e0042a9  Use ServerContext instead of conf factory (#1592)
e0042a9 is described below

commit e0042a9940e548270fdb1f82c99680117d210e54
Author: Mike Miller <mm...@apache.org>
AuthorDate: Thu Apr 23 08:12:36 2020 -0400

    Use ServerContext instead of conf factory (#1592)
    
    * Only use ServerConfigurationFactory outside of ServerContext where it
    is used in API and tests
---
 .../gc/replication/CloseWriteAheadLogReferencesIT.java     |  7 +------
 .../accumulo/test/performance/scan/CollectTabletStats.java | 14 ++++++--------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/test/src/main/java/org/apache/accumulo/test/gc/replication/CloseWriteAheadLogReferencesIT.java b/test/src/main/java/org/apache/accumulo/test/gc/replication/CloseWriteAheadLogReferencesIT.java
index c3e8a5c..d131ccb 100644
--- a/test/src/main/java/org/apache/accumulo/test/gc/replication/CloseWriteAheadLogReferencesIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/gc/replication/CloseWriteAheadLogReferencesIT.java
@@ -52,7 +52,6 @@ import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.core.security.TablePermission;
 import org.apache.accumulo.gc.replication.CloseWriteAheadLogReferences;
 import org.apache.accumulo.server.ServerContext;
-import org.apache.accumulo.server.conf.ServerConfigurationFactory;
 import org.apache.accumulo.server.replication.StatusUtil;
 import org.apache.accumulo.server.replication.proto.Replication.Status;
 import org.apache.accumulo.test.functional.ConfigurableMacBase;
@@ -101,9 +100,6 @@ public class CloseWriteAheadLogReferencesIT extends ConfigurableMacBase {
   public void setupEasyMockStuff() {
     SiteConfiguration siteConfig = EasyMock.createMock(SiteConfiguration.class);
     final AccumuloConfiguration systemConf = new ConfigurationCopy(new HashMap<>());
-    ServerConfigurationFactory factory = createMock(ServerConfigurationFactory.class);
-    expect(factory.getSystemConfiguration()).andReturn(systemConf).anyTimes();
-    expect(factory.getSiteConfiguration()).andReturn(siteConfig).anyTimes();
 
     // Just make the SiteConfiguration delegate to our AccumuloConfiguration
     // Presently, we only need get(Property) and iterator().
@@ -118,7 +114,6 @@ public class CloseWriteAheadLogReferencesIT extends ConfigurableMacBase {
 
     EasyMock.expect(siteConfig.iterator()).andAnswer(() -> systemConf.iterator()).anyTimes();
     ServerContext context = createMock(ServerContext.class);
-    expect(context.getServerConfFactory()).andReturn(factory).anyTimes();
     expect(context.getProperties()).andReturn(new Properties()).anyTimes();
     expect(context.getZooKeepers()).andReturn("localhost").anyTimes();
     expect(context.getInstanceName()).andReturn("test").anyTimes();
@@ -126,7 +121,7 @@ public class CloseWriteAheadLogReferencesIT extends ConfigurableMacBase {
     expect(context.getInstanceID()).andReturn("1111").anyTimes();
     expect(context.getZooKeeperRoot()).andReturn(Constants.ZROOT + "/1111").anyTimes();
 
-    replay(factory, siteConfig, context);
+    replay(siteConfig, context);
 
     refs = new WrappedCloseWriteAheadLogReferences(context);
   }
diff --git a/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java b/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java
index 41e417d..a3ee4f1 100644
--- a/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java
+++ b/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java
@@ -72,7 +72,6 @@ import org.apache.accumulo.core.util.HostAndPort;
 import org.apache.accumulo.core.util.Stat;
 import org.apache.accumulo.server.ServerContext;
 import org.apache.accumulo.server.cli.ServerUtilOpts;
-import org.apache.accumulo.server.conf.ServerConfigurationFactory;
 import org.apache.accumulo.server.conf.TableConfiguration;
 import org.apache.accumulo.server.fs.VolumeManager;
 import org.apache.accumulo.server.util.MetadataTableUtil;
@@ -116,7 +115,6 @@ public class CollectTabletStats {
 
     ServerContext context = opts.getServerContext();
     final VolumeManager fs = context.getVolumeManager();
-    ServerConfigurationFactory sconf = context.getServerConfFactory();
 
     TableId tableId = Tables.getTableId(context, opts.tableName);
     if (tableId == null) {
@@ -170,7 +168,7 @@ public class CollectTabletStats {
         Test test = new Test(ke) {
           @Override
           public int runTest() throws Exception {
-            return readFiles(fs, sconf.getSystemConfiguration(), files, ke, columns);
+            return readFiles(fs, context.getConfiguration(), files, ke, columns);
           }
 
         };
@@ -190,7 +188,7 @@ public class CollectTabletStats {
         Test test = new Test(ke) {
           @Override
           public int runTest() throws Exception {
-            return readFilesUsingIterStack(fs, sconf, files, opts.auths, ke, columns, false);
+            return readFilesUsingIterStack(fs, context, files, opts.auths, ke, columns, false);
           }
         };
 
@@ -208,7 +206,7 @@ public class CollectTabletStats {
         Test test = new Test(ke) {
           @Override
           public int runTest() throws Exception {
-            return readFilesUsingIterStack(fs, sconf, files, opts.auths, ke, columns, true);
+            return readFilesUsingIterStack(fs, context, files, opts.auths, ke, columns, true);
           }
         };
 
@@ -486,7 +484,7 @@ public class CollectTabletStats {
     return columnSet;
   }
 
-  private static int readFilesUsingIterStack(VolumeManager fs, ServerConfigurationFactory aconf,
+  private static int readFilesUsingIterStack(VolumeManager fs, ServerContext context,
       List<TabletFile> files, Authorizations auths, KeyExtent ke, String[] columns,
       boolean useTableIterators) throws Exception {
 
@@ -498,12 +496,12 @@ public class CollectTabletStats {
       FileSystem ns = fs.getFileSystemByPath(file.getPath());
       readers.add(FileOperations.getInstance().newReaderBuilder()
           .forFile(file.getPathStr(), ns, ns.getConf(), CryptoServiceFactory.newDefaultInstance())
-          .withTableConfiguration(aconf.getSystemConfiguration()).build());
+          .withTableConfiguration(context.getConfiguration()).build());
     }
 
     List<IterInfo> emptyIterinfo = Collections.emptyList();
     Map<String,Map<String,String>> emptySsio = Collections.emptyMap();
-    TableConfiguration tconf = aconf.getTableConfiguration(ke.getTableId());
+    TableConfiguration tconf = context.getTableConfiguration(ke.getTableId());
     reader = createScanIterator(ke, readers, auths, new byte[] {}, new HashSet<>(), emptyIterinfo,
         emptySsio, useTableIterators, tconf);