Skip to content

HDDS-8440. Ozone Manager crashed when failed to delete FSO bucket. #4582

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
adoroszlai merged 3 commits into from
Apr 19, 2023
Merged

HDDS-8440. Ozone Manager crashed when failed to delete FSO bucket. #4582

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b905e28
HDDS-8440. Ozone Manager crashed when failed to delete FSO bucket.
ashishkr200 Apr 18, 2023
7abadbb
HDDS-8440. Ozone Manager crashed when failed to delete FSO bucket.
ashishkr200 Apr 18, 2023
b4acad7
Add generic types for dir/key/file tables
adoroszlai Apr 18, 2023
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
33 changes: 17 additions & 16 deletions ...p-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,15 +258,15 @@ public class OmMetadataManagerImpl implements OMMetadataManager,
private Table userTable;
private Table volumeTable;
private Table bucketTable;
private Table keyTable;
private Table<String, OmKeyInfo> keyTable;
private Table deletedTable;
private Table openKeyTable;
private Table<String, OmMultipartKeyInfo> multipartInfoTable;
private Table<String, S3SecretValue> s3SecretTable;
private Table dTokenTable;
private Table prefixTable;
private Table dirTable;
private Table fileTable;
private Table<String, OmDirectoryInfo> dirTable;
private Table<String, OmKeyInfo> fileTable;
private Table openFileTable;
private Table transactionInfoTable;
private Table metaTable;
Expand Down Expand Up @@ -968,30 +968,31 @@ public boolean isBucketEmpty(String volume, String bucket)
return true;
}


/**
* Checks if a key starting with a given keyPrefix exists in the table cache.
*
* @param keyPrefix - key prefix to be searched.
* @param table - table to be searched.
* @return true if the key is present in the cache.
*/
private boolean isKeyPresentInTableCache(String keyPrefix,
Table table) {
Iterator<Map.Entry<CacheKey<String>, CacheValue<OmKeyInfo>>> iterator =
private <T> boolean isKeyPresentInTableCache(String keyPrefix,
Table<String, T> table) {
Iterator<Map.Entry<CacheKey<String>, CacheValue<T>>> iterator =
table.cacheIterator();
while (iterator.hasNext()) {
Map.Entry<CacheKey<String>, CacheValue<OmKeyInfo>> entry =
Map.Entry<CacheKey<String>, CacheValue<T>> entry =
iterator.next();
String key = entry.getKey().getCacheKey();
OmKeyInfo omKeyInfo = entry.getValue().getCacheValue();
Object value = entry.getValue().getCacheValue();

// Making sure that entry is not for delete key request.
if (key.startsWith(keyPrefix) && omKeyInfo != null) {
if (key.startsWith(keyPrefix) && value != null) {
return true;
}
}
return false;
}

/**
* Checks if a key starts with the given prefix is present in the table.
*
Expand All @@ -1000,20 +1001,20 @@ private boolean isKeyPresentInTableCache(String keyPrefix,
* @return true if the key is present in the table
* @throws IOException
*/
private boolean isKeyPresentInTable(String keyPrefix,
Table<String, OmKeyInfo> table)
private <T> boolean isKeyPresentInTable(String keyPrefix,
Table<String, T> table)
throws IOException {
try (TableIterator<String, ? extends KeyValue<String, OmKeyInfo>>
try (TableIterator<String, ? extends KeyValue<String, T>>
keyIter = table.iterator()) {
KeyValue<String, OmKeyInfo> kv = keyIter.seek(keyPrefix);
KeyValue<String, T> kv = keyIter.seek(keyPrefix);

// Iterate through all the entries in the table which start with
// the current bucket's prefix.
while (kv != null && kv.getKey().startsWith(keyPrefix)) {
// Check the entry in db is not marked for delete. This can happen
// while entry is marked for delete, but it is not flushed to DB.
CacheValue<OmKeyInfo> cacheValue =
table.getCacheValue(new CacheKey(kv.getKey()));
CacheValue<T> cacheValue =
table.getCacheValue(new CacheKey<>(kv.getKey()));

// Case 1: We found an entry, but no cache entry.
if (cacheValue == null) {
Expand Down