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 cfabf1ab287beb1cde4a604b112a0fffcc5c8135
Merge: a837ada 1a93d9d
Author: Vivek Ratnavel Subramanian <vivekratnave...@gmail.com>
AuthorDate: Fri Sep 27 13:30:44 2019 -0700
Merge remote-tracking branch 'upstream/trunk' into HDDS-2181
hadoop-hdds/common/pom.xml | 4 +-
.../hadoop/hdds/conf/ConfigFileGenerator.java | 5 +-
hadoop-hdds/container-service/pom.xml | 9 +-
hadoop-hdds/pom.xml | 15 ---
hadoop-hdds/server-scm/pom.xml | 4 +-
.../hdds/scm/container/SCMContainerManager.java | 31 +++++-
.../metrics/SCMContainerManagerMetrics.java | 90 +++++++++++++++++
.../hdds/scm/container/metrics/package-info.java | 22 ++++
hadoop-ozone/common/pom.xml | 4 +-
.../main/java/org/apache/hadoop/ozone/OmUtils.java | 40 ++++++--
.../src/main/proto/OzoneManagerProtocol.proto | 2 +
hadoop-ozone/csi/pom.xml | 4 +-
hadoop-ozone/dev-support/checks/findbugs.sh | 12 ++-
hadoop-ozone/dist/src/main/compose/testlib.sh | 15 ++-
hadoop-ozone/insight/pom.xml | 9 +-
.../metrics/TestSCMContainerManagerMetrics.java | 112 +++++++++++++++++++++
.../client/rpc/TestOzoneRpcClientAbstract.java | 76 +++++++++++++-
hadoop-ozone/ozone-manager/pom.xml | 5 +-
.../org/apache/hadoop/ozone/om/KeyManagerImpl.java | 49 ++++-----
.../request/s3/bucket/S3BucketCreateRequest.java | 3 +-
.../om/request/volume/OMVolumeCreateRequest.java | 2 +-
.../om/request/volume/OMVolumeDeleteRequest.java | 3 +-
.../ozone/om/request/volume/OMVolumeRequest.java | 18 +++-
.../om/request/volume/OMVolumeSetOwnerRequest.java | 6 +-
.../om/response/bucket/OMBucketDeleteResponse.java | 1 -
.../ozone/om/response/key/OMKeyCommitResponse.java | 3 +-
.../ozone/om/response/key/OMKeyDeleteResponse.java | 16 +--
.../ozone/om/response/key/OMKeyPurgeResponse.java | 3 +-
.../ozone/om/response/key/OMKeyRenameResponse.java | 4 +-
.../multipart/S3MultipartUploadAbortResponse.java | 12 +--
.../S3MultipartUploadCommitPartResponse.java | 34 +++----
.../ozone/om/request/TestOMRequestUtils.java | 19 ++--
.../ozone/om/response/TestOMResponseUtils.java | 2 +
.../volume/TestOMVolumeCreateResponse.java | 1 +
.../volume/TestOMVolumeDeleteResponse.java | 5 +-
.../volume/TestOMVolumeSetOwnerResponse.java | 9 +-
hadoop-ozone/ozonefs-lib-current/pom.xml | 4 +-
hadoop-ozone/ozonefs-lib-legacy/pom.xml | 4 +-
hadoop-ozone/ozonefs/pom.xml | 5 +-
hadoop-ozone/pom.xml | 8 --
hadoop-ozone/recon/pom.xml | 4 +-
hadoop-ozone/s3gateway/pom.xml | 5 +-
hadoop-ozone/tools/pom.xml | 9 +-
hadoop-ozone/upgrade/pom.xml | 5 +-
pom.ozone.xml | 29 +++---
45 files changed, 540 insertions(+), 182 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: hdfs-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: hdfs-commits-h...@hadoop.apache.org
