HDDS-136:Rename dbPath,containerFilePath. Contributed by Bharat Viswanadham

hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/KeyValueContainerData.java

@@ -30,11 +30,11 @@ import java.io.IOException;
  */
 public class KeyValueContainerData extends ContainerData {
 
-  // Path to Level DB/RocksDB Store.
+  // Path to Container metadata Level DB/RocksDB Store and .container file.
-  private String dbPath;
+  private String metadataPath;
 
-  // Path to Physical file system where container and checksum are stored.
+  // Path to Physical file system where chunks are stored.
-  private String containerFilePath;
+  private String chunksPath;
 
   //Type of DB used to store key to chunks mapping
   private String containerDBType;
@@ -64,37 +64,37 @@ public class KeyValueContainerData extends ContainerData {
     this.numPendingDeletionBlocks = 0;
   }
   /**
-   * Returns path.
+   * Returns container metadata path.
    *
    * @return - path
    */
-  public String getDbPath() {
+  public String getMetadataPath() {
-    return dbPath;
+    return metadataPath;
   }
 
   /**
-   * Sets path.
+   * Sets container metadata path.
    *
    * @param path - String.
    */
-  public void setDbPath(String path) {
+  public void setMetadataPath(String path) {
-    this.dbPath = path;
+    this.metadataPath = path;
   }
 
   /**
-   * Get container file path.
+   * Get chunks path.
    * @return - Physical path where container file and checksum is stored.
    */
-  public String getContainerFilePath() {
+  public String getChunksPath() {
-    return containerFilePath;
+    return chunksPath;
   }
 
   /**
-   * Set container Path.
+   * Set chunks Path.
-   * @param containerPath - File path.
+   * @param chunkPath - File path.
    */
-  public void setContainerFilePath(String containerPath) {
+  public void setChunksPath(String chunkPath) {
-    this.containerFilePath = containerPath;
+    this.chunksPath = chunkPath;
   }
 
   /**

hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/KeyValueYaml.java

@@ -144,8 +144,8 @@ public final class KeyValueYaml {
           // When a new field needs to be added, it needs to be added here.
           if (name.equals("containerType") || name.equals("containerId") ||
               name.equals("layOutVersion") || name.equals("state") ||
-              name.equals("metadata") || name.equals("dbPath") ||
+              name.equals("metadata") || name.equals("metadataPath") ||
-              name.equals("containerFilePath") || name.equals(
+              name.equals("chunksPath") || name.equals(
                   "containerDBType")) {
             filtered.add(prop);
           }
@@ -186,8 +186,9 @@ public final class KeyValueYaml {
         KeyValueContainerData kvData = new KeyValueContainerData(containerType,
             (long) nodes.get("containerId"), lv);
         kvData.setContainerDBType((String)nodes.get("containerDBType"));
-        kvData.setDbPath((String) nodes.get("dbPath"));
+        kvData.setMetadataPath((String) nodes.get(
-        kvData.setContainerFilePath((String) nodes.get("containerFilePath"));
+            "metadataPath"));
+        kvData.setChunksPath((String) nodes.get("chunksPath"));
         Map<String, String> meta = (Map) nodes.get("metadata");
         meta.forEach((key, val) -> {
           try {

hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestKeyValueContainerData.java

@@ -92,8 +92,8 @@ public class TestKeyValueContainerData {
 
     kvData.setState(state);
     kvData.setContainerDBType(containerDBType);
-    kvData.setContainerFilePath(path);
+    kvData.setChunksPath(path);
-    kvData.setDbPath(path);
+    kvData.setMetadataPath(path);
     kvData.incrReadBytes(10);
     kvData.incrWriteBytes(10);
     kvData.incrReadCount();
@@ -101,8 +101,8 @@ public class TestKeyValueContainerData {
 
     assertEquals(state, kvData.getState());
     assertEquals(containerDBType, kvData.getContainerDBType());
-    assertEquals(path, kvData.getContainerFilePath());
+    assertEquals(path, kvData.getChunksPath());
-    assertEquals(path, kvData.getDbPath());
+    assertEquals(path, kvData.getMetadataPath());
 
     assertEquals(10, kvData.getReadBytes());
     assertEquals(10, kvData.getWriteBytes());

hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestKeyValueYaml.java

@@ -47,8 +47,8 @@ public class TestKeyValueYaml {
     KeyValueContainerData keyValueContainerData = new KeyValueContainerData(
         ContainerProtos.ContainerType.KeyValueContainer, Long.MAX_VALUE);
     keyValueContainerData.setContainerDBType("RocksDB");
-    keyValueContainerData.setDbPath(path);
+    keyValueContainerData.setMetadataPath(path);
-    keyValueContainerData.setContainerFilePath(path);
+    keyValueContainerData.setChunksPath(path);
 
     File containerFile = new File(filePath, containerPath);
 
@@ -65,8 +65,8 @@ public class TestKeyValueYaml {
     assertEquals(ContainerProtos.ContainerType.KeyValueContainer, kvData
         .getContainerType());
     assertEquals("RocksDB", kvData.getContainerDBType());
-    assertEquals(path, kvData.getContainerFilePath());
+    assertEquals(path, kvData.getMetadataPath());
-    assertEquals(path, kvData.getDbPath());
+    assertEquals(path, kvData.getChunksPath());
     assertEquals(ContainerProtos.ContainerLifeCycleState.OPEN, kvData
         .getState());
     assertEquals(1, kvData.getLayOutVersion());
@@ -90,8 +90,8 @@ public class TestKeyValueYaml {
     assertEquals(ContainerProtos.ContainerType.KeyValueContainer, kvData
         .getContainerType());
     assertEquals("RocksDB", kvData.getContainerDBType());
-    assertEquals(path, kvData.getContainerFilePath());
+    assertEquals(path, kvData.getMetadataPath());
-    assertEquals(path, kvData.getDbPath());
+    assertEquals(path, kvData.getChunksPath());
     assertEquals(ContainerProtos.ContainerLifeCycleState.CLOSED, kvData
         .getState());
     assertEquals(1, kvData.getLayOutVersion());
@@ -143,9 +143,9 @@ public class TestKeyValueYaml {
           .getContainerType());
       assertEquals(9223372036854775807L, kvData.getContainerId());
       assertEquals("/hdds/current/aed-fg4-hji-jkl/containerdir0/1", kvData
-          .getDbPath());
+          .getChunksPath());
       assertEquals("/hdds/current/aed-fg4-hji-jkl/containerdir0/1", kvData
-          .getContainerFilePath());
+          .getMetadataPath());
       assertEquals(1, kvData.getLayOutVersion());
       assertEquals(2, kvData.getMetadata().size());
 

hadoop-hdds/container-service/src/test/resources/additionalfields.container

@@ -1,9 +1,10 @@
 !<KeyValueContainerData>
 containerDBType: RocksDB
-containerFilePath: /hdds/current/aed-fg4-hji-jkl/containerdir0/1
+chunksPath: /hdds/current/aed-fg4-hji-jkl/containerdir0/1
 containerId: 9223372036854775807
 containerType: KeyValueContainer
-dbPath: /hdds/current/aed-fg4-hji-jkl/containerdir0/1
+metadataPath: /hdds/current/aed-fg4-hji-jkl/containerdir0/1
 layOutVersion: 1
 metadata: {OWNER: ozone, VOLUME: hdfs}
-state: CLOSED
+state: CLOSED
+aclEnabled: true

hadoop-hdds/container-service/src/test/resources/incorrect.container

@@ -1,10 +1,9 @@
 !<KeyValueContainerData>
 containerDBType: RocksDB
-containerFilePath: /hdds/current/aed-fg4-hji-jkl/containerdir0/1
+chunksPath: /hdds/current/aed-fg4-hji-jkl/containerdir0/1
 containerId: 9223372036854775807
 containerType: KeyValueContainer
-dbPath: /hdds/current/aed-fg4-hji-jkl/containerdir0/1
+metadataPath: /hdds/current/aed-fg4-hji-jkl/containerdir0/1
 layOutVersion: 1
 metadata: {OWNER: ozone, VOLUME: hdfs}
-state: INVALID
+state: INVALID
-aclEnabled: true