Skip to content

Fix worker report all block locations to master for async restore #16897

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

Open
fffanyang wants to merge 7 commits into
base: master-2.x
Choose a base branch
from
Open

Fix worker report all block locations to master for async restore #16897

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4d3d8b8
Fix worker report all block locations to master for async restore
fffanyang Feb 16, 2023
d3218e4
Fix worker report all block locations to master for async restore
fffanyang Feb 17, 2023
16bb004
Fix worker report all block locations to master for async restore
fffanyang Mar 21, 2023
73038a1
Fix worker report all block locations to master for async restore
fffanyang Mar 27, 2023
53328e0
Fix worker report all block locations to master for async restore
Mar 30, 2023
2fe2dc6
Fix worker report all block locations to master for async restore
Apr 10, 2023
9990bb7
Add interface javadoc
fffanyang Apr 18, 2023
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
5 changes: 5 additions & 0 deletions core/client/fs/src/main/java/alluxio/client/file/cache/LocalCacheManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,6 +614,11 @@ private boolean restore(PageStoreDir pageStoreDir) {
LOG.error("Failed to restore PageStore", e);
return false;
}
if (mInitService.isPresent()) {
try (LockResource r = new LockResource(mPageMetaStore.getLock().readLock())) {
mPageMetaStore.reportBlocks(pageStoreDir);
}
}
LOG.info("PageStore ({}) restored with {} pages ({} bytes), "
+ "discarded {} pages ({} bytes)",
pageStoreDir.getRootPath(), mPageMetaStore.numPages(), mPageMetaStore.bytes(),
Expand Down
7 changes: 7 additions & 0 deletions core/client/fs/src/main/java/alluxio/client/file/cache/PageMetaStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,13 @@ static PageMetaStore create(CacheManagerOptions options) throws IOException {
*/
void addPage(PageId pageId, PageInfo pageInfo);

/**
* Report all block locations in a pageStoreDir to master using BlockHeartbeat.
*
* @param pageStoreDir the page store dir targeted to report
*/
default void reportBlocks(PageStoreDir pageStoreDir) {}
Copy link
Copy Markdown
Contributor

@maobaolong maobaolong Feb 17, 2023

Choose a reason for hiding this comment

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

Missing a Javadoc comment
Copy link
Copy Markdown
Contributor

@dbw9580 dbw9580 Feb 21, 2023

Choose a reason for hiding this comment

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

The page cache implementation is shared by the client side local cache, as well as the worker side paged block store. So PageMetaStore is also used by the client side local cache, adding a method specifically for doing worker-master sync is not appropriate here.

/**
* Adds a new temp page to the cache.
*
Expand Down
15 changes: 15 additions & 0 deletions core/server/worker/src/main/java/alluxio/worker/page/PagedBlockMetaStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,21 @@ public PagedBlockStoreMeta getStoreMetaFull() {
usedBytesOnDirs.build(), blockOnDirs.build());
}

@Override
@GuardedBy("getLock().readLock()")
public void reportBlocks(PageStoreDir pageStoreDir) {
final PagedBlockStoreDir pagedBlockStoreDir = downcast(pageStoreDir);
Set<PagedBlockMeta> blockMetas = mBlocks.getByField(INDEX_STORE_DIR, pagedBlockStoreDir);
for (PagedBlockMeta blockMeta : blockMetas) {
for (BlockStoreEventListener listener : mBlockStoreEventListeners) {
synchronized (listener) {
listener.onMoveBlockByWorker(blockMeta.getBlockId(),
Copy link
Copy Markdown
Contributor

@maobaolong maobaolong Feb 17, 2023

Choose a reason for hiding this comment

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

This is a tricky way to report the blocks generated by pageStore to master by Incrementally, but it need a full block report during register stage.
blockMeta.getBlockLocation(), blockMeta.getBlockLocation());
}
}
}
}

private static PagedBlockStoreDir downcast(PageStoreDir pageStoreDir) {
if (pageStoreDir instanceof PagedBlockStoreDir) {
return (PagedBlockStoreDir) pageStoreDir;
Expand Down