Changed the logic for error file download

forcedotcom · Jul 21, 2015 · 2cfbb99 · 2cfbb99
1 parent a87b941
commit 2cfbb99
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 6 deletions.
diff --git a/src/main/java/com/sforce/dataset/flow/monitor/DataFlowMonitorUtil.java b/src/main/java/com/sforce/dataset/flow/monitor/DataFlowMonitorUtil.java
@@ -69,7 +69,24 @@ public static void getJobsAndErrorFiles(PartnerConnection partnerConnection, Str
 			{
 				if(cnt>4)
 					break;
-				getJobErrorFile(partnerConnection, datasetName, job._uid);
+				if(job.getType().equalsIgnoreCase("system") && (job.getStatus()==JobEntry.FAILED || job.getStatus()==JobEntry.WARNING))
+				{									
+					List<NodeEntry> nodes = DataFlowMonitorUtil.getDataFlowJobNodes(partnerConnection, job.getNodeUrl());
+					for(NodeEntry node:nodes)
+					{
+						if(node.getNodeType() != null && (node.getNodeType().equalsIgnoreCase("csvDigest") || node.getNodeType().equalsIgnoreCase("binDigest")))
+						{
+							if(node.getOutputRowsFailed()>0)
+							{
+								File file = getJobErrorFile(partnerConnection, datasetName, job._uid);
+								if(file==null || !file.exists() || file.length() == 0)
+								{
+									System.out.println("Found job with {"+node.getOutputRowsFailed()+"} failures but no error file");
+								}
+							}
+						}
+					}
+				}
 				cnt++;
 			}
 		}
@@ -264,7 +281,18 @@ public static List<NodeEntry> getDataFlowJobNodes(PartnerConnection partnerConne
 								nodeEntry.startTime  = (String) job.get("startTime");
 
 								nodeEntry._uid  = (String) job.get("_uid");
-								nodeEntry.duration = (String) job.get("duration");
+								Object temp = job.get("duration");
+								if(temp != null)
+								{
+									if(temp instanceof Number)
+									{
+										nodeEntry.duration = ((Number)temp).longValue();
+									}else
+									{
+										BigDecimal bd = new BigDecimal(temp.toString());
+										nodeEntry.duration = bd.longValue();
+									}
+								}
 
 								nodeEntry.nodeName = (String) job.get("nodeName");
 
@@ -274,7 +302,7 @@ public static List<NodeEntry> getDataFlowJobNodes(PartnerConnection partnerConne
 
 								nodeEntry.status = (String) job.get("status");
 
-								Object temp = job.get("outputRowsFailed");
+								temp = job.get("outputRowsFailed");
 								if(temp != null)
 								{
 									if(temp instanceof Number)

diff --git a/src/main/java/com/sforce/dataset/flow/monitor/JobEntry.java b/src/main/java/com/sforce/dataset/flow/monitor/JobEntry.java
@@ -26,8 +26,16 @@
 package com.sforce.dataset.flow.monitor;
 
 public class JobEntry implements Comparable<JobEntry> {
-    String errorMessage = null;
+
+	   public static final Integer SUCCESS = 1;
+	   public static final Integer FAILED = 0;
+	   public static final Integer RUNNING = 2;
+	   public static final Integer QUEUED = 4;
+	   public static final Integer WARNING = 5;
+
+	String errorMessage = null;
     long startTimeEpoch = 0;
+
     int status = 0;
     long endTimeEpoch = 0;
     String _uid = null;

diff --git a/src/main/java/com/sforce/dataset/flow/monitor/NodeEntry.java b/src/main/java/com/sforce/dataset/flow/monitor/NodeEntry.java
@@ -28,7 +28,7 @@
 public class NodeEntry {
 	String startTime = null;//	:	Tue Mar 03 00:41:36 GMT 2015	
 	String _type = null;//	:	nodes
-	String duration = null;//	:	0 hours, 0 minutes
+	long duration = 0;//	:	0 hours, 0 minutes
 	String status = null;//	:	success			
 	long outputRowsFailed = 0;//	:	5			
 	long outputRowsProcessed = 0; //	:	17934			
@@ -42,7 +42,7 @@ public String getStartTime() {
 	public String get_type() {
 		return _type;
 	}
-	public String getDuration() {
+	public long getDuration() {
 		return duration;
 	}
 	public String getStatus() {