hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bha...@apache.org
Subject [hadoop] branch trunk updated: HDDS-1281. Fix the findbug issue caused by HDDS-1163. Contributed by Aravindan Vijayan.
Date Sat, 16 Mar 2019 04:10:31 GMT
This is an automated email from the ASF dual-hosted git repository.

bharat pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 926d548  HDDS-1281. Fix the findbug issue caused by HDDS-1163. Contributed by Aravindan
Vijayan.
926d548 is described below

commit 926d548caabdfcfbf7a75dcf0657e8dde6d9710a
Author: Bharat Viswanadham <bharat@apache.org>
AuthorDate: Fri Mar 15 21:06:44 2019 -0700

    HDDS-1281. Fix the findbug issue caused by HDDS-1163. Contributed by Aravindan Vijayan.
---
 .../org/apache/hadoop/ozone/container/keyvalue/KeyValueContainer.java | 2 +-
 .../hadoop/ozone/container/keyvalue/KeyValueContainerCheck.java       | 4 +---
 .../hadoop/ozone/container/keyvalue/TestKeyValueContainerCheck.java   | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainer.java
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainer.java
index 20dfd9c..47af110 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainer.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainer.java
@@ -677,7 +677,7 @@ public class KeyValueContainer implements Container<KeyValueContainerData>
{
 
     KeyValueContainerCheck checker =
         new KeyValueContainerCheck(containerData.getMetadataPath(), config,
-            containerId, containerData);
+            containerId);
 
     switch (level) {
     case FAST_CHECK:
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainerCheck.java
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainerCheck.java
index 5366c27..b1ab1e1 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainerCheck.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainerCheck.java
@@ -52,20 +52,18 @@ public class KeyValueContainerCheck {
   private static final Logger LOG = LoggerFactory.getLogger(Container.class);
 
   private long containerID;
-  private KeyValueContainerData inMemContainerData; //from caller, maybe null
   private KeyValueContainerData onDiskContainerData; //loaded from fs/disk
   private Configuration checkConfig;
 
   private String metadataPath;
 
   public KeyValueContainerCheck(String metadataPath, Configuration conf,
-      long containerID, KeyValueContainerData containerData) {
+      long containerID) {
     Preconditions.checkArgument(metadataPath != null);
 
     this.checkConfig = conf;
     this.containerID = containerID;
     this.onDiskContainerData = null;
-    this.inMemContainerData = containerData;
     this.metadataPath = metadataPath;
   }
 
diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainerCheck.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainerCheck.java
index 79abc2f..3395214 100644
--- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainerCheck.java
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainerCheck.java
@@ -111,7 +111,7 @@ import static org.junit.Assert.assertTrue;
 
     KeyValueContainerCheck kvCheck =
         new KeyValueContainerCheck(containerData.getMetadataPath(), conf,
-            containerID, containerData);
+            containerID);
 
     // first run checks on a Open Container
     error = kvCheck.fastCheck();


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message