This is an automated email from the ASF dual-hosted git repository. erose pushed a commit to branch HDDS-10239-container-reconciliation in repository https://gitbox.apache.org/repos/asf/ozone.git
commit 5cd6a072b205e8ffaf946e31997ba1f54c7bd485 Merge: 3355701853 4001f9a230 Author: Ethan Rose <[email protected]> AuthorDate: Fri Aug 23 17:30:16 2024 -0400 Merge branch 'master' into HDDS-10239-container-reconciliation * master: HDDS-11081. Use thread-local instance of FileSystem in Freon tests (#7091) HDDS-11333. Avoid hard-coded current version in upgrade/xcompat tests (#7089) Mark TestPipelineManagerMXBean#testPipelineInfo as flaky Mark TestAddRemoveOzoneManager#testForceBootstrap as flaky HDDS-11352. HDDS-11353. Mark TestOzoneManagerHAWithStoppedNodes as flaky HDDS-11354. Mark TestOzoneManagerSnapshotAcl#testLookupKeyWithNotAllowedUserForPrefixAcl as flaky HDDS-11355. Mark TestMultiBlockWritesWithDnFailures#testMultiBlockWritesWithIntermittentDnFailures as flaky HDDS-11227. Use server default key provider to encrypt/decrypt keys from multiple OMs. (#7081) HDDS-11316. Improve Create Key and Chunk IO Dashboards (#7075) HDDS-11239. Fix KeyOutputStream's exception handling when calling hsync concurrently (#7047) .../org/apache/hadoop/hdds/scm/ErrorInjector.java | 31 ++ .../hadoop/hdds/scm/XceiverClientCreator.java | 8 +- .../hadoop/hdds/scm/XceiverClientManager.java | 1 + .../apache/hadoop/hdds/scm/XceiverClientRatis.java | 16 +- .../hadoop/hdds/scm/storage/BlockOutputStream.java | 82 ++-- .../org/apache/hadoop/ozone/OzoneConfigKeys.java | 7 + .../common/src/main/resources/ozone-default.xml | 13 + .../server/ratis/ContainerStateMachine.java | 8 +- .../apache/hadoop/ozone/client/ObjectStore.java | 5 + .../ozone/client/io/BlockOutputStreamEntry.java | 59 ++- .../client/io/BlockOutputStreamEntryPool.java | 17 +- .../client/io/ECBlockOutputStreamEntryPool.java | 2 +- .../hadoop/ozone/client/io/ECKeyOutputStream.java | 2 +- .../hadoop/ozone/client/io/KeyOutputStream.java | 96 ++++- .../ozone/client/protocol/ClientProtocol.java | 8 + .../apache/hadoop/ozone/client/rpc/RpcClient.java | 27 +- .../ozone/client/io/TestKeyOutputStream.java | 4 +- .../main/java/org/apache/hadoop/ozone/OmUtils.java | 1 + .../apache/hadoop/ozone/OzoneFsServerDefaults.java | 59 +++ .../ozone/om/protocol/OzoneManagerProtocol.java | 9 + ...OzoneManagerProtocolClientSideTranslatorPB.java | 19 + .../Datanode Chunk Read_Write Dashboard.json | 181 +++++---- .../dashboards/Ozone - CreateKey Metrics.json | 414 ++++++++++++++++++--- hadoop-ozone/dist/src/main/compose/upgrade/test.sh | 2 +- hadoop-ozone/dist/src/main/compose/xcompat/test.sh | 5 +- .../java/org/apache/hadoop/fs/ozone/TestHSync.java | 131 +++++++ .../scm/pipeline/TestPipelineManagerMXBean.java | 2 + .../ozone/client/rpc/OzoneRpcClientTests.java | 6 + .../rpc/TestMultiBlockWritesWithDnFailures.java | 2 + .../ozone/client/rpc/TestSecureOzoneRpcClient.java | 11 + .../ozone/freon/TestHadoopDirTreeGenerator.java | 6 +- .../hadoop/ozone/om/TestAddRemoveOzoneManager.java | 2 + .../om/TestOzoneManagerHAWithStoppedNodes.java | 4 + .../om/snapshot/TestOzoneManagerSnapshotAcl.java | 2 + .../src/main/proto/OmClientProtocol.proto | 14 + .../org/apache/hadoop/ozone/om/OzoneManager.java | 17 + .../protocolPB/OzoneManagerRequestHandler.java | 7 + .../fs/ozone/BasicOzoneClientAdapterImpl.java | 6 + .../hadoop/fs/ozone/BasicOzoneFileSystem.java | 6 + .../ozone/BasicRootedOzoneClientAdapterImpl.java | 6 + .../fs/ozone/BasicRootedOzoneFileSystem.java | 6 + .../apache/hadoop/fs/ozone/OzoneClientAdapter.java | 3 + .../hadoop/ozone/client/ClientProtocolStub.java | 6 + .../ozone/freon/HadoopBaseFreonGenerator.java | 85 +++++ .../hadoop/ozone/freon/HadoopDirTreeGenerator.java | 25 +- .../hadoop/ozone/freon/HadoopFsGenerator.java | 59 +-- .../hadoop/ozone/freon/HadoopFsValidator.java | 28 +- .../ozone/freon/HadoopNestedDirGenerator.java | 24 +- .../apache/hadoop/ozone/freon/HsyncGenerator.java | 21 +- 49 files changed, 1214 insertions(+), 341 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
