keep the current parseKVContainerData for most existing code cal

Author: Gargi Jaiswal

hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/helpers/KeyValueContainerUtil.java

@@ -196,9 +196,21 @@ public static boolean noBlocksInContainer(DatanodeStore store,
    * Parse KeyValueContainerData and verify checksum. Set block related
    * metadata like block commit sequence id, block count, bytes used and
    * pending delete block count and delete transaction id.
+   * This method will verify checksum by default.
    * @param kvContainerData
    * @param config
-   * @param skipVerifyChecksum
+   * @throws IOException
+   */
+  public static void parseKVContainerData(KeyValueContainerData kvContainerData,
+                                          ConfigurationSource config) throws IOException {
+    parseKVContainerData(kvContainerData, config, false);
+  }
+
+  /**
+   * @param kvContainerData
+   * @param config
+   * @param skipVerifyChecksum checksum verification should be skipped if the state
+   * has changed to RECOVERING during container import, false otherwise
    * @throws IOException
    */
   public static void parseKVContainerData(KeyValueContainerData kvContainerData,
@@ -207,7 +219,7 @@ public static void parseKVContainerData(KeyValueContainerData kvContainerData,
     long containerID = kvContainerData.getContainerID();
 
     // Verify Checksum
-    // skip verify checksum if the state has changed to RECOVERING
+    // skip verify checksum if the state has changed to RECOVERING during container import
     if (!skipVerifyChecksum) {
       ContainerUtils.verifyChecksum(kvContainerData, config);
     }

hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/ContainerReader.java

@@ -212,7 +212,7 @@ public void verifyAndFixupContainerData(ContainerData containerData)
       KeyValueContainerData kvContainerData = (KeyValueContainerData)
           containerData;
       containerData.setVolume(hddsVolume);
-      KeyValueContainerUtil.parseKVContainerData(kvContainerData, config, false);
+      KeyValueContainerUtil.parseKVContainerData(kvContainerData, config);
       KeyValueContainer kvContainer = new KeyValueContainer(kvContainerData,
           config);
       if (kvContainer.getContainerState() == RECOVERING) {

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

@@ -610,7 +610,7 @@ private KeyValueContainerData newKvData() throws IOException {
         kvData.getReplicaIndex() > 0);
     kvData.computeAndSetChecksum(yaml);
 
-    KeyValueContainerUtil.parseKVContainerData(kvData, conf, false);
+    KeyValueContainerUtil.parseKVContainerData(kvData, conf);
 
     return kvData;
   }

hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainer.java

@@ -215,7 +215,7 @@ public void testMissingChunksDirCreated(ContainerTestVersionInfo versionInfo)
 
     // When the container is loaded, the missing chunks directory should
     // be created.
-    KeyValueContainerUtil.parseKVContainerData(data, CONF, false);
+    KeyValueContainerUtil.parseKVContainerData(data, CONF);
     assertTrue(chunksDir.exists());
   }
 

hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainerMetadataInspector.java

@@ -505,7 +505,7 @@ private JsonNode runInspectorAndGetReport(
         GenericTestUtils.LogCapturer.captureLogs(
             toLog4j(KeyValueContainerMetadataInspector.REPORT_LOG),
             new PatternLayout());
-    KeyValueContainerUtil.parseKVContainerData(containerData, getConf(), false);
+    KeyValueContainerUtil.parseKVContainerData(containerData, getConf());
     capturer.stopCapturing();
     String output = capturer.getOutput();
     capturer.clearOutput();

hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/datanode/schemaupgrade/UpgradeContainerSchema.java

@@ -372,7 +372,7 @@ private ContainerData parseContainerData(File containerDir) {
             KeyValueContainerData kvContainerData =
                 (KeyValueContainerData) containerData;
             containerData.setVolume(hddsVolume);
-            KeyValueContainerUtil.parseKVContainerData(kvContainerData, config, false);
+            KeyValueContainerUtil.parseKVContainerData(kvContainerData, config);
             return kvContainerData;
           } else {
             error("Container is not KeyValueContainer type: %s.",