HDDS-11807. Make callId different for each request in openKeyCleanupService #7551
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -496,6 +496,52 @@ public void testOfsHSync(boolean incrementalChunkList) throws Exception { | |
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void testHSyncOpenKeyCommitAfterExpiry() throws Exception { | ||
| // Set the fs.defaultFS | ||
| final String rootPath = String.format("%s://%s/", | ||
| OZONE_OFS_URI_SCHEME, CONF.get(OZONE_OM_ADDRESS_KEY)); | ||
| CONF.set(CommonConfigurationKeysPublic.FS_DEFAULT_NAME_KEY, rootPath); | ||
|
|
||
| final Path key1 = new Path("hsync-key"); | ||
| final Path key2 = new Path("key2"); | ||
|
|
||
| try (FileSystem fs = FileSystem.get(CONF)) { | ||
| // Create key1 with hsync | ||
| try (FSDataOutputStream os = fs.create(key1, true)) { | ||
| os.write(1); | ||
| os.hsync(); | ||
| // Create key2 without hsync | ||
| try (FSDataOutputStream os1 = fs.create(key2, true)) { | ||
| os1.write(1); | ||
| // There should be 2 key in openFileTable | ||
| assertThat(2 == getOpenKeyInfo(BUCKET_LAYOUT).size()); | ||
| // One key will be in fileTable as hsynced | ||
| assertThat(1 == getKeyInfo(BUCKET_LAYOUT).size()); | ||
|
|
||
| // Resume openKeyCleanupService | ||
| openKeyCleanupService.resume(); | ||
| // Verify hsync openKey gets committed eventually | ||
| // Key without hsync is deleted | ||
| GenericTestUtils.waitFor(() -> | ||
| 0 == getOpenKeyInfo(BUCKET_LAYOUT).size(), 1000, 12000); | ||
| // Verify only one key is still present in fileTable | ||
| assertThat(1 == getKeyInfo(BUCKET_LAYOUT).size()); | ||
|
|
||
| // Clean up | ||
| assertTrue(fs.delete(key1, false)); | ||
| waitForEmptyDeletedTable(); | ||
| } catch (OMException ex) { | ||
| assertEquals(OMException.ResultCodes.KEY_NOT_FOUND, ex.getResult()); | ||
|
Contributor
There was a problem hiding this comment. @ashishkumar50 , if key2 is not explicitly deleted, will os1 still throws KEY_NOT_FOUND? Given the issue to fix, I would suggest this new test to have one hsynced key and one normal key to cover the case.
Contributor
Author
There was a problem hiding this comment. Added one hsync and one normal key.
Yes because when os1 is geting closed it will try to commit key and which it will not find and throws KEY_NOT_FOUND error. |
||
| } | ||
| } catch (OMException ex) { | ||
| assertEquals(OMException.ResultCodes.KEY_NOT_FOUND, ex.getResult()); | ||
| } finally { | ||
| openKeyCleanupService.suspend(); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void testHSyncDeletedKey() throws Exception { | ||
| // Verify that a key can't be successfully hsync'ed again after it's deleted, | ||
|
|
@@ -595,6 +641,21 @@ private List<OmKeyInfo> getOpenKeyInfo(BucketLayout bucketLayout) { | |
| return omKeyInfo; | ||
| } | ||
|
|
||
| private List<OmKeyInfo> getKeyInfo(BucketLayout bucketLayout) { | ||
| List<OmKeyInfo> omKeyInfo = new ArrayList<>(); | ||
|
|
||
| Table<String, OmKeyInfo> openFileTable = | ||
| cluster.getOzoneManager().getMetadataManager().getKeyTable(bucketLayout); | ||
| try (TableIterator<String, ? extends Table.KeyValue<String, OmKeyInfo>> | ||
| iterator = openFileTable.iterator()) { | ||
| while (iterator.hasNext()) { | ||
| omKeyInfo.add(iterator.next().getValue()); | ||
| } | ||
| } catch (Exception e) { | ||
| } | ||
| return omKeyInfo; | ||
| } | ||
|
|
||
| @Test | ||
| public void testUncommittedBlocks() throws Exception { | ||
| waitForEmptyDeletedTable(); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.