Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[SMALLFIX] Use RpcContext to organize contexts during RPCs (#7009)
* Use RpcContext to organize contexts during RPCs * Add license header * Fix test and avoid whitebox usage * Fix checkstyle * Update comments and javadocs * Add comments * Use RpcContext consistenly across filesystem master rpcs * Simplify getJournalContext.append * Fix compilation
- Loading branch information
Showing
7 changed files
with
486 additions
and
282 deletions.
There are no files selected for viewing
425 changes: 209 additions & 216 deletions
425
core/server/master/src/main/java/alluxio/master/file/DefaultFileSystemMaster.java
Large diffs are not rendered by default.
Oops, something went wrong.
107 changes: 107 additions & 0 deletions
107
core/server/master/src/main/java/alluxio/master/file/RpcContext.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| /* | ||
| * The Alluxio Open Foundation licenses this work under the Apache License, version 2.0 | ||
| * (the "License"). You may not use this work except in compliance with the License, which is | ||
| * available at www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * This software is distributed on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, | ||
| * either express or implied, as more fully set forth in the License. | ||
| * | ||
| * See the NOTICE file distributed with this work for information regarding copyright ownership. | ||
| */ | ||
|
|
||
| package alluxio.master.file; | ||
|
|
||
| import alluxio.exception.status.UnavailableException; | ||
| import alluxio.master.journal.JournalContext; | ||
| import alluxio.master.journal.NoopJournalContext; | ||
| import alluxio.proto.journal.Journal.JournalEntry; | ||
|
|
||
| import com.google.common.base.Throwables; | ||
|
|
||
| import java.io.Closeable; | ||
|
|
||
| import javax.annotation.Nullable; | ||
| import javax.annotation.concurrent.NotThreadSafe; | ||
|
|
||
| /** | ||
| * Context passed through the span of a file system master RPC to manage actions that need to be | ||
| * taken when the body of the RPC is finished. | ||
| * | ||
| * Note that we cannot use Guava's {@link com.google.common.io.Closer} because it doesn't make | ||
| * guarantees about the order in which resources are closed. | ||
| */ | ||
| @NotThreadSafe | ||
| public final class RpcContext implements Closeable { | ||
| public static final RpcContext NOOP = | ||
| new RpcContext(NoopBlockDeletionContext.INSTANCE, NoopJournalContext.INSTANCE); | ||
|
|
||
| @Nullable | ||
| private final BlockDeletionContext mBlockDeletionContext; | ||
| private final JournalContext mJournalContext; | ||
|
|
||
| // Used during close to keep track of thrown exceptions. | ||
| private Throwable mThrown = null; | ||
|
|
||
| /** | ||
| * Creates an {@link RpcContext}. This class aggregates different contexts used over the course of | ||
| * an RPC, and makes sure they are closed in the right order when the RPC is finished. | ||
| * | ||
| * @param blockDeleter block deletion context | ||
| * @param journalContext journal context | ||
| */ | ||
| public RpcContext(BlockDeletionContext blockDeleter, JournalContext journalContext) { | ||
| mBlockDeletionContext = blockDeleter; | ||
| mJournalContext = journalContext; | ||
| } | ||
|
|
||
| /** | ||
| * @return the journal context | ||
| */ | ||
| public JournalContext getJournalContext() { | ||
| return mJournalContext; | ||
| } | ||
|
|
||
| /** | ||
| * Syntax sugar for getJournalContext().append(entry). | ||
| * | ||
| * @param entry the {@link JournalEntry} to append to the journal | ||
| */ | ||
| public void journal(JournalEntry entry) { | ||
| mJournalContext.append(entry); | ||
| } | ||
|
|
||
| /** | ||
| * @return the block deletion context | ||
| */ | ||
| public BlockDeletionContext getBlockDeletionContext() { | ||
| return mBlockDeletionContext; | ||
| } | ||
|
|
||
| @Override | ||
| public void close() throws UnavailableException { | ||
| // JournalContext is closed before block deletion context so that file system master changes | ||
| // get written before block master changes. If a failure occurs between deleting an inode and | ||
| // remove its blocks, it's better to have an orphaned block than an inode with a missing block. | ||
| closeQuietly(mJournalContext); | ||
| closeQuietly(mBlockDeletionContext); | ||
|
|
||
| if (mThrown != null) { | ||
| Throwables.propagateIfPossible(mThrown, UnavailableException.class); | ||
| throw new RuntimeException(mThrown); | ||
| } | ||
| } | ||
|
|
||
| private void closeQuietly(AutoCloseable c) { | ||
| if (c != null) { | ||
| try { | ||
| c.close(); | ||
| } catch (Throwable t) { | ||
| if (mThrown != null) { | ||
| mThrown.addSuppressed(t); | ||
| } else { | ||
| mThrown = t; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.