Skip to content

#63. Dynamometer does not support negative block id's #66

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

#63. Dynamometer does not support negative block id's #66

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
3 changes: 2 additions & 1 deletion dynamometer-blockgen/src/main/java/com/linkedin/dynamometer/blockgenerator/XMLParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@
*/
class XMLParser {

// Legacy block id can be negative
private static final Pattern BLOCK_PATTERN =
Pattern.compile("<block><id>(\\d+)</id><genstamp>(\\d+)</genstamp><numBytes>(\\d+)</numBytes></block>");
Pattern.compile("<block><id>(-?\\d+)</id><genstamp>(\\d+)</genstamp><numBytes>(\\d+)</numBytes></block>");

private State currentState = State.DEFAULT;
private short currentReplication;
Expand Down
16 changes: 14 additions & 2 deletions dynamometer-infra/src/main/java/com/linkedin/dynamometer/SimulatedMultiStorageFSDataset.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,14 +581,26 @@ public synchronized void injectBlocks(String bpid,

for (Block b: injectBlocks) {
BInfo binfo = new BInfo(bpid, b, false);
blockMaps.get((int) (b.getBlockId() % storages.size())).put(binfo.theBlock, binfo);
long indexOfBlock;
if (b.getBlockId() < 0) {
indexOfBlock = (b.getBlockId() * (-1)) % storages.size();
} else {
indexOfBlock = b.getBlockId() % storages.size();
}
blockMaps.get((int) indexOfBlock).put(binfo.theBlock, binfo);
}
}
}

/** Get the storage that a given block lives within. */
private SimulatedStorage getStorage(Block b) {
return storages.get((int) (b.getBlockId() % storages.size()));
long indexOfBlock;
if (b.getBlockId() < 0) {
indexOfBlock = (b.getBlockId() * (-1)) % storages.size();
} else {
indexOfBlock = b.getBlockId() % storages.size();
}
return storages.get((int) indexOfBlock);
}

/**
Expand Down