Skip to content

HDFS-16984. Directory timestamp lost during the upgrade process #6175

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
wants to merge 1 commit into from
Closed

HDFS-16984. Directory timestamp lost during the upgrade process #6175

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
5 changes: 3 additions & 2 deletions ...adoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormatPBINode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ public static INodeDirectory loadINodeDirectory(INodeSection.INode n,
final PermissionStatus permissions = loadPermission(d.getPermission(),
state.getStringTable());
final INodeDirectory dir = new INodeDirectory(n.getId(), n.getName()
.toByteArray(), permissions, d.getModificationTime());
.toByteArray(), permissions, d.getModificationTime(), d.getAccessTime());
final long nsQuota = d.getNsQuota(), dsQuota = d.getDsQuota();
if (nsQuota >= 0 || dsQuota >= 0) {
dir.addDirectoryWithQuotaFeature(new DirectoryWithQuotaFeature.Builder().
Expand Down Expand Up @@ -707,7 +707,8 @@ public static INodeSection.INodeDirectory.Builder buildINodeDirectory(
.newBuilder().setModificationTime(dir.getModificationTime())
.setNsQuota(quota.getNameSpace())
.setDsQuota(quota.getStorageSpace())
.setPermission(buildPermissionStatus(dir));
.setPermission(buildPermissionStatus(dir))
.setAccessTime(dir.getAccessTime());

if (quota.getTypeSpaces().anyGreaterOrEqual(0)) {
b.setTypeQuotas(buildQuotaByStorageTypeEntries(quota));
Expand Down
6 changes: 6 additions & 0 deletions ...ject/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeDirectory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,12 @@ public INodeDirectory(long id, byte[] name, PermissionStatus permissions,
long mtime) {
super(id, name, permissions, mtime, 0L);
}

/** constructor */
public INodeDirectory(long id, byte[] name, PermissionStatus permissions,
long mtime, long atime) {
super(id, name, permissions, mtime, atime);
}

/**
* Copy constructor
Expand Down
1 change: 1 addition & 0 deletions hadoop-hdfs-project/hadoop-hdfs/src/main/proto/fsimage.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ message INodeSection {
optional AclFeatureProto acl = 5;
optional XAttrFeatureProto xAttrs = 6;
optional QuotaByStorageTypeFeatureProto typeQuotas = 7;
optional uint64 accessTime = 8;
}

message INodeSymlink {
Expand Down