HDFS-15931 : Fix non-static inner classes for better memory management (#2830). Contributed by Viraj Jasani

Signed-off-by: Mingliang Liu <liuml07@apache.org>
This commit is contained in:
Viraj Jasani 2021-04-02 05:04:31 +05:30 committed by GitHub
parent 158758c5bf
commit 4f28738010
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 16 additions and 16 deletions

View File

@ -152,7 +152,7 @@ public class MiniRouterDFSCluster {
/**
* Router context.
*/
public class RouterContext {
public static class RouterContext {
private Router router;
private FileContext fileContext;
private String nameserviceId;

View File

@ -129,7 +129,7 @@ public class InMemoryLevelDBAliasMapClient extends BlockAliasMap<FileRegion>
}
}
class LevelDbWriter extends BlockAliasMap.Writer<FileRegion> {
static class LevelDbWriter extends BlockAliasMap.Writer<FileRegion> {
private InMemoryAliasMapProtocol aliasMap;

View File

@ -35,7 +35,7 @@ import java.util.*;
@InterfaceStability.Unstable
public class RamDiskReplicaLruTracker extends RamDiskReplicaTracker {
private class RamDiskReplicaLru extends RamDiskReplica {
private static class RamDiskReplicaLru extends RamDiskReplica {
long lastUsedTime;
private RamDiskReplicaLru(String bpid, long blockId,
@ -88,7 +88,7 @@ public class RamDiskReplicaLruTracker extends RamDiskReplicaTracker {
}
RamDiskReplicaLru ramDiskReplicaLru =
new RamDiskReplicaLru(bpid, blockId, transientVolume,
lockedBytesReserved);
lockedBytesReserved);
map.put(blockId, ramDiskReplicaLru);
replicasNotPersisted.add(ramDiskReplicaLru);
}

View File

@ -835,7 +835,7 @@ public class ReencryptionHandler implements Runnable {
}
}
private class ZoneTraverseInfo extends TraverseInfo {
private static class ZoneTraverseInfo extends TraverseInfo {
private String ezKeyVerName;
ZoneTraverseInfo(String ezKeyVerName) {

View File

@ -65,7 +65,7 @@ public class DebugAdmin extends Configured implements Tool {
/**
* All the debug commands we can run.
*/
private DebugCommand DEBUG_COMMANDS[] = {
private final DebugCommand[] DEBUG_COMMANDS = {
new VerifyMetaCommand(),
new ComputeMetaCommand(),
new RecoverLeaseCommand(),
@ -75,7 +75,7 @@ public class DebugAdmin extends Configured implements Tool {
/**
* The base class for debug commands.
*/
private abstract class DebugCommand {
private abstract static class DebugCommand {
final String name;
final String usageText;
final String helpText;
@ -94,15 +94,15 @@ public class DebugAdmin extends Configured implements Tool {
/**
* The command for verifying a block metadata file and possibly block file.
*/
private class VerifyMetaCommand extends DebugCommand {
private static class VerifyMetaCommand extends DebugCommand {
VerifyMetaCommand() {
super("verifyMeta",
"verifyMeta -meta <metadata-file> [-block <block-file>]",
" Verify HDFS metadata and block files. If a block file is specified, we" +
System.lineSeparator() +
" will verify that the checksums in the metadata file match the block" +
System.lineSeparator() +
" file.");
"verifyMeta -meta <metadata-file> [-block <block-file>]",
" Verify HDFS metadata and block files. If a block file is specified, we" +
System.lineSeparator() +
" will verify that the checksums in the metadata file match the block" +
System.lineSeparator() +
" file.");
}
int run(List<String> args) throws IOException {
@ -210,7 +210,7 @@ public class DebugAdmin extends Configured implements Tool {
/**
* The command for verifying a block metadata file and possibly block file.
*/
private class ComputeMetaCommand extends DebugCommand {
private static class ComputeMetaCommand extends DebugCommand {
ComputeMetaCommand() {
super("computeMeta",
"computeMeta -block <block-file> -out <output-metadata-file>",

View File

@ -599,7 +599,7 @@ public class MiniDFSCluster implements AutoCloseable {
builder.useConfiguredTopologyMappingClass);
}
public class DataNodeProperties {
public static class DataNodeProperties {
final DataNode datanode;
final Configuration conf;
String[] dnArgs;