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

Revert "HDFS-12558. Ozone: Clarify the meaning of rpc.metrics.percentiles.intervals on KSM/SCM web ui. Contributed by Elek, Marton." 

This reverts commit 18c0cdcec9.
This commit is contained in:
Anu Engineer 2017-10-26 11:27:34 -07:00 committed by Owen O'Malley
parent 402a1c1ba3
commit 0582d8b1b1
4 changed files with 1 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
hadoop-hdfs-project/hadoop-hdfs/pom.xml
View File

@ -192,12 +192,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
<artifactId>rocksdbjni</artifactId>
<version>5.5.5</version>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>1.5.9</version>
<scope>provided</scope>
</dependency>
<!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
<dependency>
<groupId>org.bouncycastle</groupId>
@ -447,48 +441,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
</filesets>
</configuration>
</plugin>
<plugin>
<groupId>com.github.kongchen</groupId>
<artifactId>swagger-maven-plugin</artifactId>
<version>3.1.5</version>
<executions>
<execution>
<phase>compile</phase>
<goals>
<goal>generate</goal>
</goals>
</execution>
</executions>
<configuration>
<apiSources>
<apiSource>
<springmvc>false</springmvc>
<swaggerDirectory>target/webapps/static</swaggerDirectory>
<swaggerFileName>ozone.swagger</swaggerFileName>
<schemes>
<scheme>http</scheme>
</schemes>
<host>localhost:9864</host>
<basePath>/</basePath>
<locations>
<location>org.apache.hadoop.ozone.web.interfaces</location>
</locations>
<info>
<title>HDFS Ozone REST Api</title>
<version>${project.version}</version>
<contact>
<name>Apache Hadoop project</name>
<url>https://hadoop.apache.org</url>
</contact>
<license>
<url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
<name>Apache 2.0</name>
</license>
</info>
</apiSource>
</apiSources>
</configuration>
</plugin>
</plugins>
</build>

45
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/web/interfaces/Bucket.java
View File

