Close journal context in table master

pr-link: #10867 change-id: cid-6324fecf9c5e32e84ff56fce4bf28405ebfeacf6
Alluxio · Feb 7, 2020 · 1120a53 · 1120a53
1 parent e14cec1
commit 1120a53
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/table/server/master/src/main/java/alluxio/master/table/DefaultTableMaster.java b/table/server/master/src/main/java/alluxio/master/table/DefaultTableMaster.java
@@ -27,6 +27,7 @@
 import alluxio.master.CoreMasterContext;
 import alluxio.master.file.FileSystemMaster;
 import alluxio.master.journal.DelegatingJournaled;
+import alluxio.master.journal.JournalContext;
 import alluxio.master.journal.Journaled;
 import alluxio.master.journal.JournaledGroup;
 import alluxio.master.journal.checkpoint.CheckpointName;
@@ -78,15 +79,18 @@ public DefaultTableMaster(CoreMasterContext context, JobMasterClient jobMasterCl
   @Override
   public boolean attachDatabase(String udbType, String udbConnectionUri, String udbDbName,
       String dbName, Map<String, String> configuration) throws IOException {
-    return mCatalog
-        .attachDatabase(createJournalContext(), udbType, udbConnectionUri, udbDbName, dbName,
-            configuration);
+    try (JournalContext journalContext = createJournalContext()) {
+      return mCatalog.attachDatabase(journalContext, udbType, udbConnectionUri, udbDbName, dbName,
+          configuration);
+    }
   }
 
   @Override
   public boolean detachDatabase(String dbName)
       throws IOException {
-    return mCatalog.detachDatabase(createJournalContext(), dbName);
+    try (JournalContext journalContext = createJournalContext()) {
+      return mCatalog.detachDatabase(journalContext, dbName);
+    }
   }
 
   @Override
@@ -148,7 +152,9 @@ public List<TransformJobInfo> getAllTransformJobInfo() throws IOException {
 
   @Override
   public boolean syncDatabase(String dbName) throws IOException {
-    return mCatalog.syncDatabase(createJournalContext(), dbName);
+    try (JournalContext journalContext = createJournalContext()) {
+      return mCatalog.syncDatabase(journalContext, dbName);
+    }
   }
 
   @Override

diff --git a/table/server/master/src/main/java/alluxio/master/table/transform/TransformManager.java b/table/server/master/src/main/java/alluxio/master/table/transform/TransformManager.java
@@ -285,8 +285,8 @@ private void handleJobError(TransformJobInfo job, Status status, String error) {
      * @param job the transformation job
      */
     private void handleJobSuccess(TransformJobInfo job) {
-      try {
-        mCatalog.completeTransformTable(mCreateJournalContext.apply(), job.getDb(), job.getTable(),
+      try (JournalContext journalContext = mCreateJournalContext.apply()) {
+        mCatalog.completeTransformTable(journalContext, job.getDb(), job.getTable(),
             job.getDefinition(), job.getTransformedLayouts());
         job.setJobStatus(Status.COMPLETED);
       } catch (IOException e) {