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

HDDS-823. OzoneRestClient is failing with NPE on getKeyDetails call. Contributed by Bharat Viswanadham.

Browse Source
This commit is contained in:
Bharat Viswanadham 2018-11-08 21:28:04 -08:00
parent 66bf62404a
commit 47194fefdd
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hadoop-ozone/objectstore-service/src/main/java/org/apache/hadoop/ozone/web/storage/DistributedStorageHandler.java
View File

@ -19,6 +19,7 @@
package org.apache.hadoop.ozone.web.storage; package org.apache.hadoop.ozone.web.storage;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import org.apache.hadoop.hdds.client.ReplicationType;
import org.apache.hadoop.hdds.scm.client.HddsClientUtils; import org.apache.hadoop.hdds.scm.client.HddsClientUtils;
import org.apache.hadoop.io.IOUtils; import org.apache.hadoop.io.IOUtils;
import org.apache.hadoop.io.retry.RetryPolicy; import org.apache.hadoop.io.retry.RetryPolicy;
@ -486,6 +487,7 @@ public KeyInfo getKeyInfo(KeyArgs args) throws IOException, OzoneException {
HddsClientUtils.formatDateTime(omKeyInfo.getCreationTime())); HddsClientUtils.formatDateTime(omKeyInfo.getCreationTime()));
keyInfo.setModifiedOn( keyInfo.setModifiedOn(
HddsClientUtils.formatDateTime(omKeyInfo.getModificationTime())); HddsClientUtils.formatDateTime(omKeyInfo.getModificationTime()));
keyInfo.setType(ReplicationType.valueOf(omKeyInfo.getType().toString()));
return keyInfo; return keyInfo;
} }
@ -510,6 +512,8 @@ public KeyInfo getKeyInfoDetails(KeyArgs args) throws IOException{
keyInfoDetails.setModifiedOn( keyInfoDetails.setModifiedOn(
HddsClientUtils.formatDateTime(omKeyInfo.getModificationTime())); HddsClientUtils.formatDateTime(omKeyInfo.getModificationTime()));
keyInfoDetails.setKeyLocations(keyLocations); keyInfoDetails.setKeyLocations(keyLocations);
keyInfoDetails.setType(ReplicationType.valueOf(omKeyInfo.getType()
.toString()));
return keyInfoDetails; return keyInfoDetails;
} }
@ -553,6 +557,7 @@ public ListKeys listKeys(ListArgs args) throws IOException, OzoneException {
HddsClientUtils.formatDateTime(info.getCreationTime())); HddsClientUtils.formatDateTime(info.getCreationTime()));
tempInfo.setModifiedOn( tempInfo.setModifiedOn(
HddsClientUtils.formatDateTime(info.getModificationTime())); HddsClientUtils.formatDateTime(info.getModificationTime()));
tempInfo.setType(ReplicationType.valueOf(info.getType().toString()));
result.addKey(tempInfo); result.addKey(tempInfo);
} }