Repository: carbondata Updated Branches: refs/heads/branch-1.3 28f33746a -> ea751bc7a
[CARBONDATA-2316] Executor task is failed but UI shows success issue fixed Executor task is failed but UI shows success issue for comapction This closes #2158 Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/ea751bc7 Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/ea751bc7 Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/ea751bc7 Branch: refs/heads/branch-1.3 Commit: ea751bc7aae477f2ee0417ce61968a22509d660a Parents: 28f3374 Author: rahulforallp <rahul.ku...@knoldus.in> Authored: Fri Apr 6 14:16:06 2018 +0530 Committer: manishgupta88 <tomanishgupt...@gmail.com> Committed: Wed Apr 11 18:21:51 2018 +0530 ---------------------------------------------------------------------- .../core/indexstore/blockletindex/BlockletDataMapFactory.java | 2 ++ .../org/apache/carbondata/spark/rdd/CarbonMergerRDD.scala | 2 +- .../carbondata/processing/merger/AbstractResultProcessor.java | 2 +- .../processing/merger/CompactionResultSortProcessor.java | 6 +++--- .../processing/merger/RowResultMergerProcessor.java | 7 +++---- 5 files changed, 10 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/carbondata/blob/ea751bc7/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/BlockletDataMapFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/BlockletDataMapFactory.java b/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/BlockletDataMapFactory.java index c08c87e..6d8feeb 100644 --- a/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/BlockletDataMapFactory.java +++ b/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/BlockletDataMapFactory.java @@ -103,6 +103,8 @@ public class BlockletDataMapFactory implements DataMapFactory, BlockletDetailsFe Set<TableBlockIndexUniqueIdentifier> validIdentifiers = BlockletDataMapUtil .filterIdentifiersBasedOnDistributable(tableBlockIndexUniqueIdentifiers, (BlockletDataMapDistributable) distributable); + ((BlockletDataMapDistributable) distributable) + .setTableBlockIndexUniqueIdentifiers(validIdentifiers); for (TableBlockIndexUniqueIdentifier tableBlockIndexUniqueIdentifier : validIdentifiers) { if (null == cache.getIfPresent(tableBlockIndexUniqueIdentifier)) { distributablesToBeLoaded.add(distributable); http://git-wip-us.apache.org/repos/asf/carbondata/blob/ea751bc7/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/CarbonMergerRDD.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/CarbonMergerRDD.scala b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/CarbonMergerRDD.scala index 6932c79..31f3c85 100644 --- a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/CarbonMergerRDD.scala +++ b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/CarbonMergerRDD.scala @@ -230,7 +230,7 @@ class CarbonMergerRDD[K, V]( } catch { case e: Exception => - LOGGER.error(e) + LOGGER.error(e, "Compaction Failed ") throw e } http://git-wip-us.apache.org/repos/asf/carbondata/blob/ea751bc7/processing/src/main/java/org/apache/carbondata/processing/merger/AbstractResultProcessor.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/merger/AbstractResultProcessor.java b/processing/src/main/java/org/apache/carbondata/processing/merger/AbstractResultProcessor.java index 067a4c4..59f2e0d 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/merger/AbstractResultProcessor.java +++ b/processing/src/main/java/org/apache/carbondata/processing/merger/AbstractResultProcessor.java @@ -39,7 +39,7 @@ public abstract class AbstractResultProcessor { * @param resultIteratorList * @return */ - public abstract boolean execute(List<RawResultIterator> resultIteratorList); + public abstract boolean execute(List<RawResultIterator> resultIteratorList) throws Exception; /** * This method will be sued to clean up the resources and close all the spawned threads to avoid http://git-wip-us.apache.org/repos/asf/carbondata/blob/ea751bc7/processing/src/main/java/org/apache/carbondata/processing/merger/CompactionResultSortProcessor.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/merger/CompactionResultSortProcessor.java b/processing/src/main/java/org/apache/carbondata/processing/merger/CompactionResultSortProcessor.java index f3e4b8f..24440ae 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/merger/CompactionResultSortProcessor.java +++ b/processing/src/main/java/org/apache/carbondata/processing/merger/CompactionResultSortProcessor.java @@ -151,7 +151,7 @@ public class CompactionResultSortProcessor extends AbstractResultProcessor { * * @param resultIteratorList */ - public boolean execute(List<RawResultIterator> resultIteratorList) { + public boolean execute(List<RawResultIterator> resultIteratorList) throws Exception { boolean isCompactionSuccess = false; try { initTempStoreLocation(); @@ -167,7 +167,7 @@ public class CompactionResultSortProcessor extends AbstractResultProcessor { } isCompactionSuccess = true; } catch (Exception e) { - LOGGER.error(e, "Compaction failed: " + e.getMessage()); + throw e; } finally { if (partitionSpec != null) { try { @@ -176,8 +176,8 @@ public class CompactionResultSortProcessor extends AbstractResultProcessor { partitionSpec.getLocation().toString(), carbonLoadModel.getFactTimeStamp() + "", partitionSpec.getPartitions()); } catch (IOException e) { - LOGGER.error(e, "Compaction failed: " + e.getMessage()); isCompactionSuccess = false; + throw e; } } // clear temp files and folders created during compaction http://git-wip-us.apache.org/repos/asf/carbondata/blob/ea751bc7/processing/src/main/java/org/apache/carbondata/processing/merger/RowResultMergerProcessor.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/merger/RowResultMergerProcessor.java b/processing/src/main/java/org/apache/carbondata/processing/merger/RowResultMergerProcessor.java index 6e99a1a..3ef157d 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/merger/RowResultMergerProcessor.java +++ b/processing/src/main/java/org/apache/carbondata/processing/merger/RowResultMergerProcessor.java @@ -99,7 +99,7 @@ public class RowResultMergerProcessor extends AbstractResultProcessor { * Merge function * */ - public boolean execute(List<RawResultIterator> resultIteratorList) { + public boolean execute(List<RawResultIterator> resultIteratorList) throws Exception { initRecordHolderHeap(resultIteratorList); boolean mergeStatus = false; int index = 0; @@ -160,9 +160,8 @@ public class RowResultMergerProcessor extends AbstractResultProcessor { } mergeStatus = true; } catch (Exception e) { - LOGGER.error(e, e.getMessage()); - LOGGER.error("Exception in compaction merger " + e.getMessage()); mergeStatus = false; + throw e; } finally { try { if (isDataPresent) { @@ -174,8 +173,8 @@ public class RowResultMergerProcessor extends AbstractResultProcessor { partitionSpec.getPartitions()); } } catch (CarbonDataWriterException | IOException e) { - LOGGER.error(e, "Exception in compaction merger"); mergeStatus = false; + throw e; } }
