Skip to content

Core: add test for deadlock in CachingCatalog #3798

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

Closed
racevedoo wants to merge 1 commit into from
Closed

Core: add test for deadlock in CachingCatalog #3798

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
45 changes: 45 additions & 0 deletions core/src/test/java/org/apache/iceberg/hadoop/TestCachingCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,17 @@

package org.apache.iceberg.hadoop;

import com.github.benmanes.caffeine.cache.Cache;
import java.io.IOException;
import java.time.Duration;
import java.util.Arrays;
import java.util.Locale;
import java.util.Optional;
import java.util.Random;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.iceberg.AssertHelpers;
import org.apache.iceberg.CachingCatalog;
import org.apache.iceberg.CatalogProperties;
Expand All @@ -40,6 +46,7 @@
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;

public class TestCachingCatalog extends HadoopTableTestBase {
Expand Down Expand Up @@ -276,6 +283,44 @@ public void testCacheExpirationIsDisabledByANegativeValue() throws IOException {
catalog.isCacheExpirationEnabled());
}

@Test
@Ignore("reproduces https://github.com/apache/iceberg/issues/3791")
Copy link
Contributor Author

@racevedoo racevedoo Dec 23, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test passes with the changes in #3801

Copy link
Contributor

@kbendick kbendick Dec 24, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Eventually, we might want to put this test into the source (and leave it with the Ignore) so it can be reran. At the least lets, reference the other PR here so people will have a higher chance of seeing the link: #3801

public void testDeadlock() throws IOException, InterruptedException {
HadoopCatalog underlyingCatalog = hadoopCatalog();
TestableCachingCatalog catalog = TestableCachingCatalog.wrap(underlyingCatalog, Duration.ofSeconds(1), ticker);
Namespace namespace = Namespace.of("db", "ns1", "ns2");
int numThreads = 20;
for (int i = 0; i < numThreads; i++) {
TableIdentifier tableIdent = TableIdentifier.of(namespace, "tbl" + i);
catalog.createTable(tableIdent, SCHEMA, SPEC, ImmutableMap.of("key", "value"));
}

Cache<TableIdentifier, Table> cache = catalog.cache();
AtomicInteger cacheGetCount = new AtomicInteger(0);
AtomicInteger cacheCleanupCount = new AtomicInteger(0);
ExecutorService executor = Executors.newFixedThreadPool(numThreads);
Random rand = new Random();
for (int i = 0; i < numThreads; i++) {
if (i % 2 == 0) {
executor.submit(() -> {
ticker.advance(Duration.ofSeconds(2));
cache.get(TableIdentifier.of(namespace, "tbl" + rand.nextInt(numThreads)), underlyingCatalog::loadTable);
cacheGetCount.incrementAndGet();
});
} else {
executor.submit(() -> {
ticker.advance(Duration.ofSeconds(2));
cache.cleanUp();
cacheCleanupCount.incrementAndGet();
});
}
}
executor.awaitTermination(2, TimeUnit.SECONDS);
Assertions.assertThat(cacheGetCount).hasValue(numThreads / 2);
Assertions.assertThat(cacheCleanupCount).hasValue(numThreads / 2);
executor.shutdown();
}

public static TableIdentifier[] metadataTables(TableIdentifier tableIdent) {
return Arrays.stream(MetadataTableType.values())
.map(type -> TableIdentifier.parse(tableIdent + "." + type.name().toLowerCase(Locale.ROOT)))
Expand Down