Skip to content

[MINOR] Throw exceptions when cleaner/compactor fail #10108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danny0405 merged 1 commit into from
Nov 16, 2023
Merged

[MINOR] Throw exceptions when cleaner/compactor fail #10108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions hudi-utilities/src/main/java/org/apache/hudi/utilities/HoodieCleaner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import com.beust.jcommander.JCommander;
import com.beust.jcommander.Parameter;
import org.apache.hadoop.fs.Path;
import org.apache.hudi.exception.HoodieException;
import org.apache.spark.api.java.JavaSparkContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -103,28 +104,20 @@ public static void main(String[] args) {
JCommander cmd = new JCommander(cfg, null, args);
if (cfg.help || args.length == 0) {
cmd.usage();
System.exit(1);
throw new HoodieException("Failed to run cleaning for " + cfg.basePath);
}

String dirName = new Path(cfg.basePath).getName();
JavaSparkContext jssc = UtilHelpers.buildSparkContext("hoodie-cleaner-" + dirName, cfg.sparkMaster);
boolean success = true;

try {
new HoodieCleaner(cfg, jssc).run();
} catch (Throwable throwable) {
success = false;
LOG.error("Failed to run cleaning for " + cfg.basePath, throwable);
throw new HoodieException("Failed to run cleaning for " + cfg.basePath, throwable);
} finally {
jssc.stop();
}

if (!success) {
// Return a non-zero exit code to properly notify any resource manager
// that cleaning was not successful
System.exit(1);
}

LOG.info("Cleaner ran successfully");
}
}
13 changes: 8 additions & 5 deletions hudi-utilities/src/main/java/org/apache/hudi/utilities/HoodieCompactor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.apache.hudi.common.util.Option;
import org.apache.hudi.common.util.StringUtils;
import org.apache.hudi.config.HoodieCleanConfig;
import org.apache.hudi.exception.HoodieException;
import org.apache.hudi.table.action.HoodieWriteMetadata;
import org.apache.hudi.table.action.compact.strategy.LogFileSizeBasedCompactionStrategy;

Expand Down Expand Up @@ -168,18 +169,20 @@ public static void main(String[] args) {
JCommander cmd = new JCommander(cfg, null, args);
if (cfg.help || args.length == 0) {
cmd.usage();
System.exit(1);
throw new HoodieException("Fail to run compaction for " + cfg.tableName + ", return code: " + 1);
}
final JavaSparkContext jsc = UtilHelpers.buildSparkContext("compactor-" + cfg.tableName, cfg.sparkMaster, cfg.sparkMemory);
int ret = 0;
try {
HoodieCompactor compactor = new HoodieCompactor(jsc, cfg);
ret = compactor.compact(cfg.retry);
ret = new HoodieCompactor(jsc, cfg).compact(cfg.retry);
} catch (Throwable throwable) {
LOG.error("Fail to run compaction for " + cfg.tableName, throwable);
throw new HoodieException("Fail to run compaction for " + cfg.tableName + ", return code: " + ret, throwable);
} finally {
jsc.stop();
System.exit(ret);
}

if (ret != 0) {
throw new HoodieException("Fail to run compaction for " + cfg.tableName + ", return code: " + ret);
}
}

Expand Down