This is an automated email from the ASF dual-hosted git repository. sodonnell pushed a commit to branch HDDS-1880-Decom in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
commit 2504fabae87331c567a2f23602b73ec145686150 Merge: f74d73a 7db0ea8 Author: S O'Donnell <sodonn...@cloudera.com> AuthorDate: Wed Oct 14 09:50:22 2020 +0100 Merge master into HDDS-1880-Decom LICENSE.txt | 4 +- .../hadoop/hdds/scm/XceiverClientFactory.java | 38 ++ .../hadoop/hdds/scm/XceiverClientManager.java | 40 +- .../hadoop/hdds/scm/storage/BlockInputStream.java | 62 ++- .../hadoop/hdds/scm/storage/BlockOutputStream.java | 37 +- .../apache/hadoop/hdds/scm/storage/BufferPool.java | 2 +- .../hadoop/hdds/scm/storage/ChunkInputStream.java | 10 +- .../hdds/scm/storage/DummyChunkInputStream.java | 2 +- .../storage/TestBlockOutputStreamCorrectness.java | 2 +- .../hadoop/hdds/scm/ByteStringConversion.java | 18 +- .../hadoop/hdds/scm/container/ContainerInfo.java | 2 + .../hdds/scm/storage/ContainerProtocolCalls.java | 139 +++---- .../common/src/main/resources/ozone-default.xml | 12 +- .../ozone/container/keyvalue/KeyValueHandler.java | 14 +- .../container/keyvalue/impl/BlockManagerImpl.java | 15 +- .../main/resources/webapps/hddsDatanode/index.html | 4 +- hadoop-hdds/docs/content/design/typesafeconfig.md | 10 +- hadoop-hdds/docs/content/feature/Recon.md | 18 +- .../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 +- hadoop-hdds/pom.xml | 4 +- .../src/main/resources/webapps/scm/index.html | 4 +- .../ozone/client/io/BlockOutputStreamEntry.java | 30 +- .../client/io/BlockOutputStreamEntryPool.java | 34 +- .../hadoop/ozone/client/io/KeyInputStream.java | 36 +- .../hadoop/ozone/client/io/KeyOutputStream.java | 56 +-- .../apache/hadoop/ozone/client/rpc/RpcClient.java | 6 + .../main/java/org/apache/hadoop/ozone/OmUtils.java | 1 + .../hadoop/ozone/om/helpers/OmKeyLocationInfo.java | 6 +- hadoop-ozone/dev-support/checks/findbugs.sh | 7 +- .../dist/src/main/compose/ozone/docker-config | 2 +- .../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 +- .../java/org/apache/hadoop/ozone/TestDataUtil.java | 2 +- .../hadoop/ozone/TestOzoneConfigurationFields.java | 11 +- .../client/rpc/TestOzoneRpcClientAbstract.java | 67 +++- .../hadoop/ozone/client/rpc/TestReadRetries.java | 40 +- .../ozone/om/TestOzoneManagerHAMetadataOnly.java | 76 ++++ .../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 | 17 + .../dev-support/findbugsExcludeFile.xml | 21 ++ hadoop-ozone/interface-storage/pom.xml | 9 +- .../java/org/apache/hadoop/ozone/om/OMMetrics.java | 37 ++ .../ozone/om/ratis/OzoneManagerRatisServer.java | 11 +- .../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 | 56 ++- .../ozone/om/request/key/OMKeysDeleteRequest.java | 12 +- .../om/request/volume/OMVolumeCreateRequest.java | 6 + ...ponse.java => AbstractOMKeyDeleteResponse.java} | 68 ++-- .../ozone/om/response/key/OMKeyDeleteResponse.java | 73 +--- .../om/response/key/OMKeysDeleteResponse.java | 38 +- .../om/response/key/OMOpenKeysDeleteRequest.java | 192 ++++++++++ .../om/response/key/OMOpenKeysDeleteResponse.java | 72 ++++ .../main/resources/webapps/ozoneManager/index.html | 4 +- .../ozone/om/request/TestOMRequestUtils.java | 40 +- .../request/key/TestOMOpenKeysDeleteRequest.java | 419 +++++++++++++++++++++ .../om/response/key/TestOMKeysDeleteResponse.java | 12 +- .../response/key/TestOMOpenKeysDeleteResponse.java | 185 +++++++++ hadoop-ozone/pom.xml | 4 +- .../hadoop/ozone/recon/ReconServerConfigKeys.java | 48 ++- .../spi/impl/OzoneManagerServiceProviderImpl.java | 52 ++- .../spi/impl/PrometheusServiceProviderImpl.java | 17 +- .../ozone/conf/OzoneManagersCommandHandler.java | 1 + .../ozone/conf/PrintConfKeyCommandHandler.java | 5 +- .../StorageContainerManagersCommandHandler.java | 1 + .../apache/hadoop/ozone/debug/ChunkKeyHandler.java | 11 +- .../org/apache/hadoop/ozone/debug/DBScanner.java | 18 +- .../org/apache/hadoop/ozone/debug/DropTable.java | 81 ++++ .../apache/hadoop/ozone/debug/RocksDBUtils.java | 49 +++ .../hadoop/ozone/conf/TestGetConfOptions.java | 90 +++++ 81 files changed, 2491 insertions(+), 956 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: ozone-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: ozone-commits-h...@hadoop.apache.org