From 6318e943d168b961e4def3f37de47faf9ae44136 Mon Sep 17 00:00:00 2001 From: Shen Hong Date: Tue, 9 Jun 2020 19:14:26 +0800 Subject: [PATCH] [HUDI-1016] Code optimization in MergeOnReadRollbackActionExecutor(#1718) --- .../action/rollback/MergeOnReadRollbackActionExecutor.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hudi-client/src/main/java/org/apache/hudi/table/action/rollback/MergeOnReadRollbackActionExecutor.java b/hudi-client/src/main/java/org/apache/hudi/table/action/rollback/MergeOnReadRollbackActionExecutor.java index 4b9aaddf9..d30f0e2ff 100644 --- a/hudi-client/src/main/java/org/apache/hudi/table/action/rollback/MergeOnReadRollbackActionExecutor.java +++ b/hudi-client/src/main/java/org/apache/hudi/table/action/rollback/MergeOnReadRollbackActionExecutor.java @@ -67,12 +67,12 @@ public class MergeOnReadRollbackActionExecutor extends BaseRollbackActionExecuto @Override protected List executeRollback() throws IOException { long startTime = System.currentTimeMillis(); - LOG.error("Rolling back instant " + instantToRollback.getTimestamp()); + LOG.info("Rolling back instant " + instantToRollback.getTimestamp()); HoodieInstant resolvedInstant = instantToRollback; // Atomically un-publish all non-inflight commits if (instantToRollback.isCompleted()) { - LOG.error("Un-publishing instant " + instantToRollback + ", deleteInstants=" + deleteInstants); + LOG.info("Un-publishing instant " + instantToRollback + ", deleteInstants=" + deleteInstants); resolvedInstant = table.getActiveTimeline().revertToInflight(instantToRollback); // reload meta-client to reflect latest timeline status table.getMetaClient().reloadActiveTimeline(); @@ -86,11 +86,10 @@ public class MergeOnReadRollbackActionExecutor extends BaseRollbackActionExecuto // NOTE {@link HoodieCompactionConfig#withCompactionLazyBlockReadEnabled} needs to be set to TRUE. This is // required to avoid OOM when merging multiple LogBlocks performed during nested rollbacks. // Atomically un-publish all non-inflight commits - // Atomically un-publish all non-inflight commits // For Requested State (like failure during index lookup), there is nothing to do rollback other than // deleting the timeline file if (!resolvedInstant.isRequested()) { - LOG.info("Unpublished " + resolvedInstant); + LOG.info("Un-published " + resolvedInstant); List rollbackRequests = generateRollbackRequests(jsc, resolvedInstant); // TODO: We need to persist this as rollback workload and use it in case of partial failures allRollbackStats = new RollbackHelper(table.getMetaClient(), config).performRollback(jsc, resolvedInstant, rollbackRequests);