forked from apache/ozone
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'HDDS-10239-container-reconciliation' into HDDS-11253-co…
…rrupt-files * HDDS-10239-container-reconciliation: (61 commits) HDDS-11081. Use thread-local instance of FileSystem in Freon tests (apache#7091) HDDS-11333. Avoid hard-coded current version in upgrade/xcompat tests (apache#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. (apache#7081) HDDS-11316. Improve Create Key and Chunk IO Dashboards (apache#7075) HDDS-11239. Fix KeyOutputStream's exception handling when calling hsync concurrently (apache#7047) HDDS-11254. Reconcile commands should be handled by datanode ReplicationSupervisor (apache#7076) HDDS-11331. Fix Datanode unable to report for a long time (apache#7090) HDDS-11346. FS CLI gives incorrect recursive volume deletion prompt (apache#7102) HDDS-11349. Add NullPointer handling when volume/bucket tables are not initialized (apache#7103) HDDS-11209. Avoid insufficient EC pipelines in the container pipeline cache (apache#6974) HDDS-11284. refactor quota repair non-blocking while upgrade (apache#7035) HDDS-9790. Add tests for Overview page (apache#6983) HDDS-10904. [hsync] Enable PutBlock piggybacking and incremental chunk list by default (apache#7074) HDDS-11322. [hsync] Block ECKeyOutputStream from calling hsync and hflush (apache#7098) HDDS-11325. Intermittent failure in TestBlockOutputStreamWithFailures#testContainerClose (apache#7099) ... Conflicts: hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/checksum/ContainerChecksumTreeManager.java
- Loading branch information
Showing
261 changed files
with
10,899 additions
and
2,702 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/ErrorInjector.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.hadoop.hdds.scm; | ||
|
|
||
| import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos; | ||
| import org.apache.hadoop.hdds.scm.pipeline.Pipeline; | ||
| import org.apache.ratis.protocol.ClientId; | ||
| import org.apache.ratis.protocol.RaftClientReply; | ||
|
|
||
| /** | ||
| * Client side error injector allowing simulating receiving errors from server side. | ||
| */ | ||
| @FunctionalInterface | ||
| public interface ErrorInjector { | ||
| RaftClientReply getResponse(ContainerProtos.ContainerCommandRequestProto request, ClientId id, Pipeline pipeline); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
123 changes: 123 additions & 0 deletions
123
hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientCreator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * <p> | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * <p> | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.hadoop.hdds.scm; | ||
|
|
||
| import com.google.common.base.Preconditions; | ||
| import org.apache.hadoop.hdds.conf.ConfigurationSource; | ||
| import org.apache.hadoop.hdds.scm.client.ClientTrustManager; | ||
| import org.apache.hadoop.hdds.scm.pipeline.Pipeline; | ||
| import org.apache.hadoop.hdds.utils.IOUtils; | ||
| import org.apache.hadoop.ozone.OzoneConfigKeys; | ||
| import org.apache.hadoop.ozone.OzoneSecurityUtil; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| /** | ||
| * Factory for XceiverClientSpi implementations. Client instances are not cached. | ||
| */ | ||
| public class XceiverClientCreator implements XceiverClientFactory { | ||
| private static ErrorInjector errorInjector; | ||
|
|
||
| public static void enableErrorInjection(ErrorInjector injector) { | ||
| errorInjector = injector; | ||
| } | ||
|
|
||
| private final ConfigurationSource conf; | ||
| private final boolean topologyAwareRead; | ||
| private final ClientTrustManager trustManager; | ||
| private final boolean securityEnabled; | ||
|
|
||
| public XceiverClientCreator(ConfigurationSource conf) { | ||
| this(conf, null); | ||
| } | ||
|
|
||
| public XceiverClientCreator(ConfigurationSource conf, ClientTrustManager trustManager) { | ||
| this.conf = conf; | ||
| this.securityEnabled = OzoneSecurityUtil.isSecurityEnabled(conf); | ||
| topologyAwareRead = conf.getBoolean( | ||
| OzoneConfigKeys.OZONE_NETWORK_TOPOLOGY_AWARE_READ_KEY, | ||
| OzoneConfigKeys.OZONE_NETWORK_TOPOLOGY_AWARE_READ_DEFAULT); | ||
| this.trustManager = trustManager; | ||
| if (securityEnabled) { | ||
| Preconditions.checkNotNull(trustManager); | ||
| } | ||
| } | ||
|
|
||
| public boolean isSecurityEnabled() { | ||
| return securityEnabled; | ||
| } | ||
|
|
||
| protected XceiverClientSpi newClient(Pipeline pipeline) throws IOException { | ||
| XceiverClientSpi client; | ||
| switch (pipeline.getType()) { | ||
| case RATIS: | ||
| client = XceiverClientRatis.newXceiverClientRatis(pipeline, conf, trustManager, errorInjector); | ||
| break; | ||
| case STAND_ALONE: | ||
| client = new XceiverClientGrpc(pipeline, conf, trustManager); | ||
| break; | ||
| case EC: | ||
| client = new ECXceiverClientGrpc(pipeline, conf, trustManager); | ||
| break; | ||
| case CHAINED: | ||
| default: | ||
| throw new IOException("not implemented " + pipeline.getType()); | ||
| } | ||
| try { | ||
| client.connect(); | ||
| } catch (Exception e) { | ||
| throw new IOException(e); | ||
| } | ||
| return client; | ||
| } | ||
|
|
||
| @Override | ||
| public XceiverClientSpi acquireClient(Pipeline pipeline) throws IOException { | ||
| return acquireClient(pipeline, false); | ||
| } | ||
|
|
||
| @Override | ||
| public void releaseClient(XceiverClientSpi xceiverClient, boolean invalidateClient) { | ||
| releaseClient(xceiverClient, invalidateClient, false); | ||
| } | ||
|
|
||
| @Override | ||
| public XceiverClientSpi acquireClientForReadData(Pipeline pipeline) throws IOException { | ||
| return acquireClient(pipeline); | ||
| } | ||
|
|
||
| @Override | ||
| public void releaseClientForReadData(XceiverClientSpi xceiverClient, boolean invalidateClient) { | ||
| releaseClient(xceiverClient, invalidateClient, topologyAwareRead); | ||
| } | ||
|
|
||
| @Override | ||
| public XceiverClientSpi acquireClient(Pipeline pipeline, boolean topologyAware) throws IOException { | ||
| return newClient(pipeline); | ||
| } | ||
|
|
||
| @Override | ||
| public void releaseClient(XceiverClientSpi xceiverClient, boolean invalidateClient, boolean topologyAware) { | ||
| IOUtils.closeQuietly(xceiverClient); | ||
| } | ||
|
|
||
| @Override | ||
| public void close() throws Exception { | ||
| // clients are not tracked, closing each client is the responsibility of users of this class | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.