Skip to content

HDDS-11349. Add NullPointer handling when volume/bucket tables are not initialized #7103

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
tanvipenumudy merged 3 commits into from
Aug 21, 2024
Merged

HDDS-11349. Add NullPointer handling when volume/bucket tables are not initialized #7103

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9ba166
Initial commit to handle Null Volume Table
devabhishekpal Aug 21, 2024
cdb2fc7
Added null handling for buckets API
devabhishekpal Aug 21, 2024
65f25a8
Fixed checkstyle issues
devabhishekpal Aug 21, 2024
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
15 changes: 14 additions & 1 deletion ...econ/src/main/java/org/apache/hadoop/ozone/recon/recovery/ReconOmMetadataManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,16 @@ public List<OmVolumeArgs> listVolumes(String startKey,
// Unlike in {@link OmMetadataManagerImpl}, the volumes are queried directly
// from the volume table (not through cache) since Recon does not use
// Table cache.
Table<String, OmVolumeArgs> volumeTable = getVolumeTable();

// If the table is not yet initialized, i.e. it is null
// Return empty list as response
if (volumeTable == null) {
return result;
}

try (TableIterator<String, ? extends Table.KeyValue<String, OmVolumeArgs>>
iterator = getVolumeTable().iterator()) {
iterator = volumeTable.iterator()) {

while (iterator.hasNext() && result.size() < maxKeys) {
Table.KeyValue<String, OmVolumeArgs> kv = iterator.next();
Expand Down Expand Up @@ -296,6 +304,11 @@ private List<OmBucketInfo> listAllBuckets(final int maxNumberOfBuckets)

int currentCount = 0;
Table<String, OmBucketInfo> bucketTable = getBucketTable();
// If the table is not yet initialized, i.e. it is null
// Return empty list as response
if (bucketTable == null) {
return result;
}

try (TableIterator<String, ? extends Table.KeyValue<String, OmBucketInfo>>
iterator = bucketTable.iterator()) {
Expand Down