Skip to content

fix(s3stream): fix streamsetobject force split fail #1521

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jul 9, 2024
Merged

fix(s3stream): fix streamsetobject force split fail #1521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion core/src/main/scala/kafka/log/stream/s3/objects/ControllerObjectManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import static com.automq.stream.s3.metadata.ObjectUtils.NOOP_OBJECT_ID;

public class ControllerObjectManager implements ObjectManager {

private final static Logger LOGGER = LoggerFactory.getLogger(ControllerObjectManager.class);
Expand Down Expand Up @@ -126,7 +128,7 @@ public CompletableFuture<CommitStreamSetObjectResponse> commitStreamSetObject0(
.map(s -> Convertor.toStreamObjectInRequest(s, version.get())).collect(Collectors.toList()))
.setCompactedObjectIds(commitStreamSetObjectRequest.getCompactedObjectIds())
.setFailoverMode(failoverMode);
if (commitStreamSetObjectRequest.getAttributes() == ObjectAttributes.UNSET.attributes()) {
if (commitStreamSetObjectRequest.getObjectId() != NOOP_OBJECT_ID && commitStreamSetObjectRequest.getAttributes() == ObjectAttributes.UNSET.attributes()) {
throw new IllegalArgumentException("[BUG]attributes must be set");
}
if (version.get().isObjectAttributesSupported()) {
Expand Down
4 changes: 3 additions & 1 deletion s3stream/src/main/java/com/automq/stream/s3/compact/CompactionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@
import org.apache.commons.lang3.tuple.Pair;
import org.slf4j.Logger;

import static com.automq.stream.s3.metadata.ObjectUtils.NOOP_OBJECT_ID;

public class CompactionManager {
private static final int MIN_COMPACTION_DELAY_MS = 60000;
// Max refill rate for Bucket: 1 token per nanosecond
Expand Down Expand Up @@ -529,7 +531,7 @@ CommitStreamSetObjectRequest buildSplitRequest(List<StreamMetadata> streamMetada
}

CommitStreamSetObjectRequest request = new CommitStreamSetObjectRequest();
request.setObjectId(-1L);
request.setObjectId(NOOP_OBJECT_ID);

// wait for all force split objects to complete
synchronized (this) {
Expand Down