[#2083] improvement: Quickly delete local or HDFS data at the shuffleId level. #2084
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| /* | ||
| * 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.uniffle.storage.handler; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.function.Function; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| import org.apache.commons.lang3.StringUtils; | ||
| import org.apache.hadoop.conf.Configuration; | ||
|
|
||
| public class AsynDeletionEvent { | ||
| private static final String TEMPORARYSUFFIX = "_tmp"; | ||
| private String appId; | ||
| private String user; | ||
| private String shuffleServerId; | ||
| private Configuration conf; | ||
| /** Records the mapping between the path to be deleted and the path to be renamed. */ | ||
| private Map<String, String> needDeletePathAndRenamePath; | ||
|
|
||
| private String storageType; | ||
|
|
||
| public AsynDeletionEvent( | ||
| String appId, | ||
| String user, | ||
| Configuration conf, | ||
| String shuffleServerId, | ||
| List<String> needDeletePath, | ||
| String storageType) { | ||
| this.appId = appId; | ||
| this.user = user; | ||
| this.shuffleServerId = shuffleServerId; | ||
| this.conf = conf; | ||
| this.needDeletePathAndRenamePath = | ||
| needDeletePath.stream() | ||
| .collect( | ||
| Collectors.toMap(Function.identity(), s -> StringUtils.join(s, TEMPORARYSUFFIX))); | ||
| this.storageType = storageType; | ||
| } | ||
|
|
||
| public String getAppId() { | ||
| return appId; | ||
| } | ||
|
|
||
| public String getUser() { | ||
| return user; | ||
| } | ||
|
|
||
| public Configuration getConf() { | ||
| return conf; | ||
| } | ||
|
|
||
| public Map<String, String> getNeedDeletePathAndRenamePath() { | ||
| return needDeletePathAndRenamePath; | ||
| } | ||
|
|
||
| public String[] getNeedDeleteRenamePaths() { | ||
| return needDeletePathAndRenamePath.values().stream().toArray(String[]::new); | ||
| } | ||
|
|
||
| public String getShuffleServerId() { | ||
| return shuffleServerId; | ||
| } | ||
|
|
||
| public String getStorageType() { | ||
| return storageType; | ||
| } | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| /* | ||
| * 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.uniffle.storage.handler.impl; | ||
|
|
||
| import java.util.concurrent.BlockingQueue; | ||
|
|
||
| import com.google.common.collect.Queues; | ||
| import org.apache.hadoop.conf.Configuration; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| import org.apache.uniffle.storage.factory.ShuffleHandlerFactory; | ||
| import org.apache.uniffle.storage.handler.AsynDeletionEvent; | ||
| import org.apache.uniffle.storage.handler.api.ShuffleDeleteHandler; | ||
| import org.apache.uniffle.storage.request.CreateShuffleDeleteHandlerRequest; | ||
| import org.apache.uniffle.storage.util.StorageType; | ||
|
|
||
| /** | ||
| * To quickly delete the Shuffle Data that has been dropped to the disk, you need to rename the data | ||
| * first and then encapsulate the data into an asynchronous deletion event. This function is used to | ||
| * manage the actual execution of the asynchronous deletion event. | ||
| */ | ||
| public class AsynDeletionEventManager { | ||
|
There was a problem hiding this comment. Could you give some comments? There was a problem hiding this comment.
Your above message has been modified. |
||
| private static final Logger LOG = LoggerFactory.getLogger(AsynDeletionEventManager.class); | ||
|
|
||
| private static AsynDeletionEventManager INSTANCE; | ||
|
|
||
| public static synchronized AsynDeletionEventManager getInstance() { | ||
| if (INSTANCE == null) { | ||
| INSTANCE = new AsynDeletionEventManager(); | ||
| } | ||
| return INSTANCE; | ||
| } | ||
|
|
||
| protected final BlockingQueue<AsynDeletionEvent> renameAndAsynDeleteEventQueue = | ||
| Queues.newLinkedBlockingQueue(); | ||
| protected Thread renameAndAsynDeleteThread; | ||
|
|
||
| public AsynDeletionEventManager() { | ||
| Runnable renameAndDeletionTask = | ||
| () -> { | ||
| while (true) { | ||
| AsynDeletionEvent asynDeletionEvent = null; | ||
| try { | ||
| asynDeletionEvent = renameAndAsynDeleteEventQueue.take(); | ||
| if (asynDeletionEvent | ||
| .getStorageType() | ||
| .equalsIgnoreCase(StorageType.LOCALFILE.name())) { | ||
| ShuffleDeleteHandler deleteHandler = | ||
| ShuffleHandlerFactory.getInstance() | ||
| .createShuffleDeleteHandler( | ||
| new CreateShuffleDeleteHandlerRequest( | ||
| StorageType.LOCALFILE.name(), new Configuration())); | ||
| deleteHandler.delete( | ||
| asynDeletionEvent.getNeedDeleteRenamePaths(), | ||
| asynDeletionEvent.getAppId(), | ||
| asynDeletionEvent.getUser()); | ||
| } else if (asynDeletionEvent | ||
| .getStorageType() | ||
| .equalsIgnoreCase(StorageType.HDFS.name())) { | ||
| ShuffleDeleteHandler deleteHandler = | ||
| ShuffleHandlerFactory.getInstance() | ||
| .createShuffleDeleteHandler( | ||
| new CreateShuffleDeleteHandlerRequest( | ||
| StorageType.HDFS.name(), | ||
| asynDeletionEvent.getConf(), | ||
| asynDeletionEvent.getShuffleServerId())); | ||
| deleteHandler.delete( | ||
| asynDeletionEvent.getNeedDeleteRenamePaths(), | ||
| asynDeletionEvent.getAppId(), | ||
| asynDeletionEvent.getUser()); | ||
| } | ||
| } catch (Exception e) { | ||
| if (asynDeletionEvent != null) { | ||
| LOG.error( | ||
| "Delete Paths of {} failed.", asynDeletionEvent.getNeedDeleteRenamePaths(), e); | ||
| } else { | ||
| LOG.error("Failed to delete a directory in renameAndAsynDeleteThread.", e); | ||
| } | ||
| } | ||
| } | ||
| }; | ||
| renameAndAsynDeleteThread = new Thread(renameAndDeletionTask); | ||
| renameAndAsynDeleteThread.setName("renameAndAsynDeleteThread"); | ||
| renameAndAsynDeleteThread.setDaemon(true); | ||
| renameAndAsynDeleteThread.start(); | ||
| } | ||
|
|
||
| public synchronized boolean handlerAsynDelete(AsynDeletionEvent asynDeletionEvent) { | ||
| return renameAndAsynDeleteEventQueue.offer(asynDeletionEvent); | ||
| } | ||
| } | ||
Oops, something went wrong.
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.
Is this will effect the metrics analysis when using the 2 phase deletion?