Repository: asterixdb Updated Branches: refs/heads/master 786ed61d0 -> 9884ff1c2
[ASTERIXDB-1982][FAIL] Fix DatasetPartitionWriter fail behavior - user model changes: no - storage format changes: no - interface changes: no Details: - Do not write an empty result partition on pipeline failure. Change-Id: I1e065fd7e4204773e17d809b6e44059c709eb27b Reviewed-on: https://asterix-gerrit.ics.uci.edu/1891 Sonar-Qube: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> BAD: Jenkins <[email protected]> Integration-Tests: Jenkins <[email protected]> Reviewed-by: Yingyi Bu <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/9884ff1c Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/9884ff1c Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/9884ff1c Branch: refs/heads/master Commit: 9884ff1c2965a956b04cb6490676ade5670fad49 Parents: 786ed61 Author: Murtadha Hubail <[email protected]> Authored: Fri Jul 21 16:12:17 2017 +0300 Committer: Murtadha Hubail <[email protected]> Committed: Fri Jul 21 09:48:47 2017 -0700 ---------------------------------------------------------------------- .../control/nc/dataset/DatasetPartitionWriter.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9884ff1c/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/dataset/DatasetPartitionWriter.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/dataset/DatasetPartitionWriter.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/dataset/DatasetPartitionWriter.java index 81f5551..0189735 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/dataset/DatasetPartitionWriter.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/dataset/DatasetPartitionWriter.java @@ -98,14 +98,9 @@ public class DatasetPartitionWriter implements IFrameWriter { @Override public void fail() throws HyracksDataException { - try { - failed = true; - resultState.closeAndDelete(); - resultState.abort(); - registerResultPartitionLocation(false); - } catch (HyracksException e) { - throw new HyracksDataException(e); - } + failed = true; + resultState.closeAndDelete(); + resultState.abort(); } @Override @@ -121,7 +116,9 @@ public class DatasetPartitionWriter implements IFrameWriter { resultState.close(); } try { - manager.reportPartitionWriteCompletion(jobId, resultSetId, partition); + if (partitionRegistered) { + manager.reportPartitionWriteCompletion(jobId, resultSetId, partition); + } } catch (HyracksException e) { throw new HyracksDataException(e); }
