Skip to content

fix: fix testUploadWALObject_sequence #184

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
Sep 19, 2023
Merged

fix: fix testUploadWALObject_sequence #184

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
22 changes: 8 additions & 14 deletions core/src/test/java/kafka/log/s3/S3StorageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@
import java.util.Collections;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicInteger;

import static kafka.log.s3.TestUtils.random;
import static org.junit.jupiter.api.Assertions.assertEquals;
Expand Down Expand Up @@ -141,12 +141,13 @@ public void testWALCallbackSequencer() {

@Test
public void testUploadWALObject_sequence() throws ExecutionException, InterruptedException, TimeoutException {
List<CompletableFuture<Long>> objectIdCfList = new CopyOnWriteArrayList<>();
doAnswer(invocation -> {
CompletableFuture<Long> objectIdCf = new CompletableFuture<>();
objectIdCfList.add(objectIdCf);
return objectIdCf;
}).when(objectManager).prepareObject(anyInt(), anyLong());
List<CompletableFuture<Long>> objectIdCfList = List.of(new CompletableFuture<>(), new CompletableFuture<>());
AtomicInteger objectCfIndex = new AtomicInteger();
doAnswer(invocation -> objectIdCfList.get(objectCfIndex.getAndIncrement())).when(objectManager).prepareObject(anyInt(), anyLong());

List<CompletableFuture<CommitWALObjectResponse>> commitCfList = List.of(new CompletableFuture<>(), new CompletableFuture<>());
AtomicInteger commitCfIndex = new AtomicInteger();
doAnswer(invocation -> commitCfList.get(commitCfIndex.getAndIncrement())).when(objectManager).commitWALObject(any());

LogCache.LogCacheBlock logCacheBlock1 = new LogCache.LogCacheBlock(1024);
logCacheBlock1.put(newRecord(233L, 10L));
Expand All @@ -163,13 +164,6 @@ public void testUploadWALObject_sequence() throws ExecutionException, Interrupte
// sequence get objectId
verify(objectManager, timeout(1000).times(1)).prepareObject(anyInt(), anyLong());

List<CompletableFuture<CommitWALObjectResponse>> commitCfList = new CopyOnWriteArrayList<>();
doAnswer(invocation -> {
CompletableFuture<CommitWALObjectResponse> cf = new CompletableFuture<>();
commitCfList.add(cf);
return cf;
}).when(objectManager).commitWALObject(any());

objectIdCfList.get(0).complete(1L);
// trigger next upload prepare objectId
verify(objectManager, timeout(1000).times(2)).prepareObject(anyInt(), anyLong());
Expand Down