This is an automated email from the ASF dual-hosted git repository. nanda pushed a commit to branch HDDS-2823 in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
commit 3e7c427eeea00ab95c59690db3a8d28977224763 Merge: 8d74c0c 563507c Author: Nandakumar <[email protected]> AuthorDate: Sat Jun 27 01:01:30 2020 +0530 Merge branch 'master' into HDDS-2823 .github/workflows/post-commit.yml | 24 + .github/workflows/pr.yml | 50 +- .../apache/hadoop/hdds/scm/XceiverClientGrpc.java | 7 +- .../apache/hadoop/hdds/scm/XceiverClientRatis.java | 5 +- .../apache/hadoop/hdds/scm/pipeline/Pipeline.java | 28 +- .../java/org/apache/hadoop/ozone/OzoneConsts.java | 10 - .../common/src/main/resources/ozone-default.xml | 9 - .../protocol/StorageContainerNodeProtocol.java | 2 +- .../docs/content/design/ozone-volume-management.md | 31 +- .../apache/hadoop/hdds/utils/db/DBCheckpoint.java | 29 - .../hadoop/hdds/utils/db/RocksDBCheckpoint.java | 22 - .../hdds/scm/container/ReplicationManager.java | 18 +- .../hdds/scm/container/SCMContainerManager.java | 49 +- .../hadoop/hdds/scm/node/SCMNodeManager.java | 2 +- .../hadoop/hdds/scm/pipeline/PipelineStateMap.java | 72 +- .../hdds/scm/pipeline/SCMPipelineManager.java | 2 +- .../hdds/scm/server/SCMClientProtocolServer.java | 8 +- .../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 +- .../apache/hadoop/ozone/client/rpc/RpcClient.java | 2 +- .../org/apache/hadoop/ozone/om/OMConfigKeys.java | 4 +- .../apache/hadoop/ozone/om/helpers/OmKeyInfo.java | 23 +- .../ozone/om/helpers/OmKeyLocationInfoGroup.java | 12 +- .../hadoop/ozone/om/helpers/OzoneAclUtil.java | 19 +- .../ozone/om/protocol/OzoneManagerHAProtocol.java | 39 - .../om/protocol/OzoneManagerServerProtocol.java | 28 - 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 +- .../apache/hadoop/ozone/MiniOzoneChaosCluster.java | 4 +- .../hadoop/ozone/TestOzoneConfigurationFields.java | 3 +- .../apache/hadoop/ozone/om/TestKeyManagerImpl.java | 4 +- .../hadoop/ozone/om/TestOMDbCheckpointServlet.java | 18 - .../hadoop/ozone/om/TestOMRatisSnapshots.java | 9 +- .../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 | 105 +- .../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 + .../ozone/om/request/key/OMKeyCommitRequest.java | 12 +- .../om/snapshot/OzoneManagerSnapshotProvider.java | 34 +- .../ozone/om/ratis/TestOMRatisSnapshotInfo.java | 65 - .../om/ratis/TestOzoneManagerRatisServer.java | 22 +- .../om/ratis/TestOzoneManagerStateMachine.java | 20 +- .../security/acl/TestOzoneNativeAuthorizer.java | 2 +- .../fs/ozone/BasicOzoneClientAdapterImpl.java | 122 +- hadoop-ozone/ozonefs-hadoop2/pom.xml | 2 +- .../hadoop/fs/ozone/Hadoop27RpcTransport.java | 7 +- 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 ------------------ .../org/apache/hadoop/ozone/debug/DBScanner.java | 145 + .../org/apache/hadoop/ozone/debug/ListTables.java | 51 + .../org/apache/hadoop/ozone/debug/OzoneDebug.java | 3 +- .../org/apache/hadoop/ozone/debug/RDBParser.java | 48 + .../apache/hadoop/ozone/freon/OmKeyGenerator.java | 2 +- pom.xml | 2 +- 71 files changed, 18149 insertions(+), 17485 deletions(-) diff --cc hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java index 41f68b6,cbd5db5..fadfd83 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java @@@ -67,10 -65,10 +67,11 @@@ public class TestOzoneConfigurationFiel HddsConfigKeys.HDDS_SECURITY_PROVIDER, HddsConfigKeys.HDDS_X509_CRL_NAME, // HDDS-2873 OMConfigKeys.OZONE_OM_NODES_KEY, + ScmConfigKeys.OZONE_SCM_NODES_KEY, OzoneConfigKeys.OZONE_ACL_AUTHORIZER_CLASS_NATIVE, OzoneConfigKeys.OZONE_S3_AUTHINFO_MAX_LIFETIME_KEY, - ReconServerConfigKeys.OZONE_RECON_SCM_DB_DIR + ReconServerConfigKeys.OZONE_RECON_SCM_DB_DIR, + OMConfigKeys.OZONE_OM_RATIS_SNAPSHOT_AUTO_TRIGGER_THRESHOLD_KEY // TODO HDDS-2856 )); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
