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

HDDS-208. ozone createVolume command ignores the first character of the volume name argument. Contributed by Lokesh Jain.

This commit is contained in:
Xiaoyu Yao 2018-07-10 14:07:23 -07:00
parent 5d0f01e1fe
commit 4e59b92784
2 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,6 +38,7 @@ import java.util.Random;
import java.util.UUID; import java.util.UUID;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.google.common.base.Strings;
import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.RandomStringUtils;
import org.apache.hadoop.fs.FileUtil; import org.apache.hadoop.fs.FileUtil;
import org.apache.hadoop.hdds.client.ReplicationFactor; import org.apache.hadoop.hdds.client.ReplicationFactor;
@ -203,13 +204,32 @@ public class TestOzoneShell {
public void testCreateVolume() throws Exception { public void testCreateVolume() throws Exception {
LOG.info("Running testCreateVolume"); LOG.info("Running testCreateVolume");
String volumeName = "volume" + RandomStringUtils.randomNumeric(5); String volumeName = "volume" + RandomStringUtils.randomNumeric(5);
testCreateVolume(volumeName, "");
volumeName = "volume" + RandomStringUtils.randomNumeric(5);
testCreateVolume("/////" + volumeName, "");
testCreateVolume("/////", "Volume name is required to create a volume");
testCreateVolume("/////vol/123",
"Illegal argument: Bucket or Volume name has an unsupported character : /");
}
private void testCreateVolume(String volumeName, String errorMsg) throws Exception {
err.reset();
String userName = "bilbo"; String userName = "bilbo";
String[] args = new String[] {"-createVolume", url + "/" + volumeName, String[] args = new String[] {"-createVolume", url + "/" + volumeName,
"-user", userName, "-root"}; "-user", userName, "-root"};
assertEquals(0, ToolRunner.run(shell, args)); if (Strings.isNullOrEmpty(errorMsg)) {
OzoneVolume volumeInfo = client.getVolumeDetails(volumeName); assertEquals(0, ToolRunner.run(shell, args));
assertEquals(volumeName, volumeInfo.getName()); } else {
assertEquals(1, ToolRunner.run(shell, args));
assertTrue(err.toString().contains(errorMsg));
return;
}
String truncatedVolumeName =
volumeName.substring(volumeName.lastIndexOf('/') + 1);
OzoneVolume volumeInfo = client.getVolumeDetails(truncatedVolumeName);
assertEquals(truncatedVolumeName, volumeInfo.getName());
assertEquals(userName, volumeInfo.getOwner()); assertEquals(userName, volumeInfo.getOwner());
} }

10
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/CreateVolumeHandler.java
View File

@ -60,15 +60,15 @@ public class CreateVolumeHandler extends Handler {
String ozoneURIString = cmd.getOptionValue(Shell.CREATE_VOLUME); String ozoneURIString = cmd.getOptionValue(Shell.CREATE_VOLUME);
URI ozoneURI = verifyURI(ozoneURIString); URI ozoneURI = verifyURI(ozoneURIString);
if (ozoneURI.getPath().isEmpty()) {
// we need to skip the slash in the URI path
// getPath returns /volumeName needs to remove the initial slash.
volumeName = ozoneURI.getPath().replaceAll("^/+", "");
if (volumeName.isEmpty()) {
throw new OzoneClientException( throw new OzoneClientException(
"Volume name is required to create a volume"); "Volume name is required to create a volume");
} }
// we need to skip the slash in the URI path
// getPath returns /volumeName needs to remove the first slash.
volumeName = ozoneURI.getPath().substring(1);
if (cmd.hasOption(Shell.VERBOSE)) { if (cmd.hasOption(Shell.VERBOSE)) {
System.out.printf("Volume name : %s%n", volumeName); System.out.printf("Volume name : %s%n", volumeName);
} }