Skip to content

Commit

Permalink
address comments
Browse files Browse the repository at this point in the history
  • Loading branch information
@ChenSammi
ChenSammi committed Apr 30, 2024
1 parent 101943b commit 7625938
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 66 deletions.
11 changes: 0 additions & 11 deletions hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneKeyLocation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,15 +90,4 @@ public long getKeyOffset() {
return keyOffset;
}

public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("conID ").append(containerID);
sb.append(" ");
sb.append("locID ").append(localID);
sb.append(" ");
sb.append("length ").append(length);
sb.append(" ");
sb.append("keyOffset ").append(keyOffset);
return sb.toString();
}
}
79 changes: 27 additions & 52 deletions hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestHSync.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -998,44 +998,34 @@ public void testNormalKeyOverwriteHSyncKey() throws Exception {
String data2 = "data for hsynced file";
final Path file = new Path(dir, "file-normal-overwrite-hsync");
try (FileSystem fs = FileSystem.get(CONF)) {
FSDataOutputStream outputStream1 = null;
FSDataOutputStream outputStream2 = null;

// create hsync key
outputStream1 = fs.create(file, true);
FSDataOutputStream outputStream1 = fs.create(file, true);
outputStream1.write(data2.getBytes(UTF_8), 0, data2.length());
outputStream1.hsync();
// write more data
String s = RandomStringUtils.randomAlphabetic(BLOCK_SIZE);
byte[] newData = s.getBytes(StandardCharsets.UTF_8);
outputStream1.write(newData);

// create normal key and commit
outputStream2 = fs.create(file, true);
FSDataOutputStream outputStream2 = fs.create(file, true);
outputStream2.write(data1.getBytes(UTF_8), 0, data1.length());
outputStream2.close();
assertEquals(data1.length(), metrics.getDataCommittedBytes());

// hsync call for overwritten hsync key, should fail
OMException omException = assertThrows(OMException.class, () -> outputStream1.hsync());
assertTrue(omException.getResult() == OMException.ResultCodes.KEY_NOT_FOUND);
assertTrue(omException.getMessage().contains("already deleted/overwritten"));

// allocate new block for overwritten hsync key, should fail
String s = RandomStringUtils.randomAlphabetic(BLOCK_SIZE);
byte[] newData = s.getBytes(StandardCharsets.UTF_8);
try {
outputStream1.write(newData);
} catch (IOException e) {
assertTrue(e.getCause() instanceof OMException);
assertTrue(((OMException)e.getCause()).getResult() == OMException.ResultCodes.KEY_NOT_FOUND);
assertTrue(e.getMessage().contains("already deleted/overwritten"));
}
// commit overwritten hsync key, should fail
try {
outputStream1.close();
} catch (OMException e) {
assertTrue(e.getResult() == OMException.ResultCodes.KEY_NOT_FOUND);
assertTrue(e.getMessage().contains("already deleted/overwritten"));
}
// recover overwritten hsync key, should fail
try {
((RootedOzoneFileSystem)fs).recoverLease(file);
} catch (OMException e) {
assertTrue(e.getResult() == OMException.ResultCodes.KEY_NOT_FOUND);
assertTrue(e.getMessage().contains("already deleted/overwritten"));
}
IOException ioException = assertThrows(IOException.class, () -> outputStream1.write(newData));
assertTrue(ioException.getCause() instanceof OMException);
assertTrue(((OMException)ioException.getCause()).getResult() == OMException.ResultCodes.KEY_NOT_FOUND);
assertTrue(ioException.getMessage().contains("already deleted/overwritten"));

// recover key will success since key is already committed by outputStream2
((RootedOzoneFileSystem)fs).recoverLease(file);

Map<String, OmKeyInfo> openKeys = getAllOpenKeys(openKeyTable);
Map<String, RepeatedOmKeyInfo> deletedKeys = getAllDeletedKeys(deletedTable);
Expand Down Expand Up @@ -1107,17 +1097,14 @@ public void testHSyncKeyOverwriteNormalKey() throws Exception {
String data2 = "data for hsynced file";
final Path file = new Path(dir, "file-hsync-overwrite-normal");
try (FileSystem fs = FileSystem.get(CONF)) {
FSDataOutputStream outputStream1 = null;
FSDataOutputStream outputStream2 = null;

// create and commit normal key
outputStream1 = fs.create(file, true);
FSDataOutputStream outputStream1 = fs.create(file, true);
outputStream1.write(data1.getBytes(UTF_8), 0, data1.length());
outputStream1.close();
assertEquals(data1.length(), metrics.getDataCommittedBytes());

// create hsync key and commit
outputStream2 = fs.create(file, true);
FSDataOutputStream outputStream2 = fs.create(file, true);
outputStream2.write(data2.getBytes(UTF_8), 0, data2.length());
outputStream2.hsync();
outputStream2.close();
Expand Down Expand Up @@ -1181,34 +1168,22 @@ public void testHSyncKeyOverwriteHSyncKey() throws Exception {
String data2 = "data for second hsynced file";
final Path file = new Path(dir, "file-hsync-overwrite-hsync");
try (FileSystem fs = FileSystem.get(CONF)) {
FSDataOutputStream outputStream1 = null;
FSDataOutputStream outputStream2 = null;

// create first hsync key and call hsync
outputStream1 = fs.create(file, true);
FSDataOutputStream outputStream1 = fs.create(file, true);
outputStream1.write(data1.getBytes(UTF_8), 0, data1.length());
outputStream1.hsync();

// create second hync key and call hsync
outputStream2 = fs.create(file, true);
FSDataOutputStream outputStream2 = fs.create(file, true);
outputStream2.write(data2.getBytes(UTF_8), 0, data2.length());
outputStream2.hsync();

// hsync/close first overwritten hsync key should fail
try {
outputStream1.hsync();
} catch (OMException e) {
assertTrue(e.getResult() == OMException.ResultCodes.KEY_NOT_FOUND);
assertTrue(e.getMessage().contains("already deletec/overwritten"));
}
try {
outputStream1.close();
} catch (OMException e) {
assertTrue(e.getResult() == OMException.ResultCodes.KEY_NOT_FOUND);
assertTrue(e.getMessage().contains("already deleted/overwritten"));
}
// close first hsync key should fail
OMException omException = assertThrows(OMException.class, () -> outputStream1.close());
assertTrue(omException.getResult() == OMException.ResultCodes.KEY_NOT_FOUND);
assertTrue(omException.getMessage().contains("already deleted/overwritten"));

// hsync/close second hsync key should fail
// hsync/close second hsync key should success
outputStream2.hsync();
outputStream2.close();

Expand Down
5 changes: 2 additions & 3 deletions ...-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMRecoverLeaseRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,9 +221,8 @@ private RecoverLeaseResponse doWork(OzoneManager ozoneManager,
throw new OMException("Open Key " + dbOpenFileKey + " not found in openKeyTable", KEY_NOT_FOUND);
}

if (openKeyInfo.getMetadata().containsKey(OzoneConsts.DELETED_HSYNC_KEY) ||
openKeyInfo.getMetadata().containsKey(OzoneConsts.OVERWRITTEN_HSYNC_KEY)) {
throw new OMException("Open Key " + keyName + " is already deleted/overwritten",
if (openKeyInfo.getMetadata().containsKey(OzoneConsts.DELETED_HSYNC_KEY)) {
throw new OMException("Open Key " + keyName + " is already deleted",
KEY_NOT_FOUND);
}

Expand Down

0 comments on commit 7625938

Please sign in to comment.