ayushtkn commented on code in PR #10593:
URL: https://github.com/apache/ozone/pull/10593#discussion_r3503554238
##########
hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/diskbalancer/TestDiskBalancerTask.java:
##########
@@ -504,6 +505,116 @@ public void
moveFailsDuringInMemoryUpdate(ContainerTestVersionInfo versionInfo)
assertEquals(initialSourceDelta,
diskBalancerService.getDeltaSizes().get(sourceVolume));
}
+ /**
+ * HDDS-15651. When markContainerForDelete fails after import and
ContainerSet update,
Review Comment:
we can drop the Jira id here, the git annotate works pretty fine :-)
##########
hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/diskbalancer/TestDiskBalancerTask.java:
##########
@@ -504,6 +505,116 @@ public void
moveFailsDuringInMemoryUpdate(ContainerTestVersionInfo versionInfo)
assertEquals(initialSourceDelta,
diskBalancerService.getDeltaSizes().get(sourceVolume));
}
+ /**
+ * HDDS-15651. When markContainerForDelete fails after import and
ContainerSet update,
+ * the move is still reported as success, the destination replica is active,
the source
+ * replica is queued for lazy deletion, and cleanup removes it after the
delay.
+ */
+ @ContainerTestVersionInfo.ContainerTest
+ public void moveSucceedsWhenMarkContainerForDeleteFails(
+ ContainerTestVersionInfo versionInfo)
+ throws IOException, InterruptedException, TimeoutException {
+ setLayoutAndSchemaForTest(versionInfo);
+ long delay = 2_000L;
+ diskBalancerService.setReplicaDeletionDelay(delay);
+
+ KeyValueContainer container = createContainer(CONTAINER_ID, sourceVolume,
State.CLOSED);
+ File oldContainerDir = new
File(container.getContainerData().getContainerPath());
+ Path destDirPath = Paths.get(
+ KeyValueContainerLocationUtil.getBaseContainerLocation(
+ destVolume.getHddsRootDir().toString(), scmId, CONTAINER_ID));
+ assertThat(destDirPath.toFile())
+ .as("Destination container should not exist before task execution")
+ .doesNotExist();
+
+ KeyValueContainer spyContainer = spy(container);
+ containerSet.removeContainer(CONTAINER_ID);
+ containerSet.addContainer(spyContainer);
+ doThrow(new RuntimeException("simulated markContainerForDelete failure"))
+ .when(spyContainer).markContainerForDelete();
+
+ LogCapturer serviceLog =
GenericTestUtils.LogCapturer.captureLogs(DiskBalancerService.class);
+ DiskBalancerService.DiskBalancerTask task = getTask();
+ task.call();
+
+ assertThat(serviceLog.getOutput())
+ .contains("Failed to mark the old container " + CONTAINER_ID + " for
delete");
+ assertThat(serviceLog.getOutput())
+ .as("move should not roll back when markContainerForDelete fails")
+ .doesNotContain("Rolling back move");
+
+ assertEquals(1, diskBalancerService.getMetrics().getSuccessCount());
+ assertEquals(0, diskBalancerService.getMetrics().getFailureCount());
+ assertEquals(CONTAINER_SIZE,
diskBalancerService.getMetrics().getSuccessBytes());
+
+ Container activeReplica = containerSet.getContainer(CONTAINER_ID);
+ assertNotNull(activeReplica);
+ assertNotEquals(spyContainer, activeReplica);
Review Comment:
maybe
```
assertThat(activeReplica).isNotSameAs(spyContainer);
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
