Skip to content
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

[FIX] awaitility schedule conflicts #204

Merged
merged 2 commits into from
Sep 28, 2019
Merged

[FIX] awaitility schedule conflicts #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4da8cd9
[FIX] awaitility schedule conflicts
gangliao Sep 28, 2019
92f5eb7
update
gangliao Sep 28, 2019
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
6 changes: 0 additions & 6 deletions hadoop-hdfs-project/hadoop-hdfs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
</properties>

<dependencies>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<version>4.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>commons-pool2</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ...roject/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2552,7 +2552,7 @@ private HdfsFileStatus startFileInt(String src,

String syncStr = System.getenv("SYNC_COMMAND_LOGGING");
if (syncStr != null && Boolean.parseBoolean(syncStr) == true) {
await().atMost(10, SECONDS).until(() -> INodeKeyedObjects.getBackupSet().size() < 1024);
INodeKeyedObjects.syncUpdateDB();
}

return stat;
Expand Down
101 changes: 54 additions & 47 deletions ...t/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeKeyedObjects.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,59 +33,62 @@ public static Set<Long> getBackupSet() {
return concurrentHashSet;
}

public static void BackupSetToDB() {
public static void syncUpdateDB() {
// In HDFS, the default log buffer size is 512 * 1024 bytes, or 512 KB.
// We assume that each object size is 512 bytes, then the size of
// concurrentHashSet should be 1024 which only records INode Id.
// Note: Using INode Id, it's easy to find INode object in cache.

int i = 0;
final int num = 1024;
if (concurrentHashSet.size() >= num) {
Iterator<Long> iterator = concurrentHashSet.iterator();
if (LOG.isInfoEnabled()) {
LOG.info("Sync files/directories from cache to database.");
}

List<Long> longAttr = new ArrayList<>();
List<String> strAttr = new ArrayList<>();

List<Long> fileIds = new ArrayList<>();
List<String> fileAttr = new ArrayList<>();
while (iterator.hasNext()) {
INode inode =
INodeKeyedObjects.getCache().getIfPresent(Long.class, iterator.next());

strAttr.add(inode.getLocalName());
longAttr.add(inode.getParentId());
longAttr.add(inode.getId());
longAttr.add(inode.getModificationTime());
longAttr.add(inode.getAccessTime());
longAttr.add(inode.getPermissionLong());
if (inode.isDirectory()) {
longAttr.add(0L);
} else {
longAttr.add(inode.asFile().getHeaderLong());
FileUnderConstructionFeature uc =
inode.asFile().getFileUnderConstructionFeature();
if (uc != null) {
fileIds.add(inode.getId());
fileAttr.add(uc.getClientName(inode.getId()));
fileAttr.add(uc.getClientMachine(inode.getId()));
}
}
iterator.remove();
if (++i >= num) break;
}
try {
DatabaseINode.batchUpdateINodes(longAttr, strAttr, fileIds, fileAttr);
} catch (Exception e) {
e.printStackTrace();
}
}
}

public static void BackupSetToDB() {
final Runnable updateToDB =
new Runnable() {
public void run() {
int i = 0;
final int num = 1024;
if (concurrentHashSet.size() >= num) {
Iterator<Long> iterator = concurrentHashSet.iterator();
if (LOG.isInfoEnabled()) {
LOG.info("Sync files/directories from cache to database.");
}

List<Long> longAttr = new ArrayList<>();
List<String> strAttr = new ArrayList<>();

List<Long> fileIds = new ArrayList<>();
List<String> fileAttr = new ArrayList<>();
while (iterator.hasNext()) {
INode inode =
INodeKeyedObjects.getCache().getIfPresent(Long.class, iterator.next());

strAttr.add(inode.getLocalName());
longAttr.add(inode.getParentId());
longAttr.add(inode.getId());
longAttr.add(inode.getModificationTime());
longAttr.add(inode.getAccessTime());
longAttr.add(inode.getPermissionLong());
if (inode.isDirectory()) {
longAttr.add(0L);
} else {
longAttr.add(inode.asFile().getHeaderLong());
FileUnderConstructionFeature uc =
inode.asFile().getFileUnderConstructionFeature();
if (uc != null) {
fileIds.add(inode.getId());
fileAttr.add(uc.getClientName(inode.getId()));
fileAttr.add(uc.getClientMachine(inode.getId()));
}
}
iterator.remove();
if (++i >= num) break;
}
try {
DatabaseINode.batchUpdateINodes(longAttr, strAttr, fileIds, fileAttr);
} catch (Exception e) {
e.printStackTrace();
}
}
syncUpdateDB();
}
};

Expand Down Expand Up @@ -117,7 +120,11 @@ public void run() {
public static IndexedCache<CompositeKey, INode> getCache() {
if (cache == null) {
concurrentHashSet = ConcurrentHashMap.newKeySet();
BackupSetToDB();

String syncStr = System.getenv("SYNC_COMMAND_LOGGING");
if (syncStr == null || Boolean.parseBoolean(syncStr) == false) {
BackupSetToDB();
}

// Assuming each INode has 600 bytes, then
// 10000000 * 600 / 2^30 = 5.58 GB.
Expand Down