Skip to content

HDDS-6476. Support FSO in OMOpenKeysDeleteRequest and Response #3233

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
captainzmc merged 2 commits into from
May 24, 2022
Merged

HDDS-6476. Support FSO in OMOpenKeysDeleteRequest and Response #3233

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
f3cf533
Support FSO keys in OpenKeysDeleteResponse
kaijchen May 19, 2022
900c6e2
Support FSO keys in OpenKeysDeleteRequest
kaijchen May 19, 2022
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: 2 additions & 3 deletions ...manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMOpenKeysDeleteRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
}

omClientResponse = new OMOpenKeysDeleteResponse(omResponse.build(),
deletedOpenKeys, ozoneManager.isRatisEnabled());
deletedOpenKeys, ozoneManager.isRatisEnabled(), getBucketLayout());

result = Result.SUCCESS;
} catch (IOException ex) {
Expand Down Expand Up @@ -151,8 +151,7 @@ private void updateOpenKeyTableCache(OzoneManager ozoneManager,
volumeName, bucketName);

for (OpenKey key: keysPerBucket.getKeysList()) {
String fullKeyName = omMetadataManager.getOpenKey(volumeName,
bucketName, key.getName(), key.getClientID());
String fullKeyName = key.getName();

// If an open key is no longer present in the table, it was committed
// and should not be deleted.
Expand Down
14 changes: 8 additions & 6 deletions ...nager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMOpenKeysDeleteResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.response.CleanupTableInfo;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse;

import javax.annotation.Nonnull;
import java.io.IOException;
Expand All @@ -43,10 +43,12 @@ public class OMOpenKeysDeleteResponse extends AbstractOMKeyDeleteResponse {
private Map<String, OmKeyInfo> keysToDelete;

public OMOpenKeysDeleteResponse(
@Nonnull OzoneManagerProtocolProtos.OMResponse omResponse,
@Nonnull Map<String, OmKeyInfo> keysToDelete, boolean isRatisEnabled) {
@Nonnull OMResponse omResponse,
@Nonnull Map<String, OmKeyInfo> keysToDelete,
boolean isRatisEnabled,
@Nonnull BucketLayout bucketLayout) {

super(omResponse, isRatisEnabled);
super(omResponse, isRatisEnabled, bucketLayout);
this.keysToDelete = keysToDelete;
}

Expand All @@ -55,8 +57,8 @@ public OMOpenKeysDeleteResponse(
* For a successful request, the other constructor should be used.
*/
public OMOpenKeysDeleteResponse(
@Nonnull OzoneManagerProtocolProtos.OMResponse omResponse, @Nonnull
BucketLayout bucketLayout) {
@Nonnull OMResponse omResponse,
@Nonnull BucketLayout bucketLayout) {

super(omResponse, bucketLayout);
}
Expand Down
Loading