szetszwo commented on code in PR #8940: URL: https://github.com/apache/ozone/pull/8940#discussion_r2277373821
########## hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/safemode/AbstractContainerSafeModeRule.java: ########## @@ -0,0 +1,192 @@ +/* + * 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.safemode; + +import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_SCM_SAFEMODE_THRESHOLD_PCT; +import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_SCM_SAFEMODE_THRESHOLD_PCT_DEFAULT; + +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Preconditions; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import org.apache.hadoop.hdds.client.ReplicationConfig; +import org.apache.hadoop.hdds.conf.ConfigurationSource; +import org.apache.hadoop.hdds.protocol.proto.HddsProtos.LifeCycleState; +import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationType; +import org.apache.hadoop.hdds.scm.container.ContainerID; +import org.apache.hadoop.hdds.scm.container.ContainerInfo; +import org.apache.hadoop.hdds.scm.container.ContainerManager; +import org.apache.hadoop.hdds.scm.container.ContainerNotFoundException; +import org.apache.hadoop.hdds.scm.events.SCMEvents; +import org.apache.hadoop.hdds.scm.server.SCMDatanodeProtocolServer.NodeRegistrationContainerReport; +import org.apache.hadoop.hdds.server.events.EventQueue; +import org.apache.hadoop.hdds.server.events.TypedEvent; +import org.slf4j.Logger; + +/** + * Abstract class for Container Safe mode exit rule. + */ +public abstract class AbstractContainerSafeModeRule extends SafeModeExitRule<NodeRegistrationContainerReport> { + + private final ContainerManager containerManager; + private final Set<ContainerID> containers; + private final double safeModeCutoff; + private final Logger log; + + private int totalContainers; Review Comment: It looks like that this class will be accessed by different threads. So, - containers should use ConcurrentHashMap; - totalContainers should use AtomicInteger. ########## hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/safemode/AbstractContainerSafeModeRule.java: ########## @@ -0,0 +1,192 @@ +/* + * 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.safemode; + +import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_SCM_SAFEMODE_THRESHOLD_PCT; +import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_SCM_SAFEMODE_THRESHOLD_PCT_DEFAULT; + +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Preconditions; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import org.apache.hadoop.hdds.client.ReplicationConfig; +import org.apache.hadoop.hdds.conf.ConfigurationSource; +import org.apache.hadoop.hdds.protocol.proto.HddsProtos.LifeCycleState; +import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationType; +import org.apache.hadoop.hdds.scm.container.ContainerID; +import org.apache.hadoop.hdds.scm.container.ContainerInfo; +import org.apache.hadoop.hdds.scm.container.ContainerManager; +import org.apache.hadoop.hdds.scm.container.ContainerNotFoundException; +import org.apache.hadoop.hdds.scm.events.SCMEvents; +import org.apache.hadoop.hdds.scm.server.SCMDatanodeProtocolServer.NodeRegistrationContainerReport; +import org.apache.hadoop.hdds.server.events.EventQueue; +import org.apache.hadoop.hdds.server.events.TypedEvent; +import org.slf4j.Logger; + +/** + * Abstract class for Container Safe mode exit rule. + */ +public abstract class AbstractContainerSafeModeRule extends SafeModeExitRule<NodeRegistrationContainerReport> { + + private final ContainerManager containerManager; + private final Set<ContainerID> containers; + private final double safeModeCutoff; + private final Logger log; + + private int totalContainers; + + public AbstractContainerSafeModeRule(ConfigurationSource conf, SCMSafeModeManager safeModeManager, + ContainerManager containerManager, String ruleName, EventQueue eventQueue, Logger log) { + super(safeModeManager, ruleName, eventQueue); + this.containerManager = containerManager; + this.containers = new HashSet<>(); + this.safeModeCutoff = getSafeModeCutoff(conf); + this.log = log; + } + + protected abstract ReplicationType getContainerType(); + + protected abstract long getNumberOfContainersWithMinReplica(); + + protected abstract Set<ContainerID> getSampleMissingContainers(); + + protected void initializeRule() { + containers.clear(); + containerManager.getContainers(getContainerType()).stream() + .filter(this::isClosed) + .filter(c -> c.getNumberOfKeys() > 0) + .map(ContainerInfo::containerID) + .forEach(containers::add); + totalContainers = containers.size(); + final long cutOff = (long) Math.ceil(getTotalNumberOfContainers() * getSafeModeCutoff()); + getSafeModeMetrics().setNumContainerReportedThreshold(getContainerType(), cutOff); + log.info("Refreshed {} Containers threshold count to {}.", getContainerType(), cutOff); + } + + protected Set<ContainerID> getContainers() { + return containers; + } + + protected int getTotalNumberOfContainers() { + return totalContainers; + } + + protected double getSafeModeCutoff() { + return safeModeCutoff; + } + + @Override + protected TypedEvent<NodeRegistrationContainerReport> getEventType() { + return SCMEvents.CONTAINER_REGISTRATION_REPORT; + } + + @Override + protected synchronized boolean validate() { + if (validateBasedOnReportProcessing()) { + return getCurrentContainerThreshold() >= getSafeModeCutoff(); + } + + final List<ContainerInfo> containerInfos = containerManager.getContainers(getContainerType()); + return containerInfos.stream() + .filter(this::isClosed) + .map(ContainerInfo::containerID) + .noneMatch(this::isMissing); + } + + @VisibleForTesting + public double getCurrentContainerThreshold() { + return totalContainers == 0 ? 1 : ((double) getNumberOfContainersWithMinReplica() / totalContainers); + } + + @Override + public synchronized void refresh(boolean forceRefresh) { + if (forceRefresh || !validate()) { + initializeRule(); + } + } + + @Override + protected void cleanup() { + getContainers().clear(); + } + + /** + * Checks if the container has at least the minimum required number of replicas. + */ + protected boolean isMissing(ContainerID id) { + try { + int minReplica = getMinReplica(id); + return containerManager.getContainerReplicas(id).size() < minReplica; + } catch (ContainerNotFoundException ex) { + /* + * This should never happen; in case this happens, the container somehow got removed from SCM. + * Safemode rule doesn't have to log/fix this. We will just exclude this + * from the rule validation. + */ + return false; + } + } + + protected boolean isClosed(ContainerInfo container) { + final LifeCycleState state = container.getState(); + return state == LifeCycleState.QUASI_CLOSED || state == LifeCycleState.CLOSED; + } + + protected int getMinReplica(ContainerID id) { + try { + final ContainerInfo container = containerManager.getContainer(id); + final ReplicationConfig replicationConfig = container.getReplicationConfig(); + return replicationConfig.getMinimumNodes(); + } catch (ContainerNotFoundException e) { + /* + * This should never happen; in case this happens, the container somehow got removed from SCM. + * Since the SCM is not tracking this Container anymore, the min replica required is 0. + */ + return 0; + } Review Comment: > Change containers to a map from containerID to minimumNodes. Now, we could: ```java return containers.getOrDefault(id, 0); ``` ########## hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/safemode/AbstractContainerSafeModeRule.java: ########## @@ -0,0 +1,192 @@ +/* + * 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.safemode; + +import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_SCM_SAFEMODE_THRESHOLD_PCT; +import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_SCM_SAFEMODE_THRESHOLD_PCT_DEFAULT; + +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Preconditions; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import org.apache.hadoop.hdds.client.ReplicationConfig; +import org.apache.hadoop.hdds.conf.ConfigurationSource; +import org.apache.hadoop.hdds.protocol.proto.HddsProtos.LifeCycleState; +import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationType; +import org.apache.hadoop.hdds.scm.container.ContainerID; +import org.apache.hadoop.hdds.scm.container.ContainerInfo; +import org.apache.hadoop.hdds.scm.container.ContainerManager; +import org.apache.hadoop.hdds.scm.container.ContainerNotFoundException; +import org.apache.hadoop.hdds.scm.events.SCMEvents; +import org.apache.hadoop.hdds.scm.server.SCMDatanodeProtocolServer.NodeRegistrationContainerReport; +import org.apache.hadoop.hdds.server.events.EventQueue; +import org.apache.hadoop.hdds.server.events.TypedEvent; +import org.slf4j.Logger; + +/** + * Abstract class for Container Safe mode exit rule. + */ +public abstract class AbstractContainerSafeModeRule extends SafeModeExitRule<NodeRegistrationContainerReport> { + + private final ContainerManager containerManager; + private final Set<ContainerID> containers; + private final double safeModeCutoff; + private final Logger log; + + private int totalContainers; + + public AbstractContainerSafeModeRule(ConfigurationSource conf, SCMSafeModeManager safeModeManager, + ContainerManager containerManager, String ruleName, EventQueue eventQueue, Logger log) { + super(safeModeManager, ruleName, eventQueue); + this.containerManager = containerManager; + this.containers = new HashSet<>(); + this.safeModeCutoff = getSafeModeCutoff(conf); + this.log = log; + } + + protected abstract ReplicationType getContainerType(); + + protected abstract long getNumberOfContainersWithMinReplica(); + + protected abstract Set<ContainerID> getSampleMissingContainers(); + + protected void initializeRule() { + containers.clear(); + containerManager.getContainers(getContainerType()).stream() + .filter(this::isClosed) + .filter(c -> c.getNumberOfKeys() > 0) + .map(ContainerInfo::containerID) + .forEach(containers::add); Review Comment: Change `containers` to a map from containerID to minimumNodes. ```java containerManager.getContainers(getContainerType()).stream() .filter(this::isClosed) .filter(c -> c.getNumberOfKeys() > 0) .forEach(c -> containers.put(c.containerID(), c.getReplicationConfig().getMinimumNodes())); ``` ########## hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/safemode/ECContainerSafeModeRule.java: ########## @@ -17,147 +17,63 @@ package org.apache.hadoop.hdds.scm.safemode; -import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_SCM_SAFEMODE_THRESHOLD_PCT; -import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_SCM_SAFEMODE_THRESHOLD_PCT_DEFAULT; - -import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Preconditions; import com.google.common.collect.Sets; -import java.util.HashSet; -import java.util.List; +import java.util.Collections; import java.util.Map; import java.util.Set; -import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicLong; import java.util.stream.Collectors; -import org.apache.hadoop.hdds.client.ReplicationConfig; import org.apache.hadoop.hdds.conf.ConfigurationSource; -import org.apache.hadoop.hdds.protocol.DatanodeDetails; -import org.apache.hadoop.hdds.protocol.proto.HddsProtos.LifeCycleState; +import org.apache.hadoop.hdds.protocol.DatanodeID; import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationType; import org.apache.hadoop.hdds.scm.container.ContainerID; -import org.apache.hadoop.hdds.scm.container.ContainerInfo; import org.apache.hadoop.hdds.scm.container.ContainerManager; -import org.apache.hadoop.hdds.scm.container.ContainerNotFoundException; -import org.apache.hadoop.hdds.scm.events.SCMEvents; import org.apache.hadoop.hdds.scm.server.SCMDatanodeProtocolServer.NodeRegistrationContainerReport; import org.apache.hadoop.hdds.server.events.EventQueue; -import org.apache.hadoop.hdds.server.events.TypedEvent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** * Safe mode rule for EC containers. + * This rule validates that a configurable percentage of EC containers have a minimum + * number of replicas reported by the DataNodes. This rule is not satisfied until this + * condition is met. */ -public class ECContainerSafeModeRule extends SafeModeExitRule<NodeRegistrationContainerReport> { +public class ECContainerSafeModeRule extends AbstractContainerSafeModeRule { private static final Logger LOG = LoggerFactory.getLogger(ECContainerSafeModeRule.class); private static final String NAME = "ECContainerSafeModeRule"; - private static final int DEFAULT_MIN_REPLICA = 1; - private final ContainerManager containerManager; - private final double safeModeCutoff; - private final Set<Long> ecContainers; - private final Map<Long, Set<UUID>> ecContainerDNsMap; + private final Map<ContainerID, Set<DatanodeID>> ecContainerDNsMap; private final AtomicLong ecContainerWithMinReplicas; Review Comment: Move it to AbstractContainerSafeModeRule and use AtomicInteger (since totalContainers is just an int.) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
