HDDS-15682. Use the original configured host and port to identify SCM nodes #10612
There are no files selected for viewing
This file contains hidden or 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 hidden or 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,85 @@ | ||
| /* | ||
| * 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.net; | ||
|
|
||
| import java.net.InetSocketAddress; | ||
| import org.apache.hadoop.net.NetUtils; | ||
|
|
||
| /** | ||
| * A class for host and port. | ||
| * It also has an address which can be updated from time to time. | ||
| */ | ||
| public class HostAndPort { | ||
|
Contributor
There was a problem hiding this comment. Minor (naming): this collides with Guava's — Claude Code (AI-assisted review)
Contributor
There was a problem hiding this comment. We can replace Guava's |
||
| private final String host; | ||
| private final int port; | ||
| private final String hostAndPortString; | ||
| private final int hash; | ||
| /** The address can be updated from time to time. */ | ||
| private final InetSocketAddress address; | ||
|
|
||
| public HostAndPort(String host, int port) { | ||
| this.host = host; | ||
| this.port = port; | ||
| this.hostAndPortString = host + ":" + port; | ||
| this.hash = host.hashCode() ^ Integer.hashCode(port); | ||
| // TODO: HDDS-15533 change the address resolution logic and make this.address threadsafe. | ||
| this.address = NetUtils.createSocketAddr(hostAndPortString); | ||
| } | ||
|
|
||
| public String getHostName() { | ||
| return host; | ||
| } | ||
|
|
||
| public int getPort() { | ||
| return port; | ||
| } | ||
|
|
||
| public String getHostAndPortString() { | ||
| return hostAndPortString; | ||
| } | ||
|
|
||
| public InetSocketAddress getAddress() { | ||
| return address; | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return hash; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object obj) { | ||
| if (this == obj) { | ||
| return true; | ||
| } else if (!(obj instanceof HostAndPort)) { | ||
| return false; | ||
| } | ||
| final HostAndPort that = (HostAndPort) obj; | ||
| // address must not be compared | ||
| return this.hash == that.hash | ||
| && this.port == that.port | ||
| && this.host.equals(that.host); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| final InetSocketAddress a = getAddress(); | ||
| final Object resolved = a != null && a.getAddress() != null ? a.getAddress() : "<unresolved>"; | ||
| return hostAndPortString + "/" + resolved; | ||
| } | ||
| } | ||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -39,7 +39,6 @@ | |
| import com.google.common.collect.Sets; | ||
| import java.io.File; | ||
| import java.io.IOException; | ||
| import java.util.Arrays; | ||
| import java.util.Collection; | ||
| import java.util.HashMap; | ||
|
|
@@ -71,6 +70,7 @@ | |
| import org.apache.hadoop.hdds.protocol.DiskBalancerProtocol; | ||
| import org.apache.hadoop.hdds.protocol.SecretKeyProtocol; | ||
| import org.apache.hadoop.hdds.protocolPB.SCMSecurityProtocolClientSideTranslatorPB; | ||
| import org.apache.hadoop.hdds.scm.net.HostAndPort; | ||
| import org.apache.hadoop.hdds.security.SecurityConfig; | ||
| import org.apache.hadoop.hdds.security.symmetric.DefaultSecretKeyClient; | ||
| import org.apache.hadoop.hdds.security.symmetric.SecretKeyClient; | ||
|
|
@@ -764,12 +764,12 @@ private String reconfigScmNodes(String value) { | |
| LOG.info("Reconfiguring SCM nodes for service ID {} with new SCM nodes {} and remove SCM nodes {}", | ||
| scmServiceId, scmNodesIdsToAdd, scmNodesIdsToRemove); | ||
|
|
||
| final Collection<Pair<String, HostAndPort>> scmToAdd = HddsServerUtil.getSCMAddressForDatanodes( | ||
| getConf(), scmServiceId, scmNodesIdsToAdd); | ||
| if (scmToAdd == null) { | ||
| throw new IllegalStateException("Reconfiguration failed to get SCM address to add due to wrong configuration"); | ||
| } | ||
| final Collection<Pair<String, HostAndPort>> scmToRemove = HddsServerUtil.getSCMAddressForDatanodes( | ||
| getConf(), scmServiceId, scmNodesIdsToRemove); | ||
| if (scmToRemove == null) { | ||
| throw new IllegalArgumentException( | ||
|
|
@@ -790,10 +790,10 @@ private String reconfigScmNodes(String value) { | |
| } | ||
|
|
||
| // Add the new SCM servers | ||
| for (Pair<String, HostAndPort> pair : scmToAdd) { | ||
| String scmNodeId = pair.getLeft(); | ||
| final HostAndPort scmAddress = pair.getRight(); | ||
| if (scmAddress.getAddress().isUnresolved()) { | ||
| LOG.warn("Reconfiguration failed to add SCM address {} for SCM service {} since it can't " + | ||
| "be resolved, skipping", scmAddress, scmServiceId); | ||
| continue; | ||
|
|
@@ -809,9 +809,9 @@ private String reconfigScmNodes(String value) { | |
| } | ||
|
|
||
| // Remove the old SCM server | ||
| for (Pair<String, HostAndPort> pair : scmToRemove) { | ||
| String scmNodeId = pair.getLeft(); | ||
| final HostAndPort scmAddress = pair.getRight(); | ||
| try { | ||
| connectionManager.removeSCMServer(scmAddress); | ||
| context.removeEndpoint(scmAddress); | ||
|
|
||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -21,11 +21,11 @@ | |
|
|
||
| import com.google.common.annotations.VisibleForTesting; | ||
| import com.google.common.base.CaseFormat; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
| import org.apache.commons.text.WordUtils; | ||
| import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.SCMCommandProto; | ||
| import org.apache.hadoop.hdds.scm.net.HostAndPort; | ||
| import org.apache.hadoop.hdfs.util.EnumCounters; | ||
| import org.apache.hadoop.metrics2.MetricsCollector; | ||
| import org.apache.hadoop.metrics2.MetricsInfo; | ||
|
|
@@ -68,9 +68,9 @@ public final class DatanodeQueueMetrics implements MetricsSource { | |
|
|
||
| private Map<SCMCommandProto.Type, MetricsInfo> stateContextCommandQueueMap; | ||
| private Map<SCMCommandProto.Type, MetricsInfo> commandDispatcherQueueMap; | ||
| private Map<HostAndPort, MetricsInfo> incrementalReportsQueueMap; | ||
| private Map<HostAndPort, MetricsInfo> containerActionQueueMap; | ||
| private Map<HostAndPort, MetricsInfo> pipelineActionQueueMap; | ||
|
|
||
| public DatanodeQueueMetrics(DatanodeStateMachine datanodeStateMachine) { | ||
| this.registry = new MetricsRegistry(METRICS_SOURCE_NAME); | ||
|
|
@@ -132,19 +132,19 @@ public void getMetrics(MetricsCollector collector, boolean b) { | |
| tmpEnum.get(entry.getKey())); | ||
| } | ||
|
|
||
| for (Map.Entry<HostAndPort, MetricsInfo> entry: | ||
| incrementalReportsQueueMap.entrySet()) { | ||
| builder.addGauge(entry.getValue(), | ||
| datanodeStateMachine.getContext() | ||
| .getIncrementalReportQueueSize().getOrDefault(entry.getKey(), 0)); | ||
| } | ||
| for (Map.Entry<HostAndPort, MetricsInfo> entry: | ||
| containerActionQueueMap.entrySet()) { | ||
| builder.addGauge(entry.getValue(), | ||
| datanodeStateMachine.getContext() | ||
| .getContainerActionQueueSize().getOrDefault(entry.getKey(), 0)); | ||
| } | ||
| for (Map.Entry<HostAndPort, MetricsInfo> entry: | ||
| pipelineActionQueueMap.entrySet()) { | ||
| builder.addGauge(entry.getValue(), | ||
| datanodeStateMachine.getContext().getPipelineActionQueueSize() | ||
|
|
@@ -157,7 +157,7 @@ public static synchronized void unRegister() { | |
| DefaultMetricsSystem.instance().unregisterSource(METRICS_SOURCE_NAME); | ||
| } | ||
|
|
||
| public void addEndpoint(HostAndPort endpoint) { | ||
| incrementalReportsQueueMap.computeIfAbsent(endpoint, | ||
| k -> getMetricsInfo(INCREMENTAL_REPORT_QUEUE_PREFIX, | ||
| CaseFormat.UPPER_UNDERSCORE | ||
|
|
@@ -172,7 +172,7 @@ public void addEndpoint(InetSocketAddress endpoint) { | |
| .to(CaseFormat.UPPER_CAMEL, k.getHostName()))); | ||
| } | ||
|
|
||
| public void removeEndpoint(HostAndPort endpoint) { | ||
| incrementalReportsQueueMap.remove(endpoint); | ||
| containerActionQueueMap.remove(endpoint); | ||
| pipelineActionQueueMap.remove(endpoint); | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These
HostAndPortvariables inSCMNodeInfoare nevernull. Let's addObjects.requireNonNullin the constructor instead.