Minor fixes after reviewing the diff

errose28 · Nov 5, 2024 · 12555fa · 12555fa
1 parent 44a445e
commit 12555fa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/...er-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerData.java b/...er-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerData.java
@@ -78,7 +78,7 @@ public abstract class ContainerData {
   private String chunksPath;
 
   // State of the Container
-  private volatile ContainerDataProto.State state;
+  private ContainerDataProto.State state;
 
   private final long maxSize;
 

diff --git a/...er-service/src/test/java/org/apache/hadoop/ozone/container/common/ContainerTestUtils.java b/...er-service/src/test/java/org/apache/hadoop/ozone/container/common/ContainerTestUtils.java
@@ -292,16 +292,15 @@ public static MetadataScanResult getHealthyMetadataScanResult() {
   }
 
   /**
-<<<<<<< HEAD
-   * Construct a generic scan error that can be used for testing.
+   * Construct a generic data scan error that can be used for testing.
    */
   public static ContainerScanError getDataScanError() {
     return new ContainerScanError(ContainerScanError.FailureType.CORRUPT_CHUNK, new File(""),
         new IOException("Fake data corruption failure for testing"));
   }
 
   /**
-   * Construct a generic scan error that can be used for testing.
+   * Construct a generic metadata scan error that can be used for testing.
    */
   public static ContainerScanError getMetadataScanError() {
     return new ContainerScanError(ContainerScanError.FailureType.CORRUPT_CONTAINER_FILE, new File(""),