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 2019/11/29 09:57:47 UTC

[incubator-ratis] branch ratis-ozone updated (942f5af -> 401b691)

This is an automated email from the ASF dual-hosted git repository.

msingh pushed a change to branch ratis-ozone
in repository https://gitbox.apache.org/repos/asf/incubator-ratis.git.


    from 942f5af  Merge branch 'master' into ratis-ozone
     add 5b6edb9  RATIS-693. Combine notifyLeader and notifyLeaderChanged calls on StateMachine.  Contributed by Siddharth Wagle
     add 2d487ae  RATIS-672. Vagrant test's Maven 404's
     add 63cd2fb  RATIS-650. Add metrics to track commit index of each peer in a RaftGroup. Contributed by Supratim Deka.
     add 89abd13  Revert "RATIS-672. Vagrant test's Maven 404's"
     add 004ac67  RATIS-698. RaftServerImpl should not enforce minTimeout before first leaderElection cycle.
     add 699792d  RATIS-648. Add metrics related to GrpcLogAppendRequests. Contributed by Siddharth Wagle.
     add 3f446aa  RATIS-705. GrpcClientProtocolClient#close Interrupts itself.  Contributed by Lokesh Jain
     add b49974d  RATIS-707. Test failures caused by minTimeout set to zero.  Contributed by Siddharth Wagle
     add 1053da1  RATIS-703. Intermittent ambiguous attempt(..) method in JavaUtils.  Contributed by Henrik Hegardt
     add 5bb587b  RATIS-716. RetryCache$CacheEntry$replyFuture holds onto RaftClientRequest until eviction.  Contributed by Lokesh Jain.
     add b931482  RATIS-702. Make metrics reporting implementation pluggable.  Contributed by Marton Elek
     add 9cbf1ef  RATIS-691. Fix checkstyle violations in ratis-logservice.  Contributed by Dinesh Chitlangia
     add d11320d  RATIS-706. Dead lock in GrpcClientRpc. Contributed by Tsz Wo Nicholas Sze.
     add f36acab  RATIS-717. NPE thrown on the follower while instantiating RaftLeaderMetrics. Contributed by Aravindan Vijayan.
     add ef12b1f  RATIS-676. Add a metric in RaftServer to track the Log Commit Index. Contributed by Aravindan Vijayan.
     add ced7dbf  RATIS-649. Add metrics related to ClientRequests. Contributed by Aravindan Vijayan.
     add 99c33e0  RATIS-723. Fix pluggable metrics impl which cause test failures
     add 510206d  RATIS-390. Fix package of LogServiceClient
     add c76ab77  RATIS-718. TimeoutScheduler throws IllegalStateException. Contributed by Tsz Wo Nicholas Sze.
     add 55cbfbb  RATIS-726. TimeoutScheduler holds on to the raftClientRequest till it times out even though request succeeds. Contributed by Tsz-wo Sze.
     add 9c1638d  RATIS-704. Invoke sendAsync as soon as OrderedAsync is created. Contributed by Tsz Wo Nicholas Sze.
     add ad6d7c3  RATIS-728. TimeoutScheduler for GrpcLogAppender holds on to the AppendEntryRequest till it times out even though request succeeds. Contributed by Tsz-wo Sze.
     add 2fd6c04  RATIS-692. RaftStorageDirectory.tryLock throws a very deep IOException.
     add debf50a  RATIS-694. Fix checkstyle violations in ratis-metrics.  Contributed by Dinesh Chitlangia
     add d6d58d0  RATIS-603. Add a method to StateMachine for printing StateMachineLogEntryProto.  Contributed by Mukul Kumar Singh
     new 401b691  Merge commit 'd6d58d0f52b66c10c364ff1115fe252bd36acf62' into ratis-ozone

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pom.xml                                            |   7 -
 .../apache/ratis/client/RaftClientConfigKeys.java  |  15 +-
 .../org/apache/ratis/client/impl/OrderedAsync.java |  67 +++++---
 .../apache/ratis/client/impl/RaftClientImpl.java   |   4 +-
 .../apache/ratis/protocol/RaftClientRequest.java   |   7 +-
 .../main/java/org/apache/ratis/util/FileUtils.java |  34 +++-
 .../main/java/org/apache/ratis/util/JavaUtils.java |  38 ++---
 .../java/org/apache/ratis/util/JmxRegister.java    |   4 +-
 .../java/org/apache/ratis/util/PeerProxyMap.java   |  48 ++++--
 .../java/org/apache/ratis/util/TimeDuration.java   |   1 +
 .../org/apache/ratis/util/TimeoutScheduler.java    |  86 +++++-----
 .../src/test/java/org/apache/ratis/BaseTest.java   |  18 ++-
 .../ratis/examples/filestore/cli/Server.java       |  10 +-
 ratis-grpc/pom.xml                                 |  13 +-
 .../grpc/client/GrpcClientProtocolClient.java      |  17 +-
 .../grpc/client/GrpcClientProtocolService.java     |   3 +-
 .../apache/ratis/grpc/client/GrpcClientRpc.java    |   2 +-
 .../ratis/grpc/metrics/GrpcServerMetrics.java      |  83 ++++++++++
 .../apache/ratis/grpc/server/GrpcLogAppender.java  | 112 ++++++++++---
 .../ratis/grpc/server/TestGrpcServerMetrics.java   | 105 ++++++++++++
 ratis-logservice/pom.xml                           |   5 +
 .../apache/ratis/logservice/api/LogMessage.java    |   2 +-
 .../org/apache/ratis/logservice/api/LogName.java   |   2 +-
 .../{client => api}/LogServiceClient.java          |  15 +-
 .../org/apache/ratis/logservice/api/LogStream.java |   2 +-
 .../apache/ratis/logservice/common/Constants.java  |   4 +-
 .../logservice/impl/ArchiveHdfsLogReader.java      |   3 -
 .../logservice/impl/ArchiveHdfsLogWriter.java      |   1 -
 .../logservice/impl/ArchivedLogStreamImpl.java     |  12 +-
 .../logservice/impl/ExportedLogStreamImpl.java     |   2 +-
 .../ratis/logservice/impl/LogReaderImpl.java       |   4 +-
 .../ratis/logservice/impl/LogStreamImpl.java       |  16 +-
 .../metrics/LogServiceMetricsRegistry.java         |   7 -
 .../apache/ratis/logservice/server/LogServer.java  |   4 +-
 .../ratis/logservice/server/LogStateMachine.java   |  35 ++--
 .../ratis/logservice/server/MetaStateMachine.java  |  68 ++++----
 .../ratis/logservice/server/MetadataServer.java    |   6 +-
 .../ratis/logservice/server/RaftLogReader.java     |  12 +-
 .../org/apache/ratis/logservice/shell/Command.java |   2 +-
 .../ratis/logservice/shell/CommandFactory.java     |   2 +-
 .../ratis/logservice/shell/LogServiceShell.java    |   6 +-
 .../logservice/shell/LogServiceShellOpts.java      |   6 +-
 .../shell/commands/ArchiveLogCommand.java          |   2 +-
 .../shell/commands/CreateLogCommand.java           |   2 +-
 .../shell/commands/DeleteLogCommand.java           |   2 +-
 .../logservice/shell/commands/ExitCommand.java     |   2 +-
 .../shell/commands/ExportLogCommand.java           |   2 +-
 .../logservice/shell/commands/HelpCommand.java     |   2 +-
 .../logservice/shell/commands/ListLogsCommand.java |   2 +-
 .../logservice/shell/commands/PutToLogCommand.java |   2 +-
 .../logservice/shell/commands/ReadLogCommand.java  |   2 +-
 .../ratis/logservice/tool/VerificationTool.java    | 106 ++++++++----
 .../ratis/logservice/util/LogServiceUtils.java     |   4 +-
 .../logservice/util/MetaServiceProtoUtil.java      |   7 +-
 .../ratis/logservice/LogServiceReadWriteBase.java  |   7 +
 .../ratis/logservice/server/TestMetaServer.java    |  13 +-
 .../logservice/tool/TestVerificationTool.java      |   2 +-
 .../ratis/logservice/util/LogServiceCluster.java   |   2 +-
 ratis-metrics/pom.xml                              |  11 +-
 .../java/org/apache/ratis/metrics/JVMMetrics.java  |  41 ++---
 .../org/apache/ratis/metrics/MetricRegistries.java |  19 ++-
 .../ratis/metrics/MetricRegistriesLoader.java      |   4 +-
 .../apache/ratis/metrics/MetricRegistryInfo.java   |   6 +-
 .../org/apache/ratis/metrics/MetricsReporting.java | 100 +++---------
 .../ratis/metrics/impl/MetricRegistriesImpl.java   |  32 +++-
 .../metrics/impl/MetricRegistryFactoryImpl.java    |   5 +-
 .../metrics/impl/RatisMetricRegistryImpl.java      |   6 +-
 .../apache/ratis/metrics/impl/RefCountingMap.java  |   4 +-
 .../ratis/metrics/TestHadoop2MetricsAdaptor.java   |  75 ---------
 .../ratis/metrics/TestHadoop2MetricsSink.java      |  42 -----
 .../apache/ratis/server/impl/FollowerState.java    |   3 +
 .../org/apache/ratis/server/impl/LeaderState.java  |  20 +--
 .../org/apache/ratis/server/impl/LogAppender.java  |   2 +-
 .../apache/ratis/server/impl/PendingRequests.java  |  10 +-
 .../apache/ratis/server/impl/RaftServerImpl.java   | 112 ++++++++-----
 .../ratis/server/impl/RaftServerMetrics.java       | 178 +++++++++++++++++++++
 .../apache/ratis/server/impl/ServerImplUtils.java  |   2 +-
 .../apache/ratis/server/impl/ServerProtoUtils.java |  19 ++-
 .../org/apache/ratis/server/impl/ServerState.java  |   2 +-
 .../apache/ratis/server/impl/WatchRequests.java    |   2 +-
 .../ratis/server/metrics/HeartbeatMetrics.java     |  63 --------
 .../ratis/server/metrics/RatisMetricNames.java     |  26 ++-
 .../apache/ratis/server/metrics/RatisMetrics.java  |  34 ++--
 .../org/apache/ratis/server/raftlog/RaftLog.java   |  14 +-
 .../server/raftlog/segmented/SegmentedRaftLog.java |   5 +
 .../raftlog/segmented/SegmentedRaftLogWorker.java  |   4 +-
 .../ratis/server/storage/RaftStorageDirectory.java |   6 +-
 .../apache/ratis/statemachine/StateMachine.java    |  21 ++-
 .../ratis/statemachine/impl/BaseStateMachine.java  |   2 +-
 .../impl/SimpleStateMachineStorage.java            |   4 +-
 .../ratis/InstallSnapshotNotificationTests.java    |   4 +-
 .../java/org/apache/ratis/LogAppenderTests.java    |  10 +-
 .../org/apache/ratis/RaftAsyncExceptionTests.java  |  45 +++++-
 .../test/java/org/apache/ratis/RaftAsyncTests.java |  14 +-
 .../test/java/org/apache/ratis/RaftBasicTests.java |  33 +++-
 .../org/apache/ratis/RaftExceptionBaseTest.java    |   4 +-
 .../test/java/org/apache/ratis/RaftTestUtil.java   |   4 +-
 .../java/org/apache/ratis/RetryCacheTests.java     |   2 +-
 .../ratis/server/impl/LeaderElectionTests.java     |   2 +-
 .../server/impl/RaftReconfigurationBaseTest.java   |   6 +-
 .../server/metrics/TestLeaderElectionMetrics.java  |   2 -
 .../ratis/statemachine/RaftSnapshotBaseTest.java   |   4 +-
 .../statemachine/SimpleStateMachine4Testing.java   |  13 +-
 ratis-test/pom.xml                                 |   6 +
 .../ratis/TestRaftServerSlownessDetection.java     |  10 +-
 .../apache/ratis/grpc/TestRaftServerWithGrpc.java  |  43 ++++-
 .../apache/ratis/server/ServerRestartTests.java    |  12 +-
 .../ratis/server/raftlog/TestRaftLogMetrics.java   |   8 +-
 .../org/apache/ratis/util/TestPeerProxyMap.java    |  80 +++++++++
 .../apache/ratis/util/TestTimeoutScheduler.java    |  19 ++-
 110 files changed, 1446 insertions(+), 798 deletions(-)
 create mode 100644 ratis-grpc/src/main/java/org/apache/ratis/grpc/metrics/GrpcServerMetrics.java
 create mode 100644 ratis-grpc/src/test/java/org/apache/ratis/grpc/server/TestGrpcServerMetrics.java
 rename ratis-logservice/src/main/java/org/apache/ratis/logservice/{client => api}/LogServiceClient.java (96%)
 delete mode 100644 ratis-metrics/src/test/java/org/apache/ratis/metrics/TestHadoop2MetricsAdaptor.java
 delete mode 100644 ratis-metrics/src/test/java/org/apache/ratis/metrics/TestHadoop2MetricsSink.java
 create mode 100644 ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerMetrics.java
 delete mode 100644 ratis-server/src/main/java/org/apache/ratis/server/metrics/HeartbeatMetrics.java
 create mode 100644 ratis-test/src/test/java/org/apache/ratis/util/TestPeerProxyMap.java


[incubator-ratis] 01/01: Merge commit 'd6d58d0f52b66c10c364ff1115fe252bd36acf62' into ratis-ozone

Posted by ms...@apache.org.
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 401b69167335661f122ca220a22b0db0ee02254a
Merge: 942f5af d6d58d0
Author: Mukul Kumar Singh <mu...@cloudera.com>
AuthorDate: Fri Nov 29 15:26:58 2019 +0530

    Merge commit 'd6d58d0f52b66c10c364ff1115fe252bd36acf62' into ratis-ozone

 pom.xml                                            |   7 -
 .../apache/ratis/client/RaftClientConfigKeys.java  |  15 +-
 .../org/apache/ratis/client/impl/OrderedAsync.java |  67 +++++---
 .../apache/ratis/client/impl/RaftClientImpl.java   |   4 +-
 .../apache/ratis/protocol/RaftClientRequest.java   |   7 +-
 .../main/java/org/apache/ratis/util/FileUtils.java |  34 +++-
 .../main/java/org/apache/ratis/util/JavaUtils.java |  38 ++---
 .../java/org/apache/ratis/util/JmxRegister.java    |   4 +-
 .../java/org/apache/ratis/util/PeerProxyMap.java   |  48 ++++--
 .../java/org/apache/ratis/util/TimeDuration.java   |   1 +
 .../org/apache/ratis/util/TimeoutScheduler.java    |  86 +++++-----
 .../src/test/java/org/apache/ratis/BaseTest.java   |  18 ++-
 .../ratis/examples/filestore/cli/Server.java       |  10 +-
 ratis-grpc/pom.xml                                 |  13 +-
 .../grpc/client/GrpcClientProtocolClient.java      |  17 +-
 .../grpc/client/GrpcClientProtocolService.java     |   3 +-
 .../apache/ratis/grpc/client/GrpcClientRpc.java    |   2 +-
 .../ratis/grpc/metrics/GrpcServerMetrics.java      |  83 ++++++++++
 .../apache/ratis/grpc/server/GrpcLogAppender.java  | 112 ++++++++++---
 .../ratis/grpc/server/TestGrpcServerMetrics.java   | 105 ++++++++++++
 ratis-logservice/pom.xml                           |   5 +
 .../apache/ratis/logservice/api/LogMessage.java    |   2 +-
 .../org/apache/ratis/logservice/api/LogName.java   |   2 +-
 .../{client => api}/LogServiceClient.java          |  15 +-
 .../org/apache/ratis/logservice/api/LogStream.java |   2 +-
 .../apache/ratis/logservice/common/Constants.java  |   4 +-
 .../logservice/impl/ArchiveHdfsLogReader.java      |   3 -
 .../logservice/impl/ArchiveHdfsLogWriter.java      |   1 -
 .../logservice/impl/ArchivedLogStreamImpl.java     |  12 +-
 .../logservice/impl/ExportedLogStreamImpl.java     |   2 +-
 .../ratis/logservice/impl/LogReaderImpl.java       |   4 +-
 .../ratis/logservice/impl/LogStreamImpl.java       |  16 +-
 .../metrics/LogServiceMetricsRegistry.java         |   7 -
 .../apache/ratis/logservice/server/LogServer.java  |   4 +-
 .../ratis/logservice/server/LogStateMachine.java   |  35 ++--
 .../ratis/logservice/server/MetaStateMachine.java  |  68 ++++----
 .../ratis/logservice/server/MetadataServer.java    |   6 +-
 .../ratis/logservice/server/RaftLogReader.java     |  12 +-
 .../org/apache/ratis/logservice/shell/Command.java |   2 +-
 .../ratis/logservice/shell/CommandFactory.java     |   2 +-
 .../ratis/logservice/shell/LogServiceShell.java    |   6 +-
 .../logservice/shell/LogServiceShellOpts.java      |   6 +-
 .../shell/commands/ArchiveLogCommand.java          |   2 +-
 .../shell/commands/CreateLogCommand.java           |   2 +-
 .../shell/commands/DeleteLogCommand.java           |   2 +-
 .../logservice/shell/commands/ExitCommand.java     |   2 +-
 .../shell/commands/ExportLogCommand.java           |   2 +-
 .../logservice/shell/commands/HelpCommand.java     |   2 +-
 .../logservice/shell/commands/ListLogsCommand.java |   2 +-
 .../logservice/shell/commands/PutToLogCommand.java |   2 +-
 .../logservice/shell/commands/ReadLogCommand.java  |   2 +-
 .../ratis/logservice/tool/VerificationTool.java    | 106 ++++++++----
 .../ratis/logservice/util/LogServiceUtils.java     |   4 +-
 .../logservice/util/MetaServiceProtoUtil.java      |   7 +-
 .../ratis/logservice/LogServiceReadWriteBase.java  |   7 +
 .../ratis/logservice/server/TestMetaServer.java    |  13 +-
 .../logservice/tool/TestVerificationTool.java      |   2 +-
 .../ratis/logservice/util/LogServiceCluster.java   |   2 +-
 ratis-metrics/pom.xml                              |  11 +-
 .../java/org/apache/ratis/metrics/JVMMetrics.java  |  41 ++---
 .../org/apache/ratis/metrics/MetricRegistries.java |  19 ++-
 .../ratis/metrics/MetricRegistriesLoader.java      |   4 +-
 .../apache/ratis/metrics/MetricRegistryInfo.java   |   6 +-
 .../org/apache/ratis/metrics/MetricsReporting.java | 100 +++---------
 .../ratis/metrics/impl/MetricRegistriesImpl.java   |  32 +++-
 .../metrics/impl/MetricRegistryFactoryImpl.java    |   5 +-
 .../metrics/impl/RatisMetricRegistryImpl.java      |   6 +-
 .../apache/ratis/metrics/impl/RefCountingMap.java  |   4 +-
 .../ratis/metrics/TestHadoop2MetricsAdaptor.java   |  75 ---------
 .../ratis/metrics/TestHadoop2MetricsSink.java      |  42 -----
 .../apache/ratis/server/impl/FollowerState.java    |   3 +
 .../org/apache/ratis/server/impl/LeaderState.java  |  20 +--
 .../org/apache/ratis/server/impl/LogAppender.java  |   2 +-
 .../apache/ratis/server/impl/PendingRequests.java  |  10 +-
 .../apache/ratis/server/impl/RaftServerImpl.java   | 112 ++++++++-----
 .../ratis/server/impl/RaftServerMetrics.java       | 178 +++++++++++++++++++++
 .../apache/ratis/server/impl/ServerImplUtils.java  |   2 +-
 .../apache/ratis/server/impl/ServerProtoUtils.java |  19 ++-
 .../org/apache/ratis/server/impl/ServerState.java  |   2 +-
 .../apache/ratis/server/impl/WatchRequests.java    |   2 +-
 .../ratis/server/metrics/HeartbeatMetrics.java     |  63 --------
 .../ratis/server/metrics/RatisMetricNames.java     |  26 ++-
 .../apache/ratis/server/metrics/RatisMetrics.java  |  34 ++--
 .../org/apache/ratis/server/raftlog/RaftLog.java   |  14 +-
 .../server/raftlog/segmented/SegmentedRaftLog.java |   5 +
 .../raftlog/segmented/SegmentedRaftLogWorker.java  |   4 +-
 .../ratis/server/storage/RaftStorageDirectory.java |   6 +-
 .../apache/ratis/statemachine/StateMachine.java    |  21 ++-
 .../ratis/statemachine/impl/BaseStateMachine.java  |   2 +-
 .../impl/SimpleStateMachineStorage.java            |   4 +-
 .../ratis/InstallSnapshotNotificationTests.java    |   4 +-
 .../java/org/apache/ratis/LogAppenderTests.java    |  10 +-
 .../org/apache/ratis/RaftAsyncExceptionTests.java  |  45 +++++-
 .../test/java/org/apache/ratis/RaftAsyncTests.java |  14 +-
 .../test/java/org/apache/ratis/RaftBasicTests.java |  33 +++-
 .../org/apache/ratis/RaftExceptionBaseTest.java    |   4 +-
 .../test/java/org/apache/ratis/RaftTestUtil.java   |   4 +-
 .../java/org/apache/ratis/RetryCacheTests.java     |   2 +-
 .../ratis/server/impl/LeaderElectionTests.java     |   2 +-
 .../server/impl/RaftReconfigurationBaseTest.java   |   6 +-
 .../server/metrics/TestLeaderElectionMetrics.java  |   2 -
 .../ratis/statemachine/RaftSnapshotBaseTest.java   |   4 +-
 .../statemachine/SimpleStateMachine4Testing.java   |  13 +-
 ratis-test/pom.xml                                 |   6 +
 .../ratis/TestRaftServerSlownessDetection.java     |  10 +-
 .../apache/ratis/grpc/TestRaftServerWithGrpc.java  |  43 ++++-
 .../apache/ratis/server/ServerRestartTests.java    |  12 +-
 .../ratis/server/raftlog/TestRaftLogMetrics.java   |   8 +-
 .../org/apache/ratis/util/TestPeerProxyMap.java    |  80 +++++++++
 .../apache/ratis/util/TestTimeoutScheduler.java    |  19 ++-
 110 files changed, 1446 insertions(+), 798 deletions(-)