Changeset 27589

Timestamp:

2013-06-10T14:19:21+12:00 (11 years ago)

Author:

jmt12

Message:

Fixing up some minor bugs in regex's

File:

• gs2-extensions/parallel-building/trunk/src/bin/script/parse_task_info_from_hadoop_log.pl (modified) (4 diffs)

gs2-extensions/parallel-building/trunk/src/bin/script/parse_task_info_from_hadoop_log.pl

@@ -173 +173 @@
       # And job completion... so we can keep parsing other log files as
       # necessary
-      elsif ($line =~ /Job 'job_${job_id} has completed successfully\./)
+      elsif ($line =~ /Job job_${job_id} has completed successfully\./)
       {
         $job_complete = 1;
@@ -213 +213 @@
   }
 }
-print "Done\n";
+print "   Done\n";
 
 if (!$job_complete)
@@ -253 +253 @@
     }
     print CSVOUT $task_number . "," . $attempt_number . "," . $data_local . ",\"" . $compute_node . "\",\"" . join(',', natsort(@splits)) . "\"\n";
-    undef($tid_2_splits->{$task_id});
+    $tid_2_splits->{$task_id} = undef;
   }
 
@@ -260 +260 @@
   foreach my $task_id (keys %{$tid_2_splits})
   {
-    my ($job_id, $task_number) = $task_id =~ /^(\d+_\d+)_m_(\d+)/;
-    my @splits = @{$tid_2_splits->{$task_id}};
-    print CSVOUT $task_number . ",-1,-1,\"\",\"" . join(',', natsort(@splits)) . "\"\n";
+    if (defined $tid_2_splits->{$task_id})
+    {
+      my ($job_id, $task_number) = $task_id =~ /^(\d+_\d+)_m_(\d+)/;
+      my @splits = @{$tid_2_splits->{$task_id}};
+      print CSVOUT $task_number . ",-1,-1,\"\",\"" . join(',', natsort(@splits)) . "\"\n";
+    }
   }