From d7b9a2a11a3d5d9fe7976d13b4daa4671711d98a Mon Sep 17 00:00:00 2001 From: Angad Singh Date: Sun, 29 Jun 2014 15:40:36 +0530 Subject: [PATCH] bugfix: getLastSuccessfulProcessRecord not taking processFileSubstring into account --- .../main/java/com/twitter/hraven/etl/JobFilePreprocessor.java | 2 +- .../java/com/twitter/hraven/etl/ProcessRecordService.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hraven-etl/src/main/java/com/twitter/hraven/etl/JobFilePreprocessor.java b/hraven-etl/src/main/java/com/twitter/hraven/etl/JobFilePreprocessor.java index c34f85a..6ecab92 100644 --- a/hraven-etl/src/main/java/com/twitter/hraven/etl/JobFilePreprocessor.java +++ b/hraven-etl/src/main/java/com/twitter/hraven/etl/JobFilePreprocessor.java @@ -297,7 +297,7 @@ public int run(String[] args) throws Exception { if (!forceAllFiles) { lastProcessRecord = processRecordService - .getLastSuccessfulProcessRecord(cluster); + .getLastSuccessfulProcessRecord(cluster, output); } long minModificationTimeMillis = 0; diff --git a/hraven-etl/src/main/java/com/twitter/hraven/etl/ProcessRecordService.java b/hraven-etl/src/main/java/com/twitter/hraven/etl/ProcessRecordService.java index fc067b2..85bdfc9 100644 --- a/hraven-etl/src/main/java/com/twitter/hraven/etl/ProcessRecordService.java +++ b/hraven-etl/src/main/java/com/twitter/hraven/etl/ProcessRecordService.java @@ -148,10 +148,10 @@ public void writeJobRecord(ProcessRecord processRecord) throws IOException { * state. * @throws IOException */ - public ProcessRecord getLastSuccessfulProcessRecord(String cluster) + public ProcessRecord getLastSuccessfulProcessRecord(String cluster, String processFileSubstring) throws IOException { List processRecords = getProcessRecords(cluster, NOT_EQUAL, - CREATED, 1, null); + CREATED, 1, processFileSubstring); if (processRecords.size() > 0) { return processRecords.get(0); }