This is an automated email from the ASF dual-hosted git repository. avijayan pushed a change to branch HDDS-3698-upgrade in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git.
from 0d014c0 HDDS-4314. OM Layout Version Manager init throws silent CNF error in integration tests. (#1492) add efaa4fc HDDS-4309. Fix inconsistency in recon config keys starting with recon and not ozone (#1478) add e0a3baf HDDS-4325. Incompatible return codes from Ozone getconf -confKey (#1485). Contributed by Doroszlai, Attila. add 55d1e91 HDDS-4316. Upgrade to angular 1.8.0 due to CVE-2020-7676 (#1481) add d08a4c1 HDDS-3728. Bucket space: check quotaUsageInBytes when write key and allocate block. (#1458) add 7704cb5 HDDS-3814. Drop a column family through debug cli tool (#1083) add a1d53b0 HDDS-4311. Type-safe config design doc points to OM HA (#1477) add 5c5d8cb HDDS-4312. findbugs check succeeds despite compile error (#1476) add 35cc6b0 HDDS-4285. Read is slow due to frequent calls to UGI.getCurrentUser() and getTokens() (#1454) add c956ce6 HDDS-4262. Use ClientID and CallID from Rpc Client to detect retry requests (#1436) add dc889b4 Remove extra serialization from getBlockID (#1470) add 7ae037e HDDS-4336. ContainerInfo does not persist BCSID (sequenceId) leading to failed replica reports (#1488) add 7db0ea8 HDDS-4122. Implement OM Delete Expired Open Key Request and Response (#1435) add 2650723 HDDS-4343. ReplicationManager.handleOverReplicatedContainer() does not handle unhealthyReplicas properly. (#1495) add 814428e HDDS-3995. Fix s3g met NPE exception while write file by multiPartUpload (#1499) add 342bf6d HDDS-4327. Potential resource leakage using BatchOperation. (#1493) add aff7c52 HDDS-4269. Ozone DataNode thinks a volume is failed if an unexpected file is in the HDDS root directory. (#1490) add 8fab5f2 HDDS-2922. Balance ratis leader distribution in datanodes (#1371) add 25e2046 HDDS-4297. Allow multiple transactions per container to be sent for deletion by SCM. add 9baaf64 HDDS-4158. Provide a class type for Java based configuration (#1407) add 049793d HDDS-4301. SCM CA certificate does not encode KeyUsage extension properly (#1468) add 10df489 HDDS-4328. Provide fallback cache restore key (#1505) add 4e1d2ef HDDS-4306. Ozone checkstyle rule can't be imported to IntelliJ. (#1472) add 6ba64bf HDDS-4359. Expose VolumeIOStats in DN JMX (#1506) add c1069a6 HDDS-4362. Change hadoop32 test to use 3.2 image (#1521) add 6112603 HDDS-4088. Adding Owner info for Authorizer plugin to honor owner access rights (#1395) add 808aabd HDDS-3882. Update modification time when updating volume/bucket/key ACLs (#1301) add 18711f3 HDDS-4388. Make writeStateMachineTimeout retry count proportional to node failure timeout (#1519) add 5e5635f HDDS-4386: Each EndpointStateMachine uses its own thread pool to talk with SCM/Recon (#1518) new b8dcf6b Merge remote-tracking branch 'upstream/master' into HDDS-3698-upgrade new d4212a7 Fix copilation issue after mergee The 2 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: .github/workflows/post-commit.yml | 3 + LICENSE.txt | 4 +- .../hadoop/hdds/scm/storage/BlockInputStream.java | 8 +- .../hadoop/hdds/scm/storage/BlockOutputStream.java | 15 +- .../hadoop/hdds/scm/storage/ChunkInputStream.java | 10 +- .../hadoop/hdds/scm/storage/CommitWatcher.java | 2 +- .../hdds/scm/storage/DummyChunkInputStream.java | 2 +- .../storage/TestBlockOutputStreamCorrectness.java | 2 +- .../org/apache/hadoop/hdds/ratis/RatisHelper.java | 19 + .../org/apache/hadoop/hdds/scm/ScmConfigKeys.java | 3 + .../hadoop/hdds/scm/container/ContainerInfo.java | 2 + .../hadoop/hdds/scm/exceptions/SCMException.java | 3 +- .../apache/hadoop/hdds/scm/pipeline/Pipeline.java | 42 +- .../hdds/scm/storage/ContainerProtocolCalls.java | 139 +- .../common/src/main/resources/ozone-default.xml | 30 +- .../hadoop/hdds/conf/SimpleConfiguration.java | 13 + .../hadoop/hdds/conf/TestOzoneConfiguration.java | 7 +- .../org/apache/hadoop/hdds/conf/ConfigType.java | 3 +- .../hdds/conf/ConfigurationReflectionUtil.java | 12 + .../common/statemachine/EndpointStateMachine.java | 16 + .../CreatePipelineCommandHandler.java | 10 +- .../commandhandler/DeleteBlocksCommandHandler.java | 65 +- .../states/datanode/RunningDatanodeState.java | 8 +- .../common/transport/server/XceiverServerSpi.java | 10 +- .../transport/server/ratis/XceiverServerRatis.java | 55 +- .../container/common/utils/HddsVolumeUtil.java | 5 + .../ozone/container/common/volume/HddsVolume.java | 8 +- .../container/common/volume/VolumeIOStats.java | 72 +- .../container/keyvalue/impl/BlockManagerImpl.java | 85 +- .../background/BlockDeletingService.java | 45 +- .../protocol/commands/CreatePipelineCommand.java | 46 +- .../main/resources/webapps/hddsDatanode/index.html | 4 +- .../TestCreatePipelineCommandHandler.java | 7 +- hadoop-hdds/dev-support/checkstyle/checkstyle.xml | 4 +- hadoop-hdds/docs/content/design/typesafeconfig.md | 10 +- hadoop-hdds/docs/content/feature/Recon.md | 2 +- .../certificates/utils/CertificateSignRequest.java | 2 +- .../certificates/utils/SelfSignedCertificate.java | 4 +- .../resources/webapps/static/angular-1.7.9.min.js | 350 - .../resources/webapps/static/angular-1.8.0.min.js | 350 + ...ute-1.7.9.min.js => angular-route-1.8.0.min.js} | 6 +- .../interface-client/src/main/proto/hdds.proto | 1 + .../proto/ScmServerDatanodeHeartbeatProtocol.proto | 1 + .../src/main/proto/ScmServerProtocol.proto | 1 + hadoop-hdds/pom.xml | 4 +- .../block/DatanodeDeletedBlockTransactions.java | 32 +- .../hadoop/hdds/scm/block/DeletedBlockLogImpl.java | 19 +- .../hdds/scm/container/ReplicationManager.java | 3 +- .../hdds/scm/container/SCMContainerManager.java | 28 +- .../hdds/scm/pipeline/PipelineStateManager.java | 3 +- .../hdds/scm/pipeline/RatisPipelineProvider.java | 29 +- .../algorithms/DefaultLeaderChoosePolicy.java} | 26 +- .../choose/algorithms/LeaderChoosePolicy.java | 55 + .../algorithms/LeaderChoosePolicyFactory.java | 75 + .../algorithms/MinLeaderCountChoosePolicy.java | 91 + .../leader/choose/algorithms}/package-info.java | 6 +- .../src/main/resources/webapps/scm/index.html | 4 +- .../hadoop/hdds/scm/block/TestDeletedBlockLog.java | 17 +- .../choose/algorithms/TestLeaderChoosePolicy.java | 74 + .../ozone/client/io/BlockOutputStreamEntry.java | 8 +- .../client/io/BlockOutputStreamEntryPool.java | 5 +- .../main/java/org/apache/hadoop/ozone/OmUtils.java | 1 + .../hadoop/ozone/om/helpers/OmKeyLocationInfo.java | 6 +- ...OzoneManagerProtocolClientSideTranslatorPB.java | 4 +- .../hadoop/ozone/security/acl/OzoneObjInfo.java | 10 + .../hadoop/ozone/security/acl/RequestContext.java | 48 +- hadoop-ozone/dev-support/checks/findbugs.sh | 7 +- .../dist/src/main/compose/ozone-mr/hadoop32/.env | 6 +- .../dist/src/main/compose/ozone/docker-config | 2 +- .../dist/src/main/compose/ozonesecure-mr/.env | 3 +- .../compose/ozonesecure-mr/docker-compose.yaml | 8 +- .../dist/src/main/compose/ozonesecure-mr/test.sh | 1 + .../main/compose/ozonesecure-om-ha/docker-config | 4 +- .../src/main/compose/ozonesecure/docker-config | 4 +- .../dist/src/main/compose/upgrade/docker-config | 2 +- hadoop-ozone/dist/src/main/license/bin/LICENSE.txt | 4 +- .../dist/src/main/smoketest/basic/getconf.robot | 37 +- .../hdds/scm/pipeline/TestLeaderChoosePolicy.java | 216 + .../TestRatisPipelineCreateAndDestroy.java | 2 +- .../java/org/apache/hadoop/ozone/TestDataUtil.java | 13 +- .../apache/hadoop/ozone/TestMiniOzoneCluster.java | 4 +- .../hadoop/ozone/TestOzoneConfigurationFields.java | 11 +- .../client/rpc/TestOzoneRpcClientAbstract.java | 67 +- .../container/metrics/TestContainerMetrics.java | 14 + .../org/apache/hadoop/ozone/om/TestOmAcls.java | 9 +- .../ozone/om/TestOzoneManagerHAMetadataOnly.java | 76 + .../ozone/om/TestOzoneManagerListVolumes.java | 36 +- .../ozone/om/TestOzoneManagerRocksDBLogging.java | 2 +- .../ozone/recon/TestReconWithOzoneManager.java | 32 +- .../hadoop/ozone/scm/TestCloseContainer.java | 148 + .../hadoop/ozone/scm/TestContainerSmallFile.java | 20 +- .../scm/TestGetCommittedBlockLengthAndPutKey.java | 4 +- .../hadoop/ozone/scm/TestXceiverClientGrpc.java | 6 +- .../src/main/proto/OmClientProtocol.proto | 20 + .../dev-support/findbugsExcludeFile.xml | 2 +- hadoop-ozone/interface-storage/pom.xml | 9 +- .../java/org/apache/hadoop/ozone/om/OMMetrics.java | 37 + .../org/apache/hadoop/ozone/om/OzoneManager.java | 87 +- .../ozone/om/ratis/OzoneManagerRatisServer.java | 16 +- .../hadoop/ozone/om/request/OMClientRequest.java | 26 +- .../om/request/bucket/acl/OMBucketAclRequest.java | 15 + .../request/bucket/acl/OMBucketAddAclRequest.java | 15 + .../bucket/acl/OMBucketRemoveAclRequest.java | 15 + .../request/bucket/acl/OMBucketSetAclRequest.java | 15 + .../ozone/om/request/file/OMFileCreateRequest.java | 3 +- .../om/request/key/OMAllocateBlockRequest.java | 3 +- .../ozone/om/request/key/OMKeyCreateRequest.java | 3 +- .../ozone/om/request/key/OMKeyDeleteRequest.java | 11 +- .../hadoop/ozone/om/request/key/OMKeyRequest.java | 90 +- .../ozone/om/request/key/OMKeysDeleteRequest.java | 16 +- .../ozone/om/request/key/OMKeysRenameRequest.java | 9 +- .../ozone/om/request/key/acl/OMKeyAclRequest.java | 15 + .../om/request/key/acl/OMKeyAddAclRequest.java | 15 + .../om/request/key/acl/OMKeyRemoveAclRequest.java | 15 + .../om/request/key/acl/OMKeySetAclRequest.java | 15 + .../request/key/acl/prefix/OMPrefixAclRequest.java | 7 + .../hadoop/ozone/om/request/util/ObjectParser.java | 6 +- .../om/request/volume/OMVolumeCreateRequest.java | 6 + .../om/request/volume/OMVolumeSetOwnerRequest.java | 2 +- .../om/request/volume/acl/OMVolumeAclRequest.java | 14 + .../request/volume/acl/OMVolumeAddAclRequest.java | 15 + .../volume/acl/OMVolumeRemoveAclRequest.java | 15 + .../request/volume/acl/OMVolumeSetAclRequest.java | 15 + ...ponse.java => AbstractOMKeyDeleteResponse.java} | 68 +- .../ozone/om/response/key/OMKeyDeleteResponse.java | 73 +- .../om/response/key/OMKeysDeleteResponse.java | 38 +- .../om/response/key/OMOpenKeysDeleteRequest.java | 192 + ...Response.java => OMOpenKeysDeleteResponse.java} | 57 +- .../ozone/security/acl/OzoneNativeAuthorizer.java | 44 +- .../main/resources/webapps/ozoneManager/index.html | 4 +- .../ozone/om/request/TestOMRequestUtils.java | 100 +- .../bucket/acl/TestOMBucketAddAclRequest.java | 119 + .../bucket/acl/TestOMBucketRemoveAclRequest.java | 137 + .../bucket/acl/TestOMBucketSetAclRequest.java | 125 + .../ozone/om/request/bucket/acl/package-info.java | 4 +- .../ozone/om/request/key/TestOMKeyAclRequest.java | 155 +- .../key/TestOMKeyPurgeRequestAndResponse.java | 15 +- .../request/key/TestOMOpenKeysDeleteRequest.java | 419 + .../volume/acl/TestOMVolumeAddAclRequest.java | 7 + .../volume/acl/TestOMVolumeRemoveAclRequest.java | 8 + .../volume/acl/TestOMVolumeSetAclRequest.java | 7 + .../bucket/TestOMBucketCreateResponse.java | 8 + .../bucket/TestOMBucketDeleteResponse.java | 8 + .../bucket/TestOMBucketSetPropertyResponse.java | 9 + .../file/TestOMDirectoryCreateResponse.java | 8 + .../ozone/om/response/key/TestOMKeyResponse.java | 3 + .../om/response/key/TestOMKeysDeleteResponse.java | 12 +- .../response/key/TestOMOpenKeysDeleteResponse.java | 185 + .../s3/multipart/TestS3MultipartResponse.java | 9 + .../security/TestOMDelegationTokenResponse.java | 8 + .../volume/TestOMVolumeCreateResponse.java | 8 + .../volume/TestOMVolumeDeleteResponse.java | 8 + .../volume/TestOMVolumeSetOwnerResponse.java | 9 + .../volume/TestOMVolumeSetQuotaResponse.java | 9 + .../hadoop/ozone/security/acl/TestVolumeOwner.java | 298 + hadoop-ozone/pom.xml | 4 +- .../hadoop/ozone/recon/ReconServerConfigKeys.java | 48 +- .../spi/impl/OzoneManagerServiceProviderImpl.java | 52 +- .../spi/impl/PrometheusServiceProviderImpl.java | 17 +- .../webapps/recon/ozone-recon-web/pnpm-lock.yaml | 17167 ------------------- .../recon/tasks/TestContainerKeyMapperTask.java | 2 +- .../hadoop/ozone/s3/endpoint/ObjectEndpoint.java | 5 +- .../ozone/conf/PrintConfKeyCommandHandler.java | 3 +- .../apache/hadoop/ozone/debug/ChunkKeyHandler.java | 11 +- .../org/apache/hadoop/ozone/debug/DBScanner.java | 18 +- .../org/apache/hadoop/ozone/debug/DropTable.java | 81 + .../GetAclHandler.java => debug/RocksDBUtils.java} | 33 +- pom.xml | 4 +- 168 files changed, 4583 insertions(+), 18320 deletions(-) delete mode 100644 hadoop-hdds/framework/src/main/resources/webapps/static/angular-1.7.9.min.js create mode 100644 hadoop-hdds/framework/src/main/resources/webapps/static/angular-1.8.0.min.js rename hadoop-hdds/framework/src/main/resources/webapps/static/{angular-route-1.7.9.min.js => angular-route-1.8.0.min.js} (97%) copy hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/{choose/algorithms/RandomPipelineChoosePolicy.java => leader/choose/algorithms/DefaultLeaderChoosePolicy.java} (54%) create mode 100644 hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/leader/choose/algorithms/LeaderChoosePolicy.java create mode 100644 hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/leader/choose/algorithms/LeaderChoosePolicyFactory.java create mode 100644 hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/leader/choose/algorithms/MinLeaderCountChoosePolicy.java copy hadoop-hdds/{client/src/test/java/org/apache/hadoop/hdds/scm/storage => server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/leader/choose/algorithms}/package-info.java (88%) create mode 100644 hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/leader/choose/algorithms/TestLeaderChoosePolicy.java create mode 100644 hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestLeaderChoosePolicy.java create mode 100644 hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestCloseContainer.java copy {hadoop-hdds/interface-server => hadoop-ozone/interface-storage}/dev-support/findbugsExcludeFile.xml (93%) copy hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/{OMKeyDeleteResponse.java => AbstractOMKeyDeleteResponse.java} (64%) create mode 100644 hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMOpenKeysDeleteRequest.java copy hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/{OMKeyRenameResponse.java => OMOpenKeysDeleteResponse.java} (55%) create mode 100644 hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/acl/TestOMBucketAddAclRequest.java create mode 100644 hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/acl/TestOMBucketRemoveAclRequest.java create mode 100644 hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/acl/TestOMBucketSetAclRequest.java copy hadoop-ozone/ozone-manager/src/{main => test}/java/org/apache/hadoop/ozone/om/request/bucket/acl/package-info.java (92%) create mode 100644 hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMOpenKeysDeleteRequest.java create mode 100644 hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMOpenKeysDeleteResponse.java create mode 100644 hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestVolumeOwner.java delete mode 100644 hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/pnpm-lock.yaml create mode 100644 hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/DropTable.java copy hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/{shell/acl/GetAclHandler.java => debug/RocksDBUtils.java} (54%) --------------------------------------------------------------------- To unsubscribe, e-mail: ozone-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: ozone-commits-h...@hadoop.apache.org