Remove option of setting null for init goal

Author: DomGarguilo

core/src/main/java/org/apache/accumulo/core/clientImpl/ImportConfigurationImpl.java

@@ -27,7 +27,7 @@ public class ImportConfigurationImpl implements ImportConfiguration, ImportConfi
   private boolean built = false;
   private boolean keepOffline = false;
   private boolean keepMappingsFile = false;
-  private TabletHostingGoal initialHostingGoal = null;
+  private TabletHostingGoal initialHostingGoal = TabletHostingGoal.ONDEMAND;
 
   private final static String BUILT_ERROR_MSG = "ImportConfiguration was already built";
   private final static String NOT_BUILT_ERROR_MSG = "ImportConfiguration was not built yet";
@@ -48,6 +48,7 @@ public Builder setKeepMappings(boolean keepMappings) {
 
   @Override
   public Builder setInitialHostingGoal(TabletHostingGoal initialTabletHostingGoal) {
+    Preconditions.checkState(initialTabletHostingGoal != null, "initialTabletHostingGoal is null");
     Preconditions.checkState(!built, BUILT_ERROR_MSG);
     this.initialHostingGoal = initialTabletHostingGoal;
     return this;

core/src/main/java/org/apache/accumulo/core/clientImpl/TableOperationsImpl.java

@@ -1637,8 +1637,7 @@ public void importTable(String tableName, Set<String> importDirs, ImportConfigur
     args.add(0, ByteBuffer.wrap(tableName.getBytes(UTF_8)));
     args.add(1, ByteBuffer.wrap(Boolean.toString(keepOffline).getBytes(UTF_8)));
     args.add(2, ByteBuffer.wrap(Boolean.toString(keepMapping).getBytes(UTF_8)));
-    args.add(3, ic.getInitialHostingGoal() == null ? EMPTY
-        : ByteBuffer.wrap(ic.getInitialHostingGoal().name().getBytes(UTF_8)));
+    args.add(3, ByteBuffer.wrap(ic.getInitialHostingGoal().name().getBytes(UTF_8)));
     checkedImportDirs.stream().map(s -> s.getBytes(UTF_8)).map(ByteBuffer::wrap).forEach(args::add);
 
     try {

server/manager/src/main/java/org/apache/accumulo/manager/FateServiceHandler.java

@@ -573,13 +573,8 @@ public void executeFateOperation(TInfo tinfo, TCredentials c, TFateId opid, Fate
             validateName(arguments.get(0), tableOp, NEW_TABLE_NAME.and(NOT_BUILTIN_TABLE));
         boolean keepOffline = Boolean.parseBoolean(ByteBufferUtil.toString(arguments.get(1)));
         boolean keepMappings = Boolean.parseBoolean(ByteBufferUtil.toString(arguments.get(2)));
-
-        TabletHostingGoal initialHostingGoal = null;
-        String goalString = ByteBufferUtil.toString(arguments.get(3));
-        goalString = StringUtils.defaultIfBlank(goalString, null);
-        if (goalString != null) {
-          initialHostingGoal = TabletHostingGoal.valueOf(goalString);
-        }
+        TabletHostingGoal initialHostingGoal =
+            TabletHostingGoal.valueOf(ByteBufferUtil.toString(arguments.get(3)));
 
         List<ByteBuffer> exportDirArgs =
             arguments.stream().skip(IMPORT_DIR_OFFSET + 1).collect(Collectors.toList());

server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/PopulateMetadataTable.java

@@ -130,8 +130,11 @@ public Repo<Manager> call(long tid, Manager manager) throws Exception {
           int dirCount = 0;
 
           TabletHostingGoal initialHostingGoal = tableInfo.initialHostingGoal;
-
-          boolean sawHostingGoal = false;
+          if (initialHostingGoal == null) {
+            log.error("Initial hosting goal is null and shouldn't be, defaulting to "
+                + TabletHostingGoal.ONDEMAND);
+            initialHostingGoal = TabletHostingGoal.ONDEMAND;
+          }
 
           while (true) {
             key.readFields(in);
@@ -163,11 +166,8 @@ public Repo<Manager> call(long tid, Manager manager) throws Exception {
             if (m == null || !currentRow.equals(metadataRow)) {
 
               if (m != null) {
-                // if initial hosting goal was provided, use it, otherwise use ondemand
-                TabletHostingGoal hostingGoal =
-                    (initialHostingGoal != null) ? initialHostingGoal : TabletHostingGoal.ONDEMAND;
-
-                HostingColumnFamily.GOAL_COLUMN.put(m, TabletHostingGoalUtil.toValue(hostingGoal));
+                HostingColumnFamily.GOAL_COLUMN.put(m,
+                    TabletHostingGoalUtil.toValue(initialHostingGoal));
                 mbw.addMutation(m);
               }
 
@@ -180,30 +180,17 @@ public Repo<Manager> call(long tid, Manager manager) throws Exception {
               m = new Mutation(metadataRow);
               ServerColumnFamily.DIRECTORY_COLUMN.put(m, new Value(tabletDir));
               currentRow = metadataRow;
-              sawHostingGoal = false;
             }
 
-            if (initialHostingGoal != null) {
-              // add the initial hosting goal
-              HostingColumnFamily.GOAL_COLUMN.put(m,
-                  TabletHostingGoalUtil.toValue(initialHostingGoal));
-              sawHostingGoal = true;
-            }
-            if (HostingColumnFamily.GOAL_COLUMN.hasColumns(key)) {
-              sawHostingGoal = true;
-            }
+            // add the initial hosting goal
+            HostingColumnFamily.GOAL_COLUMN.put(m,
+                TabletHostingGoalUtil.toValue(initialHostingGoal));
+
             m.put(key.getColumnFamily(), cq, val);
 
             if (endRow == null && TabletColumnFamily.PREV_ROW_COLUMN.hasColumns(key)) {
-
-              if (!sawHostingGoal) {
-                // add a default hosting goal
-                HostingColumnFamily.GOAL_COLUMN.put(m,
-                    TabletHostingGoalUtil.toValue(TabletHostingGoal.ONDEMAND));
-              }
-
               mbw.addMutation(m);
-              break; // its the last column in the last row
+              break; // it's the last column in the last row
             }
           }
           break;