adoroszlai commented on code in PR #11962:
URL: https://github.com/apache/ozone/pull/11962#discussion_r4561334738


##########
hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/states/endpoint/TestHeartbeatEndpointTask.java:
##########
@@ -441,16 +451,241 @@ public void 
testHeartbeatCapsReportsAndSchedulesFollowup() throws Exception {
     // Only the capped number of ICRs is sent in this heartbeat.
     SCMHeartbeatRequestProto heartbeat = argument.getValue();
     assertEquals(2, heartbeat.getIncrementalContainerReportCount());
-    // The remainder stays queued and a follow-up heartbeat is scheduled now.
-    assertTrue(context.hasPendingReports(TEST_SCM_ENDPOINT));
-    verify(datanodeStateMachine).setNextHB(anyLong());
+    // The remainder stays queued for the next regular heartbeat.
+    assertEquals(3, 
context.getIncrementalReportQueueSize().get(TEST_SCM_ENDPOINT));
+    verify(datanodeStateMachine, never()).setNextHB(anyLong());
 
-    // The follow-ups drain the rest; the last one sends 1 ICR and schedules 
nothing.
+    // Subsequent regular heartbeats drain the rest.
     endpointTask.call();
     endpointTask.call();
     assertEquals(1, argument.getValue().getIncrementalContainerReportCount());
-    assertFalse(context.hasPendingReports(TEST_SCM_ENDPOINT));
-    verify(datanodeStateMachine, times(2)).setNextHB(anyLong());
+    assertEquals(0, 
context.getIncrementalReportQueueSize().get(TEST_SCM_ENDPOINT));
+    verify(datanodeStateMachine, never()).setNextHB(anyLong());
+  }
+
+  @Test
+  public void testHeartbeatCapsCommandStatusReportsByBytes() throws Exception {
+    OzoneConfiguration conf = new OzoneConfiguration();
+    conf.setInt(HDDS_HEARTBEAT_REPORT_MAX_LIMIT, 10);
+    CommandStatusReportsProto first = newCommandStatusReport(1, 128);
+    CommandStatusReportsProto second = newCommandStatusReport(2, 128);
+    long reportBytes = commandStatusReportWireSize(first);
+    conf.set(HDDS_HEARTBEAT_COMMAND_STATUS_REPORT_MAX_SIZE, reportBytes + "B");
+    DatanodeStateMachine datanodeStateMachine = mockDatanodeStateMachine();
+    DatanodeQueueMetrics queueMetrics = new 
DatanodeQueueMetrics(datanodeStateMachine);
+    when(datanodeStateMachine.getQueueMetrics()).thenReturn(queueMetrics);
+    StateContext context = new StateContext(conf, DatanodeStates.RUNNING,
+        datanodeStateMachine, "");
+    when(datanodeStateMachine.getQueuedCommandCount())
+        .thenReturn(new EnumCounters<>(SCMCommandProto.Type.class));
+
+    StorageContainerDatanodeProtocolClientSideTranslatorPB scm =
+        mock(StorageContainerDatanodeProtocolClientSideTranslatorPB.class);
+    ArgumentCaptor<SCMHeartbeatRequestProto> argument = ArgumentCaptor
+        .forClass(SCMHeartbeatRequestProto.class);
+    when(scm.sendHeartbeat(argument.capture()))
+        .thenAnswer(invocation ->
+            SCMHeartbeatResponseProto.newBuilder()
+                .setDatanodeUUID(
+                    ((SCMHeartbeatRequestProto) invocation.getArgument(0))
+                        .getDatanodeDetails().getUuid())
+                .build());
+
+    HeartbeatEndpointTask endpointTask = getHeartbeatEndpointTask(
+        conf, context, scm);
+    context.addEndpoint(TEST_SCM_ENDPOINT);
+    context.addIncrementalReport(first);
+    context.addIncrementalReport(second);
+
+    endpointTask.call();
+
+    assertEquals(1, argument.getValue().getCommandStatusReportsCount());
+    assertEquals(first,
+        argument.getValue().getCommandStatusReports(0));
+    assertEquals(commandStatusReportWireSize(second),
+        context.getCommandStatusReportQueueBytes(TEST_SCM_ENDPOINT));
+    assertEquals(reportBytes, 
queueMetrics.getCommandStatusReportBytesSent(TEST_SCM_ENDPOINT));
+    assertEquals(0, 
queueMetrics.getOversizedCommandStatusReportBytes(TEST_SCM_ENDPOINT));
+    verify(datanodeStateMachine, never()).setNextHB(anyLong());
+  }
+
+  @Test
+  public void testNonCommandReportsConsumeReportCountLimit() throws Exception {
+    OzoneConfiguration conf = new OzoneConfiguration();
+    conf.setInt(HDDS_HEARTBEAT_REPORT_MAX_LIMIT, 2);
+    DatanodeStateMachine datanodeStateMachine = mockDatanodeStateMachine();
+    StateContext context = new StateContext(conf, DatanodeStates.RUNNING, 
datanodeStateMachine, "");
+    when(datanodeStateMachine.getQueuedCommandCount())
+        .thenReturn(new EnumCounters<>(SCMCommandProto.Type.class));
+
+    StorageContainerDatanodeProtocolClientSideTranslatorPB scm =
+        mock(StorageContainerDatanodeProtocolClientSideTranslatorPB.class);
+    ArgumentCaptor<SCMHeartbeatRequestProto> argument = 
ArgumentCaptor.forClass(SCMHeartbeatRequestProto.class);
+    when(scm.sendHeartbeat(argument.capture()))
+        .thenAnswer(invocation ->
+            SCMHeartbeatResponseProto.newBuilder()
+                .setDatanodeUUID(((SCMHeartbeatRequestProto) 
invocation.getArgument(0))
+                    .getDatanodeDetails().getUuid())
+                .build());
+
+    HeartbeatEndpointTask endpointTask = getHeartbeatEndpointTask(conf, 
context, scm);
+    context.addEndpoint(TEST_SCM_ENDPOINT);
+    
context.addIncrementalReport(IncrementalContainerReportProto.getDefaultInstance());
+    
context.addIncrementalReport(IncrementalContainerReportProto.getDefaultInstance());
+    CommandStatusReportsProto commandStatus = newCommandStatusReport(1, 128);
+    context.addIncrementalReport(commandStatus);
+
+    endpointTask.call();
+
+    assertEquals(2, argument.getValue().getIncrementalContainerReportCount());
+    assertEquals(0, argument.getValue().getCommandStatusReportsCount());
+    assertEquals(commandStatusReportWireSize(commandStatus),
+        context.getCommandStatusReportQueueBytes(TEST_SCM_ENDPOINT));
+  }
+
+  @Test
+  public void testOversizedCommandStatusSentWhenSafe() throws Exception {
+    CommandStatusReportsProto report = newCommandStatusReport(1, 128);
+    long reportBytes = commandStatusReportWireSize(report);
+    OzoneConfiguration conf = new OzoneConfiguration();
+    conf.set(HDDS_HEARTBEAT_COMMAND_STATUS_REPORT_MAX_SIZE, (reportBytes - 1) 
+ "B");
+    DatanodeStateMachine datanodeStateMachine = mockDatanodeStateMachine();
+    DatanodeQueueMetrics queueMetrics = new 
DatanodeQueueMetrics(datanodeStateMachine);
+    when(datanodeStateMachine.getQueueMetrics()).thenReturn(queueMetrics);
+    when(datanodeStateMachine.getQueuedCommandCount())
+        .thenReturn(new EnumCounters<>(SCMCommandProto.Type.class));
+    StateContext context = new StateContext(conf, DatanodeStates.RUNNING, 
datanodeStateMachine, "");
+
+    StorageContainerDatanodeProtocolClientSideTranslatorPB scm =
+        mock(StorageContainerDatanodeProtocolClientSideTranslatorPB.class);
+    ArgumentCaptor<SCMHeartbeatRequestProto> argument = 
ArgumentCaptor.forClass(SCMHeartbeatRequestProto.class);
+    when(scm.sendHeartbeat(argument.capture()))
+        .thenAnswer(invocation ->
+            SCMHeartbeatResponseProto.newBuilder()
+                .setDatanodeUUID(((SCMHeartbeatRequestProto) 
invocation.getArgument(0))
+                    .getDatanodeDetails().getUuid())
+                .build());
+
+    HeartbeatEndpointTask endpointTask = getHeartbeatEndpointTask(conf, 
context, scm);
+    context.addEndpoint(TEST_SCM_ENDPOINT);
+    context.addIncrementalReport(report);
+
+    endpointTask.call();
+
+    assertEquals(report, argument.getValue().getCommandStatusReports(0));
+    assertEquals(0, 
context.getCommandStatusReportQueueBytes(TEST_SCM_ENDPOINT));
+    assertEquals(reportBytes, 
queueMetrics.getCommandStatusReportBytesSent(TEST_SCM_ENDPOINT));
+    assertEquals(reportBytes, 
queueMetrics.getOversizedCommandStatusReportBytes(TEST_SCM_ENDPOINT));
+  }
+
+  @Test
+  public void testExistingHeartbeatContentReducesCommandStatusBudget() throws 
Exception {
+    IncrementalContainerReportProto icr =
+        IncrementalContainerReportProto.newBuilder()
+            .addReport(ContainerReplicaProto.newBuilder()
+                .setContainerID(1)
+                .setState(ContainerReplicaProto.State.CLOSED)
+                .setOriginNodeId(String.join("", Collections.nCopies(
+                    1024, "x")))

Review Comment:
   ```suggestion
                   .setOriginNodeId(String.join("", Collections.nCopies(1024, 
"x")))
   ```



-- 
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]

Reply via email to