Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import org.apache.hadoop.hdds.scm.container.ReplicationManagerReport;
import org.apache.hadoop.hdds.scm.container.replication.health.ClosedWithMismatchedReplicasHandler;
import org.apache.hadoop.hdds.scm.container.replication.health.ClosingContainerHandler;
import org.apache.hadoop.hdds.scm.container.replication.health.DeletingContainerHandler;
import org.apache.hadoop.hdds.scm.container.replication.health.ECReplicationCheckHandler;
import org.apache.hadoop.hdds.scm.container.replication.health.HealthCheck;
import org.apache.hadoop.hdds.scm.container.replication.health.OpenContainerHandler;
Expand All @@ -51,6 +52,7 @@
import org.apache.hadoop.hdds.scm.node.states.NodeNotFoundException;
import org.apache.hadoop.hdds.scm.server.StorageContainerManager;
import org.apache.hadoop.hdds.server.events.EventPublisher;
import org.apache.hadoop.ozone.common.statemachine.InvalidStateTransitionException;
import org.apache.hadoop.ozone.protocol.commands.CloseContainerCommand;
import org.apache.hadoop.ozone.protocol.commands.CommandForDatanode;
import org.apache.hadoop.ozone.protocol.commands.DeleteContainerCommand;
Expand Down Expand Up @@ -220,6 +222,7 @@ public ReplicationManager(final ConfigurationSource conf,
.addNext(new ClosingContainerHandler(this))
.addNext(new QuasiClosedContainerHandler(this))
.addNext(new ClosedWithMismatchedReplicasHandler(this))
.addNext(new DeletingContainerHandler(this))
.addNext(ecReplicationCheckHandler)
.addNext(ratisReplicationCheckHandler);
start();
Expand Down Expand Up @@ -403,6 +406,23 @@ public void sendDeleteCommand(final ContainerInfo container, int replicaIndex,
}
}

/**
* update container state.
*
* @param containerID Container to be updated
* @param event the event to update the container
*/
public void updateContainerState(ContainerID containerID,
HddsProtos.LifeCycleEvent event) {
try {
containerManager.updateContainerState(containerID, event);
} catch (IOException | InvalidStateTransitionException |
TimeoutException e) {
LOG.error("Failed to update the state of container {}, update Event {}",
containerID, event, e);
}
}


/**
* Add an under replicated container back to the queue if it was unable to
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
/*
* 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.container.replication.health;

import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
import org.apache.hadoop.hdds.scm.container.ContainerID;
import org.apache.hadoop.hdds.scm.container.ContainerInfo;
import org.apache.hadoop.hdds.scm.container.replication.ContainerCheckRequest;
import org.apache.hadoop.hdds.scm.container.replication.ContainerReplicaOp;
import org.apache.hadoop.hdds.scm.container.replication.ReplicationManager;
import org.apache.ratis.protocol.exceptions.NotLeaderException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.util.Set;
import java.util.stream.Collectors;

/**
* Class used in Replication Manager to handle the
* replicas of containers in DELETING State.
*/
public class DeletingContainerHandler extends AbstractCheck {
private final ReplicationManager replicationManager;

public static final Logger LOG =
LoggerFactory.getLogger(DeletingContainerHandler.class);

public DeletingContainerHandler(ReplicationManager replicationManager) {
this.replicationManager = replicationManager;
}

/**
* If the number of replicas of the container is 0, change the state
* of the container to Deleted, otherwise resend delete command if needed.
* @param request ContainerCheckRequest object representing the container
* @return false if the specified container is not in DELETING state,
* otherwise true.
*/
@Override
public boolean handle(ContainerCheckRequest request) {
ContainerInfo containerInfo = request.getContainerInfo();
ContainerID cID = containerInfo.containerID();
HddsProtos.LifeCycleState containerState = containerInfo.getState();

if (containerState == HddsProtos.LifeCycleState.DELETED) {
return true;
}

if (containerState != HddsProtos.LifeCycleState.DELETING) {
return false;
}

if (request.getContainerReplicas().size() == 0) {
replicationManager.updateContainerState(
cID, HddsProtos.LifeCycleEvent.CLEANUP);
return true;
}

Set<DatanodeDetails> pendingDelete = request.getPendingOps().stream()
.filter(o -> o.getOpType() == ContainerReplicaOp.PendingOpType.DELETE)
.map(o -> o.getTarget()).collect(Collectors.toSet());
//resend deleteCommand if needed
request.getContainerReplicas().stream()
.filter(r -> !pendingDelete.contains(r.getDatanodeDetails()))
.forEach(rp -> {
try {
replicationManager.sendDeleteCommand(
containerInfo, rp.getReplicaIndex(), rp.getDatanodeDetails());
} catch (NotLeaderException e) {
LOG.warn("Failed to delete empty replica with index {} for " +
"container {} on datanode {}", rp.getReplicaIndex(),
cID, rp.getDatanodeDetails().getUuidString(), e);
}
});
return true;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,16 @@
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.ContainerReplicaProto;
import org.apache.hadoop.hdds.scm.container.ContainerInfo;
import org.apache.hadoop.hdds.scm.container.ContainerManager;
import org.apache.hadoop.hdds.scm.container.ContainerReplica;
import org.apache.hadoop.hdds.scm.container.ReplicationManagerReport;
import org.apache.hadoop.hdds.scm.container.replication.ContainerCheckRequest;
import org.apache.hadoop.hdds.scm.container.replication.ReplicationManager;
import org.apache.hadoop.ozone.common.statemachine.InvalidStateTransitionException;
import org.apache.ratis.protocol.exceptions.NotLeaderException;
import org.apache.ratis.util.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.IOException;
import java.util.Set;
import java.util.concurrent.TimeoutException;

/**
* This handler deletes a container if it's closed and empty (0 key count)
Expand All @@ -44,12 +40,9 @@ public class EmptyContainerHandler extends AbstractCheck {
LoggerFactory.getLogger(EmptyContainerHandler.class);

private final ReplicationManager replicationManager;
private final ContainerManager containerManager;

public EmptyContainerHandler(ReplicationManager replicationManager,
ContainerManager containerManager) {
public EmptyContainerHandler(ReplicationManager replicationManager) {
this.replicationManager = replicationManager;
this.containerManager = containerManager;
}

/**
Expand All @@ -72,14 +65,8 @@ public boolean handle(ContainerCheckRequest request) {
deleteContainerReplicas(containerInfo, replicas);

// Update the container's state
try {
containerManager.updateContainerState(containerInfo.containerID(),
HddsProtos.LifeCycleEvent.DELETE);
} catch (IOException | InvalidStateTransitionException |
TimeoutException e) {
LOG.error("Failed to delete empty container {}",
request.getContainerInfo(), e);
}
replicationManager.updateContainerState(
containerInfo.containerID(), HddsProtos.LifeCycleEvent.DELETE);
return true;
}

Expand Down
Loading