Skip to content

Commit 09a9fba

Browse files
authored
Merge branch 'trunk' into YARN-11332
2 parents 28a1048 + 9adf0ca commit 09a9fba

File tree

22 files changed

+398
-189
lines changed

22 files changed

+398
-189
lines changed

hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ public FSDataOutputStream next(final FileSystem fs, final Path p)
568568

569569
/**
570570
* Same as
571-
* {@link #create(Path, FsPermission, EnumSet<CreateFlag>, int, short, long,
571+
* {@link #create(Path, FsPermission, EnumSet, int, short, long,
572572
* Progressable, ChecksumOpt)} with a few additions. First, addition of
573573
* favoredNodes that is a hint to where the namenode should place the file
574574
* blocks. The favored nodes hint is not persisted in HDFS. Hence it may be
@@ -637,12 +637,12 @@ protected HdfsDataOutputStream primitiveCreate(Path f,
637637

638638
/**
639639
* Similar to {@link #create(Path, FsPermission, EnumSet, int, short, long,
640-
* Progressable, ChecksumOpt, InetSocketAddress[], String)}, it provides a
640+
* Progressable, ChecksumOpt, InetSocketAddress[], String, String)}, it provides a
641641
* HDFS-specific version of {@link #createNonRecursive(Path, FsPermission,
642642
* EnumSet, int, short, long, Progressable)} with a few additions.
643643
*
644644
* @see #create(Path, FsPermission, EnumSet, int, short, long, Progressable,
645-
* ChecksumOpt, InetSocketAddress[], String) for the descriptions of
645+
* ChecksumOpt, InetSocketAddress[], String, String) for the descriptions of
646646
* additional parameters, i.e., favoredNodes, ecPolicyName and
647647
* storagePolicyName.
648648
*/

hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/CreateEncryptionZoneFlag.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919

2020
import org.apache.hadoop.classification.InterfaceAudience;
2121
import org.apache.hadoop.classification.InterfaceStability;
22+
import org.apache.hadoop.fs.Path;
23+
24+
import java.util.EnumSet;
2225

2326
/**
2427
* CreateEncryptionZoneFlag is used in

hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RemoteMethod.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public Class<?> getProtocol() {
131131
/**
132132
* Get the represented java method.
133133
*
134-
* @return Method
134+
* @return {@link Method}
135135
* @throws IOException If the method cannot be found.
136136
*/
137137
public Method getMethod() throws IOException {

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/AsyncLoggerSet.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ boolean isEpochEstablished() {
8787

8888
/**
8989
* @return the epoch number for this writer. This may only be called after
90-
* a successful call to {@link #createNewUniqueEpoch(NamespaceInfo)}.
90+
* a successful call to {@link QuorumJournalManager#createNewUniqueEpoch()}.
9191
*/
9292
long getEpoch() {
9393
Preconditions.checkState(myEpoch != INVALID_EPOCH,

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1403,7 +1403,7 @@ public boolean accept(File dir, String name) {
14031403
}
14041404

14051405
/**
1406-
* Get the BlockPoolSliceStorage from {@link bpStorageMap}.
1406+
* Get the BlockPoolSliceStorage from {@link #bpStorageMap}.
14071407
* If the object is not found, create a new object and put it to the map.
14081408
*/
14091409
synchronized BlockPoolSliceStorage getBlockPoolSliceStorage(

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/checker/ThrottledAsyncChecker.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@
4444

4545
/**
4646
* An implementation of {@link AsyncChecker} that skips checking recently
47-
* checked objects. It will enforce at least {@link minMsBetweenChecks}
47+
* checked objects. It will enforce at least {@link #minMsBetweenChecks}
4848
* milliseconds between two successive checks of any one object.
4949
*
5050
* It is assumed that the total number of Checkable objects in the system
5151
* is small, (not more than a few dozen) since the checker uses O(Checkables)
5252
* storage and also potentially O(Checkables) threads.
5353
*
54-
* {@link minMsBetweenChecks} should be configured reasonably
54+
* {@link #minMsBetweenChecks} should be configured reasonably
5555
* by the caller to avoid spinning up too many threads frequently.
5656
*/
5757
@InterfaceAudience.Private

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/checker/TimeoutFuture.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import java.util.concurrent.ScheduledExecutorService;
3232
import java.util.concurrent.TimeUnit;
3333
import java.util.concurrent.TimeoutException;
34+
import java.util.concurrent.ExecutionException;
3435

3536
/**
3637
* Implementation of {@code Futures#withTimeout}.

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/RamDiskReplicaTracker.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ public long getLockedBytesReserved() {
184184
* {@link org.apache.hadoop.hdfs.DFSConfigKeys#DFS_DATANODE_RAM_DISK_REPLICA_TRACKER_KEY}.
185185
*
186186
* @param conf the configuration to be used
187-
* @param dataset the FsDataset object.
187+
* @param fsDataset the FsDataset object.
188188
* @return an instance of RamDiskReplicaTracker
189189
*/
190190
static RamDiskReplicaTracker getInstance(final Configuration conf,

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirRenameOp.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,8 @@ private static INodesInPath dstForRenameTo(
152152
* @param srcIIP source path
153153
* @param dstIIP destination path
154154
* @return true INodesInPath if rename succeeds; null otherwise
155-
* @deprecated See {@link #renameToInt(FSDirectory, String, String,
156-
* boolean, Options.Rename...)}
155+
* @deprecated See {@link #renameToInt(FSDirectory, FSPermissionChecker,
156+
* String, String, boolean, Options.Rename...)}
157157
*/
158158
@Deprecated
159159
static INodesInPath unprotectedRenameTo(FSDirectory fsd,
@@ -258,8 +258,8 @@ static RenameResult renameToInt(
258258
}
259259

260260
/**
261-
* @see {@link #unprotectedRenameTo(FSDirectory, String, String, INodesInPath,
262-
* INodesInPath, long, BlocksMapUpdateInfo, Options.Rename...)}
261+
* @see {@link #unprotectedRenameTo(FSDirectory, INodesInPath, INodesInPath,
262+
* long, BlocksMapUpdateInfo, Options.Rename...)}
263263
*/
264264
static RenameResult renameTo(FSDirectory fsd, FSPermissionChecker pc,
265265
String src, String dst, BlocksMapUpdateInfo collectedBlocks,
@@ -482,8 +482,8 @@ static RenameResult unprotectedRenameTo(FSDirectory fsd,
482482
}
483483

484484
/**
485-
* @deprecated Use {@link #renameToInt(FSDirectory, String, String,
486-
* boolean, Options.Rename...)}
485+
* @deprecated Use {@link #renameToInt(FSDirectory, FSPermissionChecker,
486+
* String, String, boolean, Options.Rename...)}
487487
*/
488488
@Deprecated
489489
private static RenameResult renameTo(FSDirectory fsd, FSPermissionChecker pc,

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/EditLogTailer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public class EditLogTailer {
123123

124124
/**
125125
* The timeout in milliseconds of calling rollEdits RPC to Active NN.
126-
* @see HDFS-4176.
126+
* See HDFS-4176.
127127
*/
128128
private final long rollEditsTimeoutMs;
129129

0 commit comments

Comments
 (0)