You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by li...@apache.org on 2021/04/01 23:55:22 UTC
[hadoop] branch branch-3.2 updated: HDFS-15931 : Fix non-static
inner classes for better memory management (#2830). Contributed by Viraj
Jasani
This is an automated email from the ASF dual-hosted git repository.
liuml07 pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.2 by this push:
new 5458ebf HDFS-15931 : Fix non-static inner classes for better memory management (#2830). Contributed by Viraj Jasani
5458ebf is described below
commit 5458ebf6073233ca7065206e3e477073b1d16491
Author: Viraj Jasani <vj...@apache.org>
AuthorDate: Fri Apr 2 05:04:31 2021 +0530
HDFS-15931 : Fix non-static inner classes for better memory management (#2830). Contributed by Viraj Jasani
Signed-off-by: Mingliang Liu <li...@apache.org>
---
.../hdfs/server/federation/MiniRouterDFSCluster.java | 2 +-
.../impl/InMemoryLevelDBAliasMapClient.java | 2 +-
.../fsdataset/impl/RamDiskReplicaLruTracker.java | 4 ++--
.../hdfs/server/namenode/ReencryptionHandler.java | 2 +-
.../org/apache/hadoop/hdfs/tools/DebugAdmin.java | 20 ++++++++++----------
.../java/org/apache/hadoop/hdfs/MiniDFSCluster.java | 2 +-
6 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/MiniRouterDFSCluster.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/MiniRouterDFSCluster.java
index 7b59e3c..9229390 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/MiniRouterDFSCluster.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/MiniRouterDFSCluster.java
@@ -140,7 +140,7 @@ public class MiniRouterDFSCluster {
/**
* Router context.
*/
- public class RouterContext {
+ public static class RouterContext {
private Router router;
private FileContext fileContext;
private String nameserviceId;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/blockaliasmap/impl/InMemoryLevelDBAliasMapClient.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/blockaliasmap/impl/InMemoryLevelDBAliasMapClient.java
index fb5ee93..bfd540b 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/blockaliasmap/impl/InMemoryLevelDBAliasMapClient.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/blockaliasmap/impl/InMemoryLevelDBAliasMapClient.java
@@ -130,7 +130,7 @@ public class InMemoryLevelDBAliasMapClient extends BlockAliasMap<FileRegion>
}
}
- class LevelDbWriter extends BlockAliasMap.Writer<FileRegion> {
+ static class LevelDbWriter extends BlockAliasMap.Writer<FileRegion> {
private InMemoryAliasMapProtocol aliasMap;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/RamDiskReplicaLruTracker.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/RamDiskReplicaLruTracker.java
index b940736..0f0f598 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/RamDiskReplicaLruTracker.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/RamDiskReplicaLruTracker.java
@@ -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);
}
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ReencryptionHandler.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ReencryptionHandler.java
index fa4de38..e0bc0ff 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ReencryptionHandler.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ReencryptionHandler.java
@@ -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) {
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DebugAdmin.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DebugAdmin.java
index 2c327f4..642bfab 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DebugAdmin.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DebugAdmin.java
@@ -64,7 +64,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(),
@@ -74,7 +74,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;
@@ -93,15 +93,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 {
@@ -209,7 +209,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>",
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
index 9834e5c..6f8e0cb 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
@@ -562,7 +562,7 @@ public class MiniDFSCluster implements AutoCloseable {
builder.useConfiguredTopologyMappingClass);
}
- public class DataNodeProperties {
+ public static class DataNodeProperties {
final DataNode datanode;
final Configuration conf;
String[] dnArgs;
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org