From e3eb14ad2d5bd25fcfd6bb2eb6e991558c0684ed Mon Sep 17 00:00:00 2001 From: Teng Date: Wed, 29 Jun 2022 06:13:29 +0800 Subject: [PATCH] [HUDI-4334] close SparkRDDWriteClient after usage in Create/Delete/RollbackSavepointsProcedure (#5994) --- .../sql/hudi/command/procedures/CreateSavepointsProcedure.scala | 2 ++ .../sql/hudi/command/procedures/DeleteSavepointsProcedure.scala | 2 ++ .../hudi/command/procedures/RollbackSavepointsProcedure.scala | 2 ++ 3 files changed, 6 insertions(+) diff --git a/hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/procedures/CreateSavepointsProcedure.scala b/hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/procedures/CreateSavepointsProcedure.scala index ed4905ed0..43098d1e9 100644 --- a/hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/procedures/CreateSavepointsProcedure.scala +++ b/hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/procedures/CreateSavepointsProcedure.scala @@ -68,6 +68,8 @@ class CreateSavepointsProcedure extends BaseProcedure with ProcedureBuilder with } catch { case _: HoodieSavepointException => logWarning(s"Failed: Could not create savepoint $commitTime.") + } finally { + client.close() } Seq(Row(result)) diff --git a/hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/procedures/DeleteSavepointsProcedure.scala b/hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/procedures/DeleteSavepointsProcedure.scala index 11416ac22..fcef175eb 100644 --- a/hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/procedures/DeleteSavepointsProcedure.scala +++ b/hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/procedures/DeleteSavepointsProcedure.scala @@ -67,6 +67,8 @@ class DeleteSavepointsProcedure extends BaseProcedure with ProcedureBuilder with } catch { case _: HoodieSavepointException => logWarning(s"Failed: Could not delete savepoint $instantTime.") + } finally { + client.close() } Seq(Row(result)) diff --git a/hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/procedures/RollbackSavepointsProcedure.scala b/hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/procedures/RollbackSavepointsProcedure.scala index a11e61417..fa8f33d30 100644 --- a/hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/procedures/RollbackSavepointsProcedure.scala +++ b/hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/procedures/RollbackSavepointsProcedure.scala @@ -67,6 +67,8 @@ class RollbackSavepointsProcedure extends BaseProcedure with ProcedureBuilder wi } catch { case _: HoodieSavepointException => logWarning(s"The commit $instantTime failed to roll back.") + } finally { + client.close() } Seq(Row(result))