Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-11783. Ozone: Fix spotbugs warnings. Contributed by Weiwei Yang.

This commit is contained in:
Anu Engineer 2017-05-10 11:40:06 -07:00
parent cee6438005
commit 38e2697066
6 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/cblock/meta/VolumeDescriptor.java
View File

@ -262,16 +262,7 @@ public class VolumeDescriptor {
return false;
}
}
for (String containerKey : containerMap.keySet()) {
if (!other.containerMap.containsKey(containerKey)) {
return false;
}
if (!containerMap.get(containerKey).equals(
other.containerMap.get(containerKey))) {
return false;
}
}
return true;
return containerMap.equals(other.containerMap);
}
return false;
}

6
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerManagerImpl.java
View File

@ -310,6 +310,12 @@ public class ContainerManagerImpl implements ContainerManager {
Path metadataPath = null;
Path location = (!overwrite) ? locationManager.getContainerPath():
Paths.get(containerData.getContainerPath()).getParent();
if (location == null) {
throw new StorageContainerException(
"Failed to get container file path.",
CONTAINER_INTERNAL_ERROR);
}
File containerFile = ContainerUtils.getContainerFile(containerData,
location);
File metadataFile = ContainerUtils.getMetadataFile(containerData,

1
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/block/BlockManagerImpl.java
View File

@ -104,7 +104,6 @@ public class BlockManagerImpl implements BlockManager {
}
Options options = new Options();
options.cacheSize(this.cacheSize * OzoneConsts.MB);
options.createIfMissing();
// Write the block key to container name mapping.
File blockContainerDbPath = new File(scmMetaDataDir, BLOCK_DB);

8
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/cli/SQLCLI.java
View File

@ -156,8 +156,12 @@ public class SQLCLI extends Configured implements Tool {
LOG.error("Error processing output path {}", outPath);
return -1;
}
if (!Files.exists(outPath.getParent())) {
Files.createDirectories(outPath.getParent());
Path outParentPath = outPath.getParent();
if (outParentPath != null) {
if (!Files.exists(outParentPath)) {
Files.createDirectories(outParentPath);
}
}
LOG.info("Parent path [{}] db name [{}]", parentPath, dbName);
if (dbName.toString().equals(CONTAINER_DB)) {

1
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/container/ContainerMapping.java
View File

@ -87,7 +87,6 @@ public class ContainerMapping implements Mapping {
}
Options options = new Options();
options.cacheSize(this.cacheSize * OzoneConsts.MB);
options.createIfMissing();
// Write the container name to pipeline mapping.
File containerDBPath = new File(scmMetaDataDir, CONTAINER_DB);

1
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/node/SCMNodePoolManager.java
View File

@ -89,7 +89,6 @@ public final class SCMNodePoolManager implements NodePoolManager {
}
Options options = new Options();
options.cacheSize(cacheSize * OzoneConsts.MB);
options.createIfMissing();
File nodePoolDBPath = new File(scmMetaDataDir, NODEPOOL_DB);
nodePoolStore = new LevelDBStore(nodePoolDBPath, options);