This is an automated email from the ASF dual-hosted git repository.
elek pushed a commit to branch HDDS-2181
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
commit 251a4a72d39d8bb0e7d7571e2a5148b4a8e503cf
Merge: 00a1160 5583014
Author: Vivek Ratnavel Subramanian <vivekratnave...@gmail.com>
AuthorDate: Fri Oct 4 15:05:38 2019 -0700
Merge remote-tracking branch 'upstream/trunk' into HDDS-2181
.../common/dev-support/findbugsExcludeFile.xml | 5 +
.../hadoop/hdds/scm/container/ContainerInfo.java | 2 +-
.../hadoop/hdds/utils/db/DBStoreBuilder.java | 24 +-
.../hadoop/hdds/utils/db/RDBCheckpointManager.java | 2 +-
.../hadoop/hdds/utils/db/RocksDBCheckpoint.java | 3 +-
.../hadoop/hdds/utils/db/RocksDBConfiguration.java | 62 +++
.../hadoop/ozone/common/ChecksumByteBuffer.java | 114 +++++
.../ozone/common/PureJavaCrc32ByteBuffer.java | 556 ++++++++++++++++++++
.../ozone/common/PureJavaCrc32CByteBuffer.java | 559 +++++++++++++++++++++
.../org/apache/hadoop/ozone/lock/ActiveLock.java | 63 ++-
.../org/apache/hadoop/ozone/lock/LockManager.java | 166 +++++-
.../apache/hadoop/ozone/web/utils/JsonUtils.java | 5 +-
.../hadoop/hdds/utils/db/TestDBStoreBuilder.java | 16 +-
.../ozone/common/TestChecksumByteBuffer.java | 102 ++++
.../apache/hadoop/ozone/lock/TestLockManager.java | 145 +++++-
.../apache/hadoop/hdds/scm/node/NodeManager.java | 8 +-
.../hadoop/hdds/scm/node/SCMNodeManager.java | 51 +-
.../hdds/scm/safemode/ContainerSafeModeRule.java | 26 +-
.../hdds/scm/server/SCMBlockProtocolServer.java | 7 +-
.../hadoop/hdds/scm/container/MockNodeManager.java | 36 +-
.../hadoop/hdds/scm/node/TestSCMNodeManager.java | 67 ++-
.../hdds/scm/safemode/TestSCMSafeModeManager.java | 6 +-
.../testutils/ReplicationNodeManagerMock.java | 5 +-
.../hdds/scm/cli/container/ListSubcommand.java | 4 +-
.../main/java/org/apache/hadoop/ozone/OmUtils.java | 97 ++--
.../java/org/apache/hadoop/ozone/TestOmUtils.java | 79 ++-
hadoop-ozone/dev-support/checks/blockade.sh | 2 +-
hadoop-ozone/dist/src/main/compose/ozone-hdfs/.env | 2 +-
.../main/compose/ozone-hdfs/docker-compose.yaml | 6 +-
.../dist/src/main/compose/ozone-mr/hadoop27/.env | 2 +-
.../compose/ozone-mr/hadoop27/docker-compose.yaml | 8 +-
.../dist/src/main/compose/ozone-mr/hadoop31/.env | 2 +-
.../compose/ozone-mr/hadoop31/docker-compose.yaml | 8 +-
.../dist/src/main/compose/ozone-mr/hadoop32/.env | 2 +-
.../compose/ozone-mr/hadoop32/docker-compose.yaml | 8 +-
.../dist/src/main/compose/ozone-om-ha/.env | 2 +-
.../main/compose/ozone-om-ha/docker-compose.yaml | 10 +-
.../dist/src/main/compose/ozone-recon/.env | 2 +-
.../main/compose/ozone-recon/docker-compose.yaml | 8 +-
.../dist/src/main/compose/ozone-topology/.env | 2 +-
.../compose/ozone-topology/docker-compose.yaml | 12 +-
hadoop-ozone/dist/src/main/compose/ozone/.env | 2 +-
.../src/main/compose/ozone/docker-compose.yaml | 6 +-
.../dist/src/main/compose/ozoneblockade/.env | 2 +-
.../main/compose/ozoneblockade/docker-compose.yaml | 8 +-
hadoop-ozone/dist/src/main/compose/ozoneperf/.env | 2 +-
.../src/main/compose/ozoneperf/docker-compose.yaml | 10 +-
.../dist/src/main/compose/ozones3-haproxy/.env | 2 +-
.../compose/ozones3-haproxy/docker-compose.yaml | 12 +-
hadoop-ozone/dist/src/main/compose/ozones3/.env | 2 +-
.../src/main/compose/ozones3/docker-compose.yaml | 8 +-
.../dist/src/main/compose/ozonescripts/.env | 2 +-
.../dist/src/main/compose/ozonesecure-mr/.env | 2 +-
.../compose/ozonesecure-mr/docker-compose.yaml | 50 +-
.../src/main/compose/ozonesecure-mr/docker-config | 28 +-
.../dist/src/main/compose/ozonesecure/.env | 2 +-
.../main/compose/ozonesecure/docker-compose.yaml | 10 +-
.../dist/src/main/smoketest/gdpr/gdpr.robot | 89 ++++
.../src/test/blockade/ozone/cluster.py | 4 +-
.../hadoop/ozone/om/TestOMDbCheckpointServlet.java | 4 -
.../ozone/om/TestOzoneManagerRocksDBLogging.java | 97 ++++
.../org/apache/hadoop/ozone/om/KeyManagerImpl.java | 1 -
.../hadoop/ozone/om/OMDBCheckpointServlet.java | 59 +--
.../java/org/apache/hadoop/ozone/om/OMMetrics.java | 10 -
.../hadoop/ozone/web/ozShell/ObjectPrinter.java | 3 +-
.../web/ozShell/bucket/AddAclBucketHandler.java | 5 +-
.../web/ozShell/bucket/GetAclBucketHandler.java | 4 +-
.../web/ozShell/bucket/RemoveAclBucketHandler.java | 7 +-
.../web/ozShell/bucket/SetAclBucketHandler.java | 5 +-
.../ozone/web/ozShell/keys/AddAclKeyHandler.java | 5 +-
.../ozone/web/ozShell/keys/GetAclKeyHandler.java | 4 +-
.../web/ozShell/keys/RemoveAclKeyHandler.java | 7 +-
.../ozone/web/ozShell/keys/SetAclKeyHandler.java | 5 +-
.../ozone/web/ozShell/token/GetTokenHandler.java | 2 +-
.../ozone/web/ozShell/token/PrintTokenHandler.java | 2 +-
.../web/ozShell/volume/AddAclVolumeHandler.java | 5 +-
.../web/ozShell/volume/GetAclVolumeHandler.java | 4 +-
.../web/ozShell/volume/RemoveAclVolumeHandler.java | 7 +-
.../web/ozShell/volume/SetAclVolumeHandler.java | 5 +-
.../hadoop/ozone/om/TestKeyDeletingService.java | 3 +
hadoop-ozone/ozonefs-lib-current/pom.xml | 3 +
.../org/apache/hadoop/ozone/recon/ReconUtils.java | 96 ++++
.../recon/recovery/ReconOmMetadataManagerImpl.java | 21 +-
.../spi/impl/ContainerDBServiceProviderImpl.java | 28 +-
.../spi/impl/OzoneManagerServiceProviderImpl.java | 33 +-
.../recon/spi/impl/ReconContainerDBProvider.java | 32 +-
.../ozone/recon/AbstractOMMetadataManagerTest.java | 2 +-
.../apache/hadoop/ozone/recon/TestReconUtils.java | 75 ++-
.../recovery/TestReconOmMetadataManagerImpl.java | 133 +++--
.../impl/TestOzoneManagerServiceProviderImpl.java | 35 +-
.../spi/impl/TestReconContainerDBProvider.java | 13 -
91 files changed, 2772 insertions(+), 470 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: hdfs-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: hdfs-commits-h...@hadoop.apache.org
