Do not remove the writer from 'writers' until after the writer is committed,

otherwise its files will not appear in the results of getCompactionTargets.

Author: apurtell

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/Compactor.java

@@ -380,20 +380,23 @@ protected final List<Path> compact(final CompactionRequestImpl request,
         this.progress.remove(progress);
       }
       if (writer != null) {
-        if (!finished) {
-          abortWriter(writer);
-          return Collections.emptyList();
+        try {
+          if (!finished) {
+            // There was an error, so abort the writer.
+            abortWriter(writer);
+            return Collections.emptyList();
+          } else {
+            // Finished, commit the writer's results.
+            return commitWriter(writer, fd, request);
+          }
+        } finally {
+          writers.remove(writer);
         }
-        writers.remove(writer);
       }
     }
-    if (!finished) {
-      throw new IllegalStateException("We should have exited the method on all error paths");
-    }
-    if (writer == null) {
-      throw new IllegalStateException("Writer should be non-null if no error");
-    }
-    return commitWriter(writer, fd, request);
+    // We have fallen through to here if the compaction was aborted and there was nothing
+    // to commit.
+    return Collections.emptyList();
   }
 
   protected abstract List<Path> commitWriter(T writer, FileDetails fd,