Skip to content
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

[HWORKS-1565] Make sure the spark program exits after completion #275

Merged
merged 1 commit into from
Aug 27, 2024
Merged

[HWORKS-1565] Make sure the spark program exits after completion #275

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
11 changes: 10 additions & 1 deletion utils/java/src/main/java/com/logicalclocks/utils/MainClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,22 @@ public static void main(String[] args) throws Exception {
}
LOGGER.info("Hsfs utils write options: {}", writeOptions);

boolean success = false;
try {
if (op.equals("offline_fg_materialization") || op.equals("offline_fg_backfill")) {
SparkEngine.getInstance().streamToHudiTable(streamFeatureGroup, writeOptions);
}
success = true;
} finally {
LOGGER.info("Closing spark session...");
SparkEngine.getInstance().closeSparkSession();
try {
SparkEngine.getInstance().closeSparkSession();
} catch (Exception e) {
LOGGER.error("Error closing spark session", e);
}
if (!success) {
System.exit(1);
}
}
System.exit(0);
}
Expand Down
14 changes: 13 additions & 1 deletion utils/python/hsfs_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from __future__ import annotations

import sys
import os
import argparse
import json
Expand Down Expand Up @@ -285,6 +286,7 @@ def parse_isoformat_date(da: str) -> datetime:
args = parser.parse_args()
job_conf = read_job_conf(args.path)

success = False
try:
if args.op == "insert_fg":
insert_fg(spark, job_conf)
Expand All @@ -300,6 +302,16 @@ def parse_isoformat_date(da: str) -> datetime:
import_fg(job_conf)
elif args.op == "run_feature_monitoring":
run_feature_monitoring(job_conf)

success = True
finally:
if spark is not None:
spark.stop()
try:
spark.stop()
except Exception as e:
print(f"Error stopping spark session: {e}")
if not success:
sys.exit(1)

sys.exit(0)

Loading