This is an automated email from the ASF dual-hosted git repository. shashikant pushed a commit to branch ratis-ozone in repository https://gitbox.apache.org/repos/asf/incubator-ratis.git
commit 942f5af02376925355ecd6461d425b1b580e1970 Merge: 8c55d9a ecef287 Author: Shashikant Banerjee <[email protected]> AuthorDate: Wed Oct 2 18:50:48 2019 +0530 Merge branch 'master' into ratis-ozone NOTICE | 19 +-- dev-support/docker/Dockerfile | 2 +- pom.xml | 2 +- ratis-assembly/pom.xml | 2 +- ratis-assembly/src/main/resources/NOTICE | 15 --- ratis-client/pom.xml | 2 +- .../apache/ratis/client/impl/RaftClientImpl.java | 4 +- ratis-common/pom.xml | 2 +- .../main/java/org/apache/ratis/conf/ConfUtils.java | 50 +++++--- ratis-examples/pom.xml | 2 +- ratis-grpc/pom.xml | 2 +- .../java/org/apache/ratis/grpc/GrpcConfigKeys.java | 26 ++-- .../grpc/client/GrpcClientProtocolClient.java | 10 +- .../grpc/server/GrpcServerProtocolClient.java | 11 +- ratis-hadoop/pom.xml | 2 +- ratis-logservice/pom.xml | 2 +- .../apache/ratis/logservice/common/Constants.java | 8 ++ .../apache/ratis/logservice/server/LogServer.java | 40 ++++++ .../ratis/logservice/server/LogStateMachine.java | 16 ++- .../ratis/logservice/server/MetaStateMachine.java | 138 ++++++++++++++++++--- .../ratis/logservice/server/MetadataServer.java | 13 +- .../ratis/logservice/util/LogServiceProtoUtil.java | 2 +- .../logservice/util/MetaServiceProtoUtil.java | 11 +- ratis-logservice/src/main/proto/LogService.proto | 1 + ratis-logservice/src/main/proto/MetaService.proto | 9 +- .../ratis/logservice/server/TestMetaServer.java | 40 +++++- ratis-metrics/pom.xml | 2 +- ratis-netty/pom.xml | 2 +- ratis-proto/pom.xml | 2 +- ratis-replicated-map/pom.xml | 2 +- ratis-resource-bundle/pom.xml | 2 +- ratis-server/pom.xml | 2 +- .../apache/ratis/server/RaftServerConfigKeys.java | 47 +++++-- .../apache/ratis/server/impl/FollowerState.java | 22 ++-- .../apache/ratis/server/impl/LeaderElection.java | 18 ++- .../org/apache/ratis/server/impl/LeaderState.java | 63 ++++++---- .../apache/ratis/server/impl/PendingRequests.java | 4 +- .../apache/ratis/server/impl/RaftServerImpl.java | 12 +- .../org/apache/ratis/server/impl/ServerState.java | 4 +- .../ratis/server/impl/StateMachineMetrics.java | 57 +++++++++ .../ratis/server/impl/StateMachineUpdater.java | 13 +- .../ratis/server/metrics/RaftLogMetrics.java | 111 +++++++++++++++++ .../ratis/server/metrics/RatisMetricNames.java | 69 ++++++++++- .../apache/ratis/server/metrics/RatisMetrics.java | 36 ++++-- .../ratis/server/raftlog/segmented/LogSegment.java | 62 ++++++--- .../server/raftlog/segmented/SegmentedRaftLog.java | 28 ++++- .../raftlog/segmented/SegmentedRaftLogCache.java | 12 +- .../segmented/SegmentedRaftLogInputStream.java | 12 +- .../raftlog/segmented/SegmentedRaftLogReader.java | 21 +++- .../raftlog/segmented/SegmentedRaftLogWorker.java | 45 ++++--- .../apache/ratis/server/storage/RaftStorage.java | 14 ++- .../apache/ratis/statemachine/StateMachine.java | 9 +- .../ratis/statemachine/impl/BaseStateMachine.java | 9 ++ .../java/org/apache/ratis/LogAppenderTests.java | 2 +- .../test/java/org/apache/ratis/RaftAsyncTests.java | 6 + .../test/java/org/apache/ratis/RaftBasicTests.java | 55 ++++++++ .../test/java/org/apache/ratis/RaftTestUtil.java | 4 +- .../ratis/server/storage/RaftStorageTestUtils.java | 8 +- .../statemachine/SimpleStateMachine4Testing.java | 2 +- ratis-test/pom.xml | 2 +- .../ratis/TestRaftServerSlownessDetection.java | 2 +- .../java/org/apache/ratis/conf/TestConfUtils.java | 53 ++++++++ .../org/apache/ratis/grpc/TestRaftWithGrpc.java | 6 + .../apache/ratis/server/ServerRestartTests.java | 70 +++++++++++ .../ratis/server/raftlog/TestRaftLogMetrics.java | 60 ++++++++- .../raftlog/segmented/TestCacheEviction.java | 2 +- .../server/raftlog/segmented/TestLogSegment.java | 34 ++++- .../raftlog/segmented/TestSegmentedRaftLog.java | 17 +++ .../segmented/TestSegmentedRaftLogCache.java | 2 +- .../ratis/server/storage/TestRaftStorage.java | 7 +- 70 files changed, 1184 insertions(+), 259 deletions(-)
