smengcl commented on code in PR #6046:
URL: https://github.com/apache/ozone/pull/6046#discussion_r1464286709
##########
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequest.java:
##########
@@ -337,6 +346,13 @@ public OMClientResponse
validateAndUpdateCache(OzoneManager ozoneManager, TermIn
// So that this key can't be committed again.
omMetadataManager.getOpenKeyTable(getBucketLayout()).addCacheEntry(
dbOpenKey, trxnLogIndex);
+
+ // Prevent hsync metadata from getting committed to the final key
+ omKeyInfo.getMetadata().remove(OzoneConsts.HSYNC_CLIENT_ID);
+ } else if (updateOpenKeyTable) {
+ // Both isHSync and updateOpenKeyTable are true, update OpenKeyTable
+ omMetadataManager.getOpenKeyTable(getBucketLayout()).addCacheEntry(
+ dbOpenKey, omKeyInfo, trxnLogIndex);
Review Comment:
done in 7bdb08312a11ca9c37114eee0840be9a96460a01
##########
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java:
##########
@@ -1888,19 +1859,19 @@ public ExpiredOpenKeys getExpiredOpenKeys(Duration
expireThreshold,
} else {
// add hsync'ed keys
final KeyArgs.Builder keyArgs = KeyArgs.newBuilder()
- .setVolumeName(info.getVolumeName())
- .setBucketName(info.getBucketName())
- .setKeyName(info.getKeyName())
- .setDataSize(info.getDataSize());
- java.util.Optional.ofNullable(info.getLatestVersionLocations())
+ .setVolumeName(openKeyInfo.getVolumeName())
+ .setBucketName(openKeyInfo.getBucketName())
+ .setKeyName(openKeyInfo.getKeyName())
+ .setDataSize(openKeyInfo.getDataSize());
Review Comment:
done in 9ac270e4ffab432014fbf9b19efe7d8fd21646f1
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