@ -18,10 +18,6 @@
package org.apache.hadoop.ozone.web.interfaces;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.hadoop.ozone.web.exceptions.OzoneException;
import org.apache.hadoop.ozone.client.rest.headers.Header;
@ -46,7 +42,6 @@ import javax.ws.rs.core.UriInfo;
* bucket related functionality.
*/
@Path("/{volume}/{bucket}")
@Api(tags = "bucket")
public interface Bucket {
/**
* createBucket call handles the POST request for Creating a Bucket.
@ -62,16 +57,6 @@ public interface Bucket {
* @throws OzoneException
*/
@POST
@ApiOperation("Create new bucket to a volume")
@ApiImplicitParams({
@ApiImplicitParam(name = "x-ozone-version", example = "v1", required =
true, paramType = "header"),
@ApiImplicitParam(name = "x-ozone-user", example = "user", required =
true, paramType = "header"),
@ApiImplicitParam(name = "Date", example = "Date: Mon, 26 Jun 2017 "
+ "04:23:30 GMT", required = true, paramType = "header"),
@ApiImplicitParam(name = "Authorization", example = "OZONE", required =
true, paramType = "header")})
Response createBucket(@PathParam("volume") String volume,
@PathParam("bucket") String bucket,
@Context Request req, @Context UriInfo info,
@ -91,16 +76,6 @@ public interface Bucket {
* @throws OzoneException
*/
@PUT
@ApiOperation("Update bucket")
@ApiImplicitParams({
@ApiImplicitParam(name = "x-ozone-version", example = "v1", required =
true, paramType = "header"),
@ApiImplicitParam(name = "x-ozone-user", example = "user", required =
true, paramType = "header"),
@ApiImplicitParam(name = "Date", example = "Date: Mon, 26 Jun 2017 "
+ "04:23:30 GMT", required = true, paramType = "header"),
@ApiImplicitParam(name = "Authorization", example = "OZONE", required =
true, paramType = "header")})
Response updateBucket(@PathParam("volume") String volume,
@PathParam("bucket") String bucket,
@Context Request req, @Context UriInfo info,
@ -120,16 +95,6 @@ public interface Bucket {
* @throws OzoneException
*/
@DELETE
@ApiOperation("Deletes an empty bucket.")
@ApiImplicitParams({
@ApiImplicitParam(name = "x-ozone-version", example = "v1", required =
true, paramType = "header"),
@ApiImplicitParam(name = "x-ozone-user", example = "user", required =
true, paramType = "header"),
@ApiImplicitParam(name = "Date", example = "Date: Mon, 26 Jun 2017 "
+ "04:23:30 GMT", required = true, paramType = "header"),
@ApiImplicitParam(name = "Authorization", example = "OZONE", required =
true, paramType = "header")})
Response deleteBucket(@PathParam("volume") String volume,
@PathParam("bucket") String bucket,
@Context Request req, @Context UriInfo info,
@ -154,16 +119,6 @@ public interface Bucket {
@GET
@Produces(MediaType.APPLICATION_JSON)
@ApiOperation("List contents of a bucket")
@ApiImplicitParams({
@ApiImplicitParam(name = "x-ozone-version", example = "v1", required =
true, paramType = "header"),
@ApiImplicitParam(name = "x-ozone-user", example = "user", required =
true, paramType = "header"),
@ApiImplicitParam(name = "Date", example = "Date: Mon, 26 Jun 2017 "
+ "04:23:30 GMT", required = true, paramType = "header"),
@ApiImplicitParam(name = "Authorization", example = "OZONE", required =
true, paramType = "header")})
Response listBucket(@PathParam("volume") String volume,
@PathParam("bucket") String bucket,
@DefaultValue(Header.OZONE_LIST_QUERY_KEY)

38
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/web/interfaces/Keys.java
View File

@ -18,10 +18,6 @@
package org.apache.hadoop.ozone.web.interfaces;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.hadoop.ozone.web.exceptions.OzoneException;
import org.apache.hadoop.ozone.client.rest.headers.Header;
@ -43,8 +39,8 @@ import java.io.InputStream;
/**
* This interface defines operations permitted on a key.
*/
@Path("/{volume}/{bucket}/{keys:.*}")
@Api(tags = "key")
public interface Keys {
/**
@ -65,18 +61,6 @@ public interface Keys {
*/
@PUT
@Consumes(MediaType.WILDCARD)
@ApiOperation(value = "Adds a key to an existing bucket.",notes = "If the "
+ "object already exists this call will overwrite or add with new version "
+ "number if the bucket versioning is turned on.")
@ApiImplicitParams({
@ApiImplicitParam(name = "x-ozone-version", example = "v1", required =
true, paramType = "header"),
@ApiImplicitParam(name = "x-ozone-user", example = "user", required =
true, paramType = "header"),
@ApiImplicitParam(name = "Date", example = "Date: Mon, 26 Jun 2017 "
+ "04:23:30 GMT", required = true, paramType = "header"),
@ApiImplicitParam(name = "Authorization", example = "OZONE", required =
true, paramType = "header")})
Response putKey(@PathParam("volume") String volume,
@PathParam("bucket") String bucket, @PathParam("keys") String keys,
InputStream is, @Context Request req, @Context UriInfo info,
@ -98,16 +82,6 @@ public interface Keys {
* @throws OzoneException
*/
@GET
@ApiOperation("Gets the Key if it exists.")
@ApiImplicitParams({
@ApiImplicitParam(name = "x-ozone-version", example = "v1", required =
true, paramType = "header"),
@ApiImplicitParam(name = "x-ozone-user", example = "user", required =
true, paramType = "header"),
@ApiImplicitParam(name = "Date", example = "Date: Mon, 26 Jun 2017 "
+ "04:23:30 GMT", required = true, paramType = "header"),
@ApiImplicitParam(name = "Authorization", example = "OZONE", required =
true, paramType = "header")})
Response getKey(@PathParam("volume") String volume,
@PathParam("bucket") String bucket, @PathParam("keys") String keys,
@QueryParam(Header.OZONE_LIST_QUERY_TAG) String info,
@ -128,16 +102,6 @@ public interface Keys {
* @throws OzoneException
*/
@DELETE
@ApiOperation("Deletes an existing key")
@ApiImplicitParams({
@ApiImplicitParam(name = "x-ozone-version", example = "v1", required =
true, paramType = "header"),
@ApiImplicitParam(name = "x-ozone-user", example = "user", required =
true, paramType = "header"),
@ApiImplicitParam(name = "Date", example = "Date: Mon, 26 Jun 2017 "
+ "04:23:30 GMT", required = true, paramType = "header"),
@ApiImplicitParam(name = "Authorization", example = "OZONE", required =
true, paramType = "header")})
Response deleteKey(@PathParam("volume") String volume,
@PathParam("bucket") String bucket, @PathParam("keys") String keys,
@Context Request req, @Context UriInfo info, @Context HttpHeaders headers)

46
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/web/interfaces/Volume.java
View File

@ -18,10 +18,6 @@
package org.apache.hadoop.ozone.web.interfaces;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.ozone.web.exceptions.OzoneException;
import org.apache.hadoop.ozone.client.rest.headers.Header;
@ -46,7 +42,6 @@ import javax.ws.rs.core.UriInfo;
*/
@InterfaceAudience.Private
@Path("/{volume}")
@Api(tags = "volume")
public interface Volume {
/**
@ -69,16 +64,6 @@ public interface Volume {
*/
@POST
@ApiOperation("Creates a Volume owned by the user")
@ApiImplicitParams({
@ApiImplicitParam(name = "x-ozone-version", example = "v1", required =
true, paramType = "header"),
@ApiImplicitParam(name = "x-ozone-user", example = "user", required =
true, paramType = "header"),
@ApiImplicitParam(name = "Date", example = "Date: Mon, 26 Jun 2017 "
+ "04:23:30 GMT", required = true, paramType = "header"),
@ApiImplicitParam(name = "Authorization", example = "OZONE", required =
true, paramType = "header")})
Response createVolume(@PathParam("volume") String volume,
@DefaultValue(Header.OZONE_QUOTA_UNDEFINED)
@QueryParam(Header.OZONE_QUOTA_QUERY_TAG) String quota,
@ -104,16 +89,6 @@ public interface Volume {
* @throws OzoneException
*/
@PUT
@ApiOperation("Updates a Volume owned by the user")
@ApiImplicitParams({
@ApiImplicitParam(name = "x-ozone-version", example = "v1", required =
true, paramType = "header"),
@ApiImplicitParam(name = "x-ozone-user", example = "user", required =
true, paramType = "header"),
@ApiImplicitParam(name = "Date", example = "Date: Mon, 26 Jun 2017 "
+ "04:23:30 GMT", required = true, paramType = "header"),
@ApiImplicitParam(name = "Authorization", example = "OZONE", required =
true, paramType = "header")})
Response updateVolume(@PathParam("volume") String volume,
@DefaultValue(Header.OZONE_QUOTA_UNDEFINED)
@QueryParam(Header.OZONE_QUOTA_QUERY_TAG) String quota,
@ -130,16 +105,6 @@ public interface Volume {
* @throws OzoneException
*/
@DELETE
@ApiOperation("Deletes a Volume if it is empty")
@ApiImplicitParams({
@ApiImplicitParam(name = "x-ozone-version", example = "v1", required =
true, paramType = "header"),
@ApiImplicitParam(name = "x-ozone-user", example = "user", required =
true, paramType = "header"),
@ApiImplicitParam(name = "Date", example = "Date: Mon, 26 Jun 2017 "
+ "04:23:30 GMT", required = true, paramType = "header"),
@ApiImplicitParam(name = "Authorization", example = "OZONE", required =
true, paramType = "header")})
Response deleteVolume(@PathParam("volume") String volume,
@Context Request req, @Context UriInfo uriInfo,
@Context HttpHeaders headers) throws OzoneException;
@ -157,17 +122,6 @@ public interface Volume {
* @throws OzoneException
*/
@GET
@ApiOperation(value = "Returns Volume info", notes = "This API can be "
+ "invoked either by admin or the owner")
@ApiImplicitParams({
@ApiImplicitParam(name = "x-ozone-version", example = "v1", required =
true, paramType = "header"),
@ApiImplicitParam(name = "x-ozone-user", example = "user", required =
true, paramType = "header"),
@ApiImplicitParam(name = "Date", example = "Date: Mon, 26 Jun 2017 "
+ "04:23:30 GMT", required = true, paramType = "header"),
@ApiImplicitParam(name = "Authorization", example = "OZONE", required =
true, paramType = "header")})
Response getVolumeInfo(@PathParam("volume") String volume,
@DefaultValue(Header.OZONE_LIST_QUERY_BUCKET)
@QueryParam(Header.OZONE_LIST_QUERY_TAG) String info,