Skip to content

HDDS-5367. Update modification time when updating quota/storageType/v… #2355

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

Merged
ChenSammi merged 1 commit into from
Jun 23, 2021
Merged

HDDS-5367. Update modification time when updating quota/storageType/v… #2355

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
1 change: 1 addition & 0 deletions hadoop-ozone/interface-client/src/main/proto/OmClientProtocol.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -693,6 +693,7 @@ message InfoBucketResponse {

message SetBucketPropertyRequest {
optional BucketArgs bucketArgs = 1;
optional uint64 modificationTime = 2;
}

message SetBucketPropertyResponse {
Expand Down
19 changes: 18 additions & 1 deletion ...r/src/main/java/org/apache/hadoop/ozone/om/request/bucket/OMBucketSetPropertyRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs;
import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerDoubleBufferHelper;
import org.apache.hadoop.ozone.om.request.util.OmResponseUtil;
import org.apache.hadoop.util.Time;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -69,6 +70,21 @@ public OMBucketSetPropertyRequest(OMRequest omRequest) {
super(omRequest);
}

@Override
public OMRequest preExecute(OzoneManager ozoneManager)
throws IOException {
long modificationTime = Time.now();
OzoneManagerProtocolProtos.SetBucketPropertyRequest.Builder
setBucketPropertyRequestBuilder = getOmRequest()
.getSetBucketPropertyRequest().toBuilder()
.setModificationTime(modificationTime);

return getOmRequest().toBuilder()
.setSetBucketPropertyRequest(setBucketPropertyRequestBuilder)
.setUserInfo(getUserInfo())
.build();
}

@Override
@SuppressWarnings("methodlength")
public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
Expand Down Expand Up @@ -168,7 +184,8 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
}

bucketInfoBuilder.setCreationTime(dbBucketInfo.getCreationTime());

bucketInfoBuilder.setModificationTime(
setBucketPropertyRequest.getModificationTime());
// Set acls from dbBucketInfo if it has any.
if (dbBucketInfo.getAcls() != null) {
bucketInfoBuilder.setAcls(dbBucketInfo.getAcls());
Expand Down
10 changes: 10 additions & 0 deletions ...c/test/java/org/apache/hadoop/ozone/om/request/bucket/TestOMBucketSetPropertyRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,16 @@ public void testPreExecute() throws Exception {
OMBucketSetPropertyRequest omBucketSetPropertyRequest =
new OMBucketSetPropertyRequest(omRequest);

OMRequest preExecuteRequest =
omBucketSetPropertyRequest.preExecute(ozoneManager);
// When preExecute() of bucket setProperty,
// the new modification time is greater than origin one.
long originModTime = omRequest.getSetBucketPropertyRequest()
.getModificationTime();
long newModTime = preExecuteRequest.getSetBucketPropertyRequest()
.getModificationTime();
Assert.assertTrue(newModTime > originModTime);

// As user info gets added.
Assert.assertNotEquals(omRequest,
omBucketSetPropertyRequest.preExecute(ozoneManager));
Expand Down