Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDDS-1432. Ozone client list command truncates response without any indication. Contributed by Siddharth Wagle.

This commit is contained in:
Arpit Agarwal 2019-04-16 12:35:49 -07:00
parent b8086aed86
commit f2ab2795db
No known key found for this signature in database
GPG Key ID: E4B09E903FDF9E98
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ozShell/TestOzoneShell.java
View File

@ -1114,11 +1114,16 @@ public class TestOzoneShell {
} }
out.reset(); out.reset();
String msgText = "Listing first 3 entries of the result. " +
"Use --length (-l) to override max returned keys.";
args = args =
new String[] {"key", "list", url + "/" + volumeName + "/" + bucketName, new String[] {"key", "list", url + "/" + volumeName + "/" + bucketName,
"--length", "3"}; "--length", "3"};
execute(shell, args); execute(shell, args);
commandOutput = out.toString(); commandOutput = out.toString();
assertTrue("Expecting output to start with " + msgText,
commandOutput.contains(msgText));
commandOutput = commandOutput.replace(msgText, "");
keys = (List<KeyInfo>) JsonUtils.toJsonList(commandOutput, keys = (List<KeyInfo>) JsonUtils.toJsonList(commandOutput,
KeyInfo.class); KeyInfo.class);

7
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/ListKeyHandler.java
View File

@ -90,12 +90,19 @@ public class ListKeyHandler extends Handler {
startKey); startKey);
List<KeyInfo> keyInfos = new ArrayList<>(); List<KeyInfo> keyInfos = new ArrayList<>();
int maxKeyLimit = maxKeys;
while (maxKeys > 0 && keyIterator.hasNext()) { while (maxKeys > 0 && keyIterator.hasNext()) {
KeyInfo key = OzoneClientUtils.asKeyInfo(keyIterator.next()); KeyInfo key = OzoneClientUtils.asKeyInfo(keyIterator.next());
keyInfos.add(key); keyInfos.add(key);
maxKeys -= 1; maxKeys -= 1;
} }
// More keys were returned notify about max length
if (keyIterator.hasNext()) {
System.out.println("Listing first " + maxKeyLimit + " entries of the " +
"result. Use --length (-l) to override max returned keys.");
}
if (isVerbose()) { if (isVerbose()) {
System.out.printf("Found : %d keys for bucket %s in volume : %s ", System.out.printf("Found : %d keys for bucket %s in volume : %s ",
keyInfos.size(), bucketName, volumeName); keyInfos.size(), bucketName, volumeName);