You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by av...@apache.org on 2021/02/18 05:33:26 UTC
[ozone] 01/02: Merge remote-tracking branch 'upstream/master' into
HDDS-3698-nonrolling-upgrade
This is an automated email from the ASF dual-hosted git repository.
avijayan pushed a commit to branch HDDS-3698-nonrolling-upgrade
in repository https://gitbox.apache.org/repos/asf/ozone.git
commit 9a078c4f48725c3c8388d468c8e130e0d13d25cf
Merge: 277cc0b eb55a57
Author: Aravindan Vijayan <av...@cloudera.com>
AuthorDate: Wed Feb 17 10:35:22 2021 -0800
Merge remote-tracking branch 'upstream/master' into HDDS-3698-nonrolling-upgrade
.github/workflows/post-commit.yml | 3 +-
.../hadoop/hdds/scm/storage/BlockInputStream.java | 7 +
.../client/src/test/resources/log4j.properties | 2 +-
.../common/src/test/resources/log4j.properties | 2 +-
.../common/statemachine/StateContext.java | 34 ++--
.../container/common/utils/HddsVolumeUtil.java | 6 +-
.../container/keyvalue/impl/BlockManagerImpl.java | 10 +-
.../keyvalue/impl/FilePerChunkStrategy.java | 2 +
.../ozone/container/ozoneimpl/ContainerReader.java | 6 +-
.../common/statemachine/TestStateContext.java | 24 ++-
.../keyvalue/impl/TestBlockManagerImpl.java | 43 +++++
.../src/test/resources/log4j.properties | 2 +-
.../certificates/utils/CertificateSignRequest.java | 14 +-
.../src/test/resources/log4j.properties | 2 +-
.../scm/container/states/ContainerAttribute.java | 5 +-
.../scm/container/states/ContainerStateMap.java | 6 +
.../hadoop/hdds/scm/pipeline/PipelineStateMap.java | 6 +
.../hdds/scm/server/StorageContainerManager.java | 4 +-
.../main/compose/ozonesecure-om-ha/docker-config | 3 +-
.../src/main/smoketest/s3/MultipartUpload.robot | 39 +++++
.../insight}/src/test/resources/log4j.properties | 2 +-
.../hadoop/fs/ozone/TestRootedOzoneFileSystem.java | 55 +++++-
.../org/apache/hadoop/ozone/om/OzoneManager.java | 14 +-
.../hadoop/ozone/om/TrashOzoneFileSystem.java | 12 +-
.../ozone/om/ratis/OzoneManagerRatisServer.java | 33 +++-
.../om/ratis/TestOzoneManagerRatisServer.java | 12 +-
.../fs/ozone/Hadoop27OmTransportFactory.java | 4 +-
.../hadoop/fs/ozone/Hadoop27RpcTransport.java | 77 ++++++---
.../hadoop/ozone/s3/endpoint/ObjectEndpoint.java | 47 +++++
.../hadoop/ozone/s3/exception/S3ErrorTable.java | 5 +
.../org/apache/hadoop/ozone/s3/util/S3Consts.java | 7 +
.../s3/endpoint/TestMultipartUploadWithCopy.java | 90 +++++++++-
.../apache/hadoop/ozone/debug/ExportContainer.java | 191 +++++++++++++++++++++
.../hadoop/ozone/shell/s3/GetS3SecretHandler.java | 21 ++-
.../tools}/src/test/resources/log4j.properties | 2 +-
35 files changed, 706 insertions(+), 86 deletions(-)
diff --cc hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
index 2399f85,2ef8c79..7bf4f43
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
@@@ -129,7 -119,7 +129,8 @@@ import com.google.common.cache.RemovalL
import com.google.protobuf.BlockingService;
import org.apache.commons.lang3.tuple.Pair;
import static org.apache.hadoop.hdds.scm.ScmConfigKeys.HDDS_SCM_WATCHER_TIMEOUT_DEFAULT;
+import static org.apache.hadoop.hdds.scm.pipeline.Pipeline.PipelineState.CLOSED;
+ import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ADMINISTRATORS_WILDCARD;
import org.apache.ratis.grpc.GrpcTlsConfig;
import org.slf4j.Logger;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org