TaskAction:

- Add isAudited
- Generally straighten out Jackson annotations

merger/src/main/java/com/metamx/druid/merger/common/actions/LocalTaskActionClient.java

@@ -28,15 +28,17 @@ public class LocalTaskActionClient implements TaskActionClient
 
     final RetType ret = taskAction.perform(task, toolbox);
 
-    // Add audit log
-    try {
-      storage.addAuditLog(task, taskAction);
-    }
-    catch (Exception e) {
-      log.makeAlert(e, "Failed to record action in audit log")
-         .addData("task", task.getId())
-         .addData("actionClass", taskAction.getClass().getName())
-         .emit();
+    if (taskAction.isAudited()) {
+      // Add audit log
+      try {
+        storage.addAuditLog(task, taskAction);
+      }
+      catch (Exception e) {
+        log.makeAlert(e, "Failed to record action in audit log")
+           .addData("task", task.getId())
+           .addData("actionClass", taskAction.getClass().getName())
+           .emit();
+      }
     }
 
     return ret;

merger/src/main/java/com/metamx/druid/merger/common/actions/LockAcquireAction.java

@@ -1,6 +1,7 @@
 package com.metamx.druid.merger.common.actions;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.google.common.base.Throwables;
@@ -10,6 +11,7 @@ import org.joda.time.Interval;
 
 public class LockAcquireAction implements TaskAction<TaskLock>
 {
+  @JsonIgnore
   private final Interval interval;
 
   @JsonCreator
@@ -44,6 +46,12 @@ public class LockAcquireAction implements TaskAction<TaskLock>
     }
   }
 
+  @Override
+  public boolean isAudited()
+  {
+    return true;
+  }
+
   @Override
   public String toString()
   {

merger/src/main/java/com/metamx/druid/merger/common/actions/LockListAction.java

@@ -1,12 +1,8 @@
 package com.metamx.druid.merger.common.actions;
 
-import com.google.common.base.Optional;
-import com.google.common.base.Throwables;
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.metamx.druid.merger.common.TaskLock;
 import com.metamx.druid.merger.common.task.Task;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
 
 import java.util.List;
 
@@ -23,6 +19,12 @@ public class LockListAction implements TaskAction<List<TaskLock>>
     return toolbox.getTaskLockbox().findLocksForTask(task);
   }
 
+  @Override
+  public boolean isAudited()
+  {
+    return false;
+  }
+
   @Override
   public String toString()
   {

merger/src/main/java/com/metamx/druid/merger/common/actions/LockReleaseAction.java

@@ -1,6 +1,7 @@
 package com.metamx.druid.merger.common.actions;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.metamx.druid.merger.common.task.Task;
@@ -8,6 +9,7 @@ import org.joda.time.Interval;
 
 public class LockReleaseAction implements TaskAction<Void>
 {
+  @JsonIgnore
   private final Interval interval;
 
   @JsonCreator
@@ -36,6 +38,12 @@ public class LockReleaseAction implements TaskAction<Void>
     return null;
   }
 
+  @Override
+  public boolean isAudited()
+  {
+    return true;
+  }
+
   @Override
   public String toString()
   {

merger/src/main/java/com/metamx/druid/merger/common/actions/SegmentInsertAction.java

@@ -80,6 +80,12 @@ public class SegmentInsertAction implements TaskAction<Set<DataSegment>>
     return retVal;
   }
 
+  @Override
+  public boolean isAudited()
+  {
+    return true;
+  }
+
   @Override
   public String toString()
   {

merger/src/main/java/com/metamx/druid/merger/common/actions/SegmentListUnusedAction.java

@@ -1,6 +1,7 @@
 package com.metamx.druid.merger.common.actions;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.metamx.druid.client.DataSegment;
@@ -12,7 +13,10 @@ import java.util.List;
 
 public class SegmentListUnusedAction implements TaskAction<List<DataSegment>>
 {
+  @JsonIgnore
   private final String dataSource;
+
+  @JsonIgnore
   private final Interval interval;
 
   @JsonCreator
@@ -48,6 +52,12 @@ public class SegmentListUnusedAction implements TaskAction<List<DataSegment>>
     return toolbox.getMergerDBCoordinator().getUnusedSegmentsForInterval(dataSource, interval);
   }
 
+  @Override
+  public boolean isAudited()
+  {
+    return false;
+  }
+
   @Override
   public String toString()
   {

merger/src/main/java/com/metamx/druid/merger/common/actions/SegmentListUsedAction.java

@@ -1,6 +1,7 @@
 package com.metamx.druid.merger.common.actions;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.metamx.druid.client.DataSegment;
@@ -12,7 +13,10 @@ import java.util.List;
 
 public class SegmentListUsedAction implements TaskAction<List<DataSegment>>
 {
+  @JsonIgnore
   private final String dataSource;
+
+  @JsonIgnore
   private final Interval interval;
 
   @JsonCreator
@@ -48,6 +52,12 @@ public class SegmentListUsedAction implements TaskAction<List<DataSegment>>
     return toolbox.getMergerDBCoordinator().getUsedSegmentsForInterval(dataSource, interval);
   }
 
+  @Override
+  public boolean isAudited()
+  {
+    return false;
+  }
+
   @Override
   public String toString()
   {

merger/src/main/java/com/metamx/druid/merger/common/actions/SegmentNukeAction.java

@@ -1,6 +1,7 @@
 package com.metamx.druid.merger.common.actions;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.google.common.collect.ImmutableSet;
@@ -14,6 +15,7 @@ import java.util.Set;
 
 public class SegmentNukeAction implements TaskAction<Void>
 {
+  @JsonIgnore
   private final Set<DataSegment> segments;
 
   @JsonCreator
@@ -57,6 +59,12 @@ public class SegmentNukeAction implements TaskAction<Void>
     return null;
   }
 
+  @Override
+  public boolean isAudited()
+  {
+    return true;
+  }
+
   @Override
   public String toString()
   {

merger/src/main/java/com/metamx/druid/merger/common/actions/SpawnTasksAction.java

@@ -1,6 +1,7 @@
 package com.metamx.druid.merger.common.actions;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.google.common.collect.ImmutableList;
@@ -10,6 +11,7 @@ import java.util.List;
 
 public class SpawnTasksAction implements TaskAction<Void>
 {
+  @JsonIgnore
   private final List<Task> newTasks;
 
   @JsonCreator
@@ -41,6 +43,12 @@ public class SpawnTasksAction implements TaskAction<Void>
     return null;
   }
 
+  @Override
+  public boolean isAudited()
+  {
+    return true;
+  }
+
   @Override
   public String toString()
   {

merger/src/main/java/com/metamx/druid/merger/common/actions/TaskAction.java

@@ -22,4 +22,5 @@ public interface TaskAction<RetType>
 {
   public TypeReference<RetType> getReturnTypeReference(); // T_T
   public RetType perform(Task task, TaskActionToolbox toolbox) throws IOException;
+  public boolean isAudited();
 }