You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ratis.apache.org by ms...@apache.org on 2020/04/03 05:57:30 UTC
[incubator-ratis] 01/01: Merge commit
'7c5b30d825e598ceaa4bd309c4d66d4ba40bf83e' into ratis-ozone
This is an automated email from the ASF dual-hosted git repository.
msingh pushed a commit to branch ratis-ozone
in repository https://gitbox.apache.org/repos/asf/incubator-ratis.git
commit d23d2a8841906d71cfb51d4718d34cdbfcc1b05a
Merge: c463325 7c5b30d
Author: Mukul Kumar Singh <ms...@apache.org>
AuthorDate: Fri Apr 3 11:27:04 2020 +0530
Merge commit '7c5b30d825e598ceaa4bd309c4d66d4ba40bf83e' into ratis-ozone
NOTICE | 2 +-
pom.xml | 6 +-
ratis-assembly/pom.xml | 2 +-
ratis-assembly/src/main/resources/NOTICE | 2 +-
ratis-client/pom.xml | 2 +-
.../apache/ratis/client/RaftClientConfigKeys.java | 32 +++-
.../org/apache/ratis/client/api/StreamApi.java | 11 ++
.../org/apache/ratis/client/impl/OrderedAsync.java | 2 +-
.../org/apache/ratis/client/impl/StreamImpl.java | 24 +++
ratis-common/pom.xml | 2 +-
.../main/java/org/apache/ratis/conf/ConfUtils.java | 46 ++++-
.../main/java/org/apache/ratis/util/IOUtils.java | 17 ++
.../java/org/apache/ratis/util/SizeInBytes.java | 4 +-
.../org/apache/ratis/util/TimeoutScheduler.java | 2 +-
ratis-examples/pom.xml | 6 +-
.../examples/arithmetic}/ArithmeticLogDump.java | 8 +-
.../ratis/examples/arithmetic/cli/Server.java | 2 +-
.../ratis/examples/filestore/cli/Client.java | 4 +-
.../ratis/examples/filestore/cli/Server.java | 2 +-
.../arithmetic}/TestArithmeticLogDump.java | 12 +-
ratis-grpc/pom.xml | 2 +-
.../java/org/apache/ratis/grpc/GrpcConfigKeys.java | 48 +++---
.../java/org/apache/ratis/grpc/GrpcFactory.java | 2 +-
.../ratis/grpc/metrics/GrpcServerMetrics.java | 24 ++-
.../apache/ratis/grpc/server/GrpcLogAppender.java | 16 +-
.../grpc/server/GrpcServerProtocolClient.java | 9 +-
.../ratis/grpc/server/TestGrpcServerMetrics.java | 58 +++++--
ratis-hadoop/pom.xml | 2 +-
ratis-logservice/pom.xml | 2 +-
.../apache/ratis/logservice/server/LogServer.java | 2 +-
.../ratis/logservice/server/MetadataServer.java | 4 +-
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 | 24 +--
.../apache/ratis/server/impl/RaftServerImpl.java | 2 +-
.../ratis/server/impl/RaftServerMetrics.java | 4 +-
.../apache/ratis/server/impl/RaftServerProxy.java | 2 +-
.../org/apache/ratis/server/impl/ServerState.java | 2 +-
.../raftlog/segmented/BufferedChannelBase.java | 52 ------
.../raftlog/segmented/BufferedWriteChannel.java | 94 ++++++-----
.../raftlog/segmented/SegmentedRaftLogCache.java | 2 +-
.../segmented/SegmentedRaftLogOutputStream.java | 113 ++++---------
.../raftlog/segmented/SegmentedRaftLogWorker.java | 4 +-
.../java/org/apache/ratis/LogAppenderTests.java | 9 +-
.../java/org/apache/ratis/MiniRaftCluster.java | 2 +-
.../test/java/org/apache/ratis/RaftAsyncTests.java | 6 +-
.../test/java/org/apache/ratis/StreamApiTests.java | 58 ++++++-
ratis-test/pom.xml | 2 +-
.../apache/ratis/grpc/TestRaftServerWithGrpc.java | 5 +-
.../ratis/server/TestRaftServerConfigKeys.java | 12 +-
.../segmented/TestBufferedWriteChannel.java | 186 +++++++++++++++++++++
.../raftlog/segmented/TestCacheEviction.java | 4 +-
.../server/raftlog/segmented/TestLogSegment.java | 2 +-
.../raftlog/segmented/TestRaftLogReadWrite.java | 2 +-
.../raftlog/segmented/TestSegmentedRaftLog.java | 2 +-
ratis-tools/pom.xml | 62 +------
60 files changed, 638 insertions(+), 382 deletions(-)