franz1981 commented on a change in pull request #2645: ARTEMIS-2321 Paging
scalability and GC improvement
URL: https://github.com/apache/activemq-artemis/pull/2645#discussion_r282275541
##########
File path:
artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageCursorProviderImpl.java
##########
@@ -132,43 +137,57 @@ public PagedReference newReference(final PagePosition
pos,
@Override
public PageCache getPageCache(final long pageId) {
try {
+ if (pageId > pagingStore.getCurrentWritingPage()) {
+ return null;
+ }
+ boolean createPage = false;
+ CompletableFuture<PageCache> inProgressReadPage;
PageCache cache;
+ Page page = null;
synchronized (softCache) {
- if (pageId > pagingStore.getCurrentWritingPage()) {
+ cache = softCache.get(pageId);
+ if (cache != null) {
+ return cache;
+ }
+ if (!pagingStore.checkPageFileExists((int) pageId)) {
return null;
}
-
- cache = softCache.get(pageId);
- if (cache == null) {
- if (!pagingStore.checkPageFileExists((int) pageId)) {
- return null;
- }
-
+ inProgressReadPage = inProgressReadPages.get(pageId);
+ if (inProgressReadPage == null) {
+ final CompletableFuture<PageCache> readPage = new
CompletableFuture<>();
cache = createPageCache(pageId);
- // anyone reading from this cache will have to wait reading to
finish first
- // we also want only one thread reading this cache
- logger.tracef("adding pageCache pageNr=%d into cursor = %s",
pageId, this.pagingStore.getAddress());
- readPage((int) pageId, cache);
- softCache.put(pageId, cache);
+ page = pagingStore.createPage((int) pageId);
+ createPage = true;
+ inProgressReadPage = readPage;
+ inProgressReadPages.put(pageId, readPage);
}
}
-
- return cache;
+ if (createPage) {
+ return readPage(pageId, page, cache, inProgressReadPage);
+ } else {
+ return inProgressReadPage.get(10, TimeUnit.SECONDS);
Review comment:
It is already outdated: I've added proper logging around this method and the
behaviour is the same as before
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
