change conditions, add debug log

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

@@ -138,17 +138,19 @@ private static void performOnDemandScan(Container<?> container) {
       logScanStart(containerData);
 
       ScanResult result = ScanResult.healthy();
-      // OPEN containers are scanned here for metadata only
-      if (container.shouldScanMetadata() && !container.shouldScanData()) {
-        result = container.scanMetaData();
-      } else if (container.shouldScanData()) {
+      if (container.shouldScanData()) {
+        LOG.debug("Performing data scan for container {}", container.getContainerData().getContainerID());
         result = container.scanData(instance.throttler, instance.canceler);
         // Metrics for skipped containers should not be updated.
         if (result.getFailureType() == DELETED_CONTAINER) {
           LOG.error("Container [{}] has been deleted.",
               containerId, result.getException());
           return;
         }
+      } else if (container.shouldScanMetadata()) {
+        // OPEN containers are scanned here for metadata only
+        LOG.debug("Performing metadata-only scan for open container {}", container.getContainerData().getContainerID());
+        result = container.scanMetaData();
       }
       if (!result.isHealthy()) {
         LOG.error("Corruption detected in container [{}]." +

hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/scanner/TestOnDemandContainerScannerIntegration.java

@@ -123,7 +123,7 @@ void testCorruptionDetected(ContainerCorruptions corruption)
 
   /**
    * {@link OnDemandContainerScanner} should detect corrupted blocks
-   * in a open container when a client reads from it.
+   * in an open container when a client reads from it.
    */
   @ParameterizedTest
   @MethodSource("supportedCorruptionTypesForOpen")