Merge branch 'model_refactor' of github.com:twitter/ambrose into hack…

…week
twitter-archive · Apr 4, 2013 · ab86422 · ab86422
2 parents a459d2a + 3ff9251
commit ab86422
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/common/src/main/java/com/twitter/ambrose/model/Event.java b/common/src/main/java/com/twitter/ambrose/model/Event.java
@@ -52,7 +52,7 @@ private Event(Type type, T payload) {
     this.payload = payload;
   }
 
-  private Event(int eventId, long timestamp, Type type, T payload) {
+  public Event(int eventId, long timestamp, Type type, T payload) {
     this.id = eventId;
     this.timestamp = timestamp;
     this.type = type;

diff --git a/pig/src/main/java/com/twitter/ambrose/pig/AmbrosePigProgressNotificationListener.java b/pig/src/main/java/com/twitter/ambrose/pig/AmbrosePigProgressNotificationListener.java
@@ -175,6 +175,11 @@ public void jobStartedNotification(String scriptId, String assignedJobId) {
    */
   @Override
   public void jobFailedNotification(String scriptId, JobStats stats) {
+    if (stats.getJobId() == null) {
+      log.warn("jobId for failed job not found. This should only happen in local mode");
+      return;
+    }
+
     DAGNode<PigJob> node = dagNodeJobIdMap.get(stats.getJobId());
     if (node == null) {
       log.warn("Unrecognized jobId reported for failed job: " + stats.getJobId());