big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDFS-12610. Ozone: OzoneClient: RpcClient list calls throw NPE when iterating over empty list. Contributed by Nandakumar.

Browse Source
This commit is contained in:
Nandakumar 2017-10-07 10:29:57 +05:30 committed by Owen O'Malley
parent c3ef381011
commit 9630621be7
4 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/ozone/client/ObjectStore.java
View File

@ -174,7 +174,8 @@ private class VolumeIterator implements Iterator<OzoneVolume> {
public boolean hasNext() {
if(!currentIterator.hasNext()) {
currentIterator = getNextListOfVolumes(
currentValue.getName()).iterator();
currentValue != null ? currentValue.getName() : null)
.iterator();
}
return currentIterator.hasNext();
}

3
hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/ozone/client/OzoneBucket.java
View File

@ -277,7 +277,8 @@ private class KeyIterator implements Iterator<OzoneKey> {
public boolean hasNext() {
if(!currentIterator.hasNext()) {
currentIterator = getNextListOfKeys(
currentValue.getName()).iterator();
currentValue != null ? currentValue.getName() : null)
.iterator();
}
return currentIterator.hasNext();
}

3
hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/ozone/client/OzoneVolume.java
View File

@ -247,7 +247,8 @@ private class BucketIterator implements Iterator<OzoneBucket> {
public boolean hasNext() {
if(!currentIterator.hasNext()) {
currentIterator = getNextListOfBuckets(
currentValue.getName()).iterator();
currentValue != null ? currentValue.getName() : null)
.iterator();
}
return currentIterator.hasNext();
}

33
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClient.java
View File

@ -409,7 +409,7 @@ public void testDeleteKey()
}
@Test
public void listVolumeTest() throws IOException, OzoneException {
public void testListVolume() throws IOException, OzoneException {
String volBase = "vol-" + RandomStringUtils.randomNumeric(3);
//Create 10 volume vol-<random>-a-0-<random> to vol-<random>-a-9-<random>
String volBaseNameA = volBase + "-a-";
@ -448,7 +448,7 @@ public void listVolumeTest() throws IOException, OzoneException {
}
@Test
public void listBucketTest()
public void testListBucket()
throws IOException, OzoneException {
String volumeA = "vol-a-" + RandomStringUtils.randomNumeric(5);
String volumeB = "vol-b-" + RandomStringUtils.randomNumeric(5);
@ -522,7 +522,19 @@ public void listBucketTest()
}
@Test
public void listKeyTest()
public void testListBucketsOnEmptyVolume()
throws IOException, OzoneException {
String volume = "vol-" + RandomStringUtils.randomNumeric(5);
store.createVolume(volume);
OzoneVolume vol = store.getVolume(volume);
Iterator<OzoneBucket> buckets = vol.listBuckets("");
while(buckets.hasNext()) {
Assert.fail();
}
}
@Test
public void testListKey()
throws IOException, OzoneException {
String volumeA = "vol-a-" + RandomStringUtils.randomNumeric(5);
String volumeB = "vol-b-" + RandomStringUtils.randomNumeric(5);
@ -656,6 +668,21 @@ public void listKeyTest()
Assert.assertFalse(volABucketBIter.hasNext());
}
@Test
public void testListKeyOnEmptyBucket()
throws IOException, OzoneException {
String volume = "vol-" + RandomStringUtils.randomNumeric(5);
String bucket = "buc-" + RandomStringUtils.randomNumeric(5);
store.createVolume(volume);
OzoneVolume vol = store.getVolume(volume);
vol.createBucket(bucket);
OzoneBucket buc = vol.getBucket(bucket);
Iterator<OzoneKey> keys = buc.listKeys("");
while(keys.hasNext()) {
Assert.fail();
}
}
/**
* Close OzoneClient and shutdown MiniOzoneCluster.
*/