-
Notifications
You must be signed in to change notification settings - Fork 1.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Remote Store] Abstract out remote segment garbage collection logic #13221
Draft
sachinpkale
wants to merge
1
commit into
opensearch-project:main
Choose a base branch
from
sachinpkale:abstract-segment-garbage-collection
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+156
−20
Draft
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
63 changes: 63 additions & 0 deletions
63
...rc/main/java/org/opensearch/index/shard/CommitTriggeredRemoteSegmentGarbageCollector.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,63 @@ | ||
/* | ||
* SPDX-License-Identifier: Apache-2.0 | ||
* | ||
* The OpenSearch Contributors require contributions made to | ||
* this file be licensed under the Apache-2.0 license or a | ||
* compatible open source license. | ||
*/ | ||
|
||
package org.opensearch.index.shard; | ||
|
||
import org.apache.logging.log4j.Logger; | ||
import org.apache.lucene.store.Directory; | ||
import org.opensearch.common.logging.Loggers; | ||
import org.opensearch.core.action.ActionListener; | ||
import org.opensearch.core.index.shard.ShardId; | ||
import org.opensearch.index.remote.RemoteStoreUtils; | ||
import org.opensearch.index.store.RemoteSegmentStoreDirectory; | ||
import org.opensearch.indices.RemoteStoreSettings; | ||
|
||
public class CommitTriggeredRemoteSegmentGarbageCollector implements RemoteSegmentGarbageCollector { | ||
private final Logger logger; | ||
private final Directory storeDirectory; | ||
private final RemoteSegmentStoreDirectory remoteDirectory; | ||
|
||
private final RemoteStoreSettings remoteStoreSettings; | ||
|
||
public CommitTriggeredRemoteSegmentGarbageCollector( | ||
ShardId shardId, | ||
Directory storeDirectory, | ||
RemoteSegmentStoreDirectory remoteDirectory, | ||
RemoteStoreSettings remoteStoreSettings | ||
) { | ||
logger = Loggers.getLogger(getClass(), shardId); | ||
this.storeDirectory = storeDirectory; | ||
this.remoteDirectory = remoteDirectory; | ||
this.remoteStoreSettings = remoteStoreSettings; | ||
} | ||
|
||
@Override | ||
public void deleteStaleSegments(Listener listener) { | ||
// if a new segments_N file is present in local that is not uploaded to remote store yet, it | ||
// is considered as a first refresh post commit. A cleanup of stale commit files is triggered. | ||
// This is done to avoid triggering delete post each refresh. | ||
if (RemoteStoreUtils.isLatestSegmentInfosUploadedToRemote(storeDirectory, remoteDirectory) == false) { | ||
remoteDirectory.deleteStaleSegmentsAsync(remoteStoreSettings.getMinRemoteSegmentMetadataFiles(), new ActionListener<Void>() { | ||
@Override | ||
public void onResponse(Void unused) { | ||
listener.onSuccess(unused); | ||
} | ||
|
||
@Override | ||
public void onFailure(Exception e) { | ||
listener.onFailure(e); | ||
} | ||
}); | ||
} else { | ||
String skipReason = | ||
"Skipping garbage collection, CommitTriggeredRemoteSegmentGarbageCollector only triggers deletion on commit"; | ||
logger.debug(skipReason); | ||
listener.onSkip(skipReason); | ||
} | ||
} | ||
} |
46 changes: 46 additions & 0 deletions
46
server/src/main/java/org/opensearch/index/shard/RemoteSegmentGarbageCollector.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,46 @@ | ||
/* | ||
* SPDX-License-Identifier: Apache-2.0 | ||
* | ||
* The OpenSearch Contributors require contributions made to | ||
* this file be licensed under the Apache-2.0 license or a | ||
* compatible open source license. | ||
*/ | ||
|
||
package org.opensearch.index.shard; | ||
|
||
public interface RemoteSegmentGarbageCollector { | ||
|
||
interface Listener { | ||
|
||
/** | ||
* Called after the successful deletion of stale segments from remote store | ||
*/ | ||
void onSuccess(Void response); | ||
|
||
/** | ||
* Called on exception while deleting stale segments from remote store | ||
*/ | ||
void onFailure(Exception e); | ||
|
||
/** | ||
* Called on skipping the garbage collection | ||
*/ | ||
void onSkip(String reason); | ||
} | ||
|
||
Listener DEFAULT_NOOP_LISTENER = new Listener() { | ||
@Override | ||
public void onSuccess(Void response) {} | ||
|
||
@Override | ||
public void onFailure(Exception e) {} | ||
|
||
@Override | ||
public void onSkip(String reason) {} | ||
}; | ||
|
||
/** | ||
* Deletes stale segments from remote store and notifies the listener. | ||
*/ | ||
void deleteStaleSegments(Listener listener); | ||
} |
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.
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.
Maybe a better contract would be shouldGarbageCollect() that returns a boolean. We can add additional safety constraints explicitly