This is an automated email from the ASF dual-hosted git repository. elek pushed a commit to branch HDDS-1868 in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
commit 77f12fb7abcc4d67fa5c7ac01275c6a6e0fbd168 Author: Siddharth Wagle <swa...@hortonworks.com> AuthorDate: Wed Oct 9 16:11:33 2019 -0700 HDDS-1868. Checkstyle fixes. --- .../apache/hadoop/ozone/container/common/report/ReportManager.java | 4 +--- .../common/transport/server/ratis/ContainerStateMachine.java | 3 ++- .../hadoop/ozone/container/common/report/TestReportManager.java | 1 - .../org/apache/hadoop/hdds/scm/pipeline/PipelineReportHandler.java | 1 - .../apache/hadoop/hdds/scm/pipeline/MockRatisPipelineProvider.java | 4 ++-- .../org/apache/hadoop/hdds/scm/pipeline/TestSCMPipelineManager.java | 2 +- 6 files changed, 6 insertions(+), 9 deletions(-) diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/report/ReportManager.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/report/ReportManager.java index e0cc0fd..f74bb84 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/report/ReportManager.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/report/ReportManager.java @@ -26,9 +26,7 @@ import org.apache.hadoop.util.concurrent.HadoopExecutors; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; @@ -102,7 +100,7 @@ public final class ReportManager { } /** - * Test friendly builder + * Test friendly builder. */ public static Builder newBuilder(ReportPublisherFactory publisherFactory) { return new Builder(publisherFactory); diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java index 493b3bd..815e454 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java @@ -872,7 +872,8 @@ public class ContainerStateMachine extends BaseStateMachine { } @Override - public void notifyLeaderChanged(RaftGroupMemberId groupMemberId, RaftPeerId raftPeerId) { + public void notifyLeaderChanged(RaftGroupMemberId groupMemberId, + RaftPeerId raftPeerId) { ratisServer.handleLeaderChangedNotification(groupMemberId, raftPeerId); } } diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/report/TestReportManager.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/report/TestReportManager.java index b15f8d2..da23973 100644 --- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/report/TestReportManager.java +++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/report/TestReportManager.java @@ -21,7 +21,6 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.ozone.container.common.statemachine.StateContext; import org.junit.Test; -import org.mockito.Mock; import org.mockito.Mockito; import java.util.concurrent.ScheduledExecutorService; diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineReportHandler.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineReportHandler.java index 4c83ada..8a9c4b8 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineReportHandler.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineReportHandler.java @@ -34,7 +34,6 @@ import org.apache.hadoop.hdds.scm.safemode.SCMSafeModeManager; import org.apache.hadoop.hdds.scm.server.SCMDatanodeHeartbeatDispatcher.PipelineReportFromDatanode; import org.apache.hadoop.hdds.server.events.EventHandler; import org.apache.hadoop.hdds.server.events.EventPublisher; -import org.apache.ratis.protocol.RaftPeerId; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/MockRatisPipelineProvider.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/MockRatisPipelineProvider.java index a563ead..342ee5b 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/MockRatisPipelineProvider.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/MockRatisPipelineProvider.java @@ -24,7 +24,6 @@ import org.apache.hadoop.hdds.protocol.proto.HddsProtos; import org.apache.hadoop.hdds.scm.node.NodeManager; import java.io.IOException; -import java.util.Collections; import java.util.List; /** @@ -48,7 +47,8 @@ public class MockRatisPipelineProvider extends RatisPipelineProvider { } @Override - public Pipeline create(HddsProtos.ReplicationFactor factor, List<DatanodeDetails> nodes) { + public Pipeline create(HddsProtos.ReplicationFactor factor, + List<DatanodeDetails> nodes) { return Pipeline.newBuilder() .setId(PipelineID.randomId()) .setState(Pipeline.PipelineState.OPEN) diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestSCMPipelineManager.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestSCMPipelineManager.java index 7fcd1c1..4c18481 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestSCMPipelineManager.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestSCMPipelineManager.java @@ -355,7 +355,7 @@ public class TestSCMPipelineManager { List<DatanodeDetails> nodes = pipeline.getNodes(); Assert.assertEquals(3, nodes.size()); // Send leader for only first 2 dns - nodes.subList(0 ,2).forEach(dn -> + nodes.subList(0, 2).forEach(dn -> sendPipelineReport(dn, pipeline, pipelineReportHandler, true)); sendPipelineReport(nodes.get(2), pipeline, pipelineReportHandler, false); --------------------------------------------------------------------- To unsubscribe, e-mail: hdfs-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: hdfs-commits-h...@hadoop.apache.org