From 1b096e1cc78e9c4234ed251ceafc68ac730ddb63 Mon Sep 17 00:00:00 2001 From: Shashikant Banerjee Date: Wed, 24 Jun 2020 15:45:56 +0530 Subject: [PATCH 1/2] HDDS-3264. Fix TestCSMMetrics.java. --- .../common/transport/server/ratis/XceiverServerRatis.java | 8 +++++--- .../common/transport/server/ratis/TestCSMMetrics.java | 2 -- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/XceiverServerRatis.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/XceiverServerRatis.java index 39e23e4d11ac..53fa2d8e5263 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/XceiverServerRatis.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/XceiverServerRatis.java @@ -771,9 +771,11 @@ void handleLeaderChangedNotification(RaftGroupMemberId groupMemberId, } private void sendPipelineReport() { - // TODO: Send IncrementalPipelineReport instead of full PipelineReport - context.addReport(context.getParent().getContainer().getPipelineReport()); - context.getParent().triggerHeartbeat(); + if (context != null) { + // TODO: Send IncrementalPipelineReport instead of full PipelineReport + context.addReport(context.getParent().getContainer().getPipelineReport()); + context.getParent().triggerHeartbeat(); + } } private static List createChunkExecutors( diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestCSMMetrics.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestCSMMetrics.java index 79d153007767..e6fae22efbf7 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestCSMMetrics.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestCSMMetrics.java @@ -62,14 +62,12 @@ import java.util.Map; import java.util.function.BiConsumer; -import org.junit.Ignore; import org.junit.Test; import org.junit.Assert; /** * This class tests the metrics of ContainerStateMachine. */ -@Ignore public class TestCSMMetrics { static final String TEST_DIR = GenericTestUtils.getTestDir("dfs").getAbsolutePath() From d5347622d2cafd1d90d777be7075e16565922eae Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Wed, 24 Jun 2020 18:24:16 +0200 Subject: [PATCH 2/2] trigger new CI check