You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by si...@apache.org on 2020/06/16 16:59:47 UTC
[hadoop-ozone] 01/01: Merge remote-tracking branch 'asf/master'
into HDDS-2665-ofs
This is an automated email from the ASF dual-hosted git repository.
siyao pushed a commit to branch HDDS-2665-ofs
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
commit 04dc11cf918a19d73a0ba087d44fe6e6fc4adead
Merge: 27348b1 c5b0ba6
Author: Siyao Meng <sm...@cloudera.com>
AuthorDate: Tue Jun 16 09:40:43 2020 -0700
Merge remote-tracking branch 'asf/master' into HDDS-2665-ofs
.github/workflows/post-commit.yml | 133 +-
.github/workflows/pr.yml | 133 +-
.../apache/hadoop/hdds/conf/RatisClientConfig.java | 86 -
.../hadoop/hdds/scm/client/HddsClientUtils.java | 4 +-
.../java/org/apache/hadoop/hdds/StringUtils.java | 5 +
.../org/apache/hadoop/hdds/ratis/RatisHelper.java | 214 +-
.../hadoop/hdds/ratis/conf/RatisClientConfig.java | 183 +
.../hadoop/hdds/ratis}/conf/package-info.java | 2 +-
.../org/apache/hadoop/hdds/scm/ScmConfigKeys.java | 10 +-
.../org/apache/hadoop/ozone/OzoneConfigKeys.java | 10 +-
.../java/org/apache/hadoop/ozone/OzoneConsts.java | 10 -
.../common/src/main/resources/ozone-default.xml | 22 -
.../protocol/StorageContainerNodeProtocol.java | 2 +-
.../apache/hadoop/hdds/utils/db/DBCheckpoint.java | 29 -
.../hadoop/hdds/utils/db/RocksDBCheckpoint.java | 22 -
hadoop-hdds/interface-client/pom.xml | 4 +
.../hdds/scm/container/ReplicationManager.java | 18 +-
.../hdds/scm/container/SCMContainerManager.java | 49 +-
.../hadoop/hdds/scm/node/SCMNodeManager.java | 2 +-
.../hdds/scm/pipeline/SCMPipelineManager.java | 2 +-
.../hdds/scm/server/StorageContainerManager.java | 3 +-
.../hadoop/hdds/scm/block/TestBlockManager.java | 63 +-
.../hadoop/hdds/scm/container/MockNodeManager.java | 2 +-
.../hdds/scm/container/TestReplicationManager.java | 13 +-
.../testutils/ReplicationNodeManagerMock.java | 2 +-
.../org/apache/hadoop/ozone/om/OMConfigKeys.java | 4 +-
.../ozone/om/protocol/OzoneManagerHAProtocol.java | 39 -
.../om/protocol/OzoneManagerServerProtocol.java | 28 -
.../org/apache/hadoop/ozone/csi/CsiServer.java | 16 +-
.../org/apache/hadoop/ozone/csi/NodeService.java | 17 +-
hadoop-ozone/dev-support/checks/checkstyle.sh | 2 +-
hadoop-ozone/dev-support/checks/findbugs.sh | 2 +-
hadoop-ozone/dev-support/checks/integration.sh | 4 +-
hadoop-ozone/dev-support/checks/sonar.sh | 2 +-
hadoop-ozone/dev-support/checks/unit.sh | 2 +-
.../src/main/compose/ozone-topology/docker-config | 2 +-
.../main/k8s/definitions/ozone-csi/csi-node.yaml | 2 +-
.../k8s/definitions/prometheus/deployment.yaml | 2 +-
.../examples/ozone-dev/csi/csi-node-daemonset.yaml | 2 +-
.../examples/ozone-dev/prometheus-deployment.yaml | 2 +-
.../k8s/examples/ozone/csi/csi-node-daemonset.yaml | 2 +-
hadoop-ozone/dist/src/shell/ozone/ozone | 4 +-
.../apache/hadoop/ozone/MiniOzoneChaosCluster.java | 4 +-
.../hadoop/ozone/TestOzoneConfigurationFields.java | 3 +-
.../ozone/client/rpc/Test2WayCommitInRatis.java | 6 -
.../rpc/TestBlockOutputStreamWithFailures.java | 5 +-
...estBlockOutputStreamWithFailuresFlushDelay.java | 5 +-
.../hadoop/ozone/client/rpc/TestCommitWatcher.java | 8 +-
.../TestContainerStateMachineFailureOnRead.java | 6 +-
.../rpc/TestContainerStateMachineFailures.java | 9 +-
.../client/rpc/TestDeleteWithSlowFollower.java | 8 +-
.../client/rpc/TestFailureHandlingByClient.java | 8 +-
.../rpc/TestFailureHandlingByClientFlushDelay.java | 8 +-
.../rpc/TestMultiBlockWritesWithDnFailures.java | 8 +-
.../ozone/client/rpc/TestWatchForCommit.java | 7 -
.../hadoop/ozone/om/TestOMDbCheckpointServlet.java | 18 -
.../hadoop/ozone/om/TestOMRatisSnapshots.java | 16 +-
.../apache/hadoop/ozone/om/TestOzoneManagerHA.java | 4 +-
.../ozone/om/TestOzoneManagerHAWithData.java | 26 +-
.../snapshot/TestOzoneManagerSnapshotProvider.java | 28 +-
.../hadoop/ozone/om/OMDBCheckpointServlet.java | 28 -
.../hadoop/ozone/om/OmMetadataManagerImpl.java | 20 +-
.../org/apache/hadoop/ozone/om/OzoneManager.java | 155 +-
.../apache/hadoop/ozone/om/ha/OMNodeDetails.java | 6 +-
.../hadoop/ozone/om/ratis/OMRatisSnapshotInfo.java | 116 +-
.../hadoop/ozone/om/ratis/OMTransactionInfo.java | 13 +
.../ozone/om/ratis/OzoneManagerRatisServer.java | 21 +-
.../ozone/om/ratis/OzoneManagerStateMachine.java | 45 +-
.../om/ratis/utils/OzoneManagerRatisUtils.java | 67 +
.../om/snapshot/OzoneManagerSnapshotProvider.java | 34 +-
.../ozone/om/ratis/TestOMRatisSnapshotInfo.java | 65 -
.../om/ratis/TestOzoneManagerRatisServer.java | 22 +-
.../om/ratis/TestOzoneManagerStateMachine.java | 20 +-
hadoop-ozone/pom.xml | 1 +
hadoop-ozone/recon/pom.xml | 25 +-
.../webapps/recon/ozone-recon-web/README.md | 13 +-
.../webapps/recon/ozone-recon-web/pnpm-lock.yaml | 17167 +++++++++++++++++++
.../webapps/recon/ozone-recon-web/yarn.lock | 16784 ------------------
.../hadoop/ozone/s3/exception/S3ErrorTable.java | 6 +
pom.xml | 4 +-
80 files changed, 18143 insertions(+), 17801 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-commits-help@hadoop.apache.org