diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineDataToRetrieve.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineDataToRetrieve.java index 325050a..58dbdba 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineDataToRetrieve.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineDataToRetrieve.java @@ -23,7 +23,6 @@ import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.classification.InterfaceStability.Unstable; import org.apache.hadoop.yarn.server.timelineservice.reader.filter.TimelineFilterList; -import org.apache.hadoop.yarn.server.timelineservice.reader.filter.TimelinePrefixFilter; import org.apache.hadoop.yarn.server.timelineservice.storage.TimelineReader.Field; /** @@ -33,7 +32,8 @@ * */ diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderWebServices.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderWebServices.java index fcab78c..1a8131c 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderWebServices.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderWebServices.java @@ -49,7 +49,6 @@ import org.apache.hadoop.yarn.api.records.timeline.TimelineAbout; import org.apache.hadoop.yarn.api.records.timelineservice.TimelineEntity; import org.apache.hadoop.yarn.api.records.timelineservice.TimelineEntityType; -import org.apache.hadoop.yarn.server.timelineservice.storage.TimelineReader.Field; import org.apache.hadoop.yarn.util.timeline.TimelineUtils; import org.apache.hadoop.yarn.webapp.BadRequestException; import org.apache.hadoop.yarn.webapp.NotFoundException; @@ -254,9 +253,10 @@ public TimelineAbout about( * irrespective of whether metrics are specified in fields to retrieve or * not. * @param fields Specifies which fields of the entity object to retrieve, see - * {@link Field}. All fields will be retrieved if fields=ALL. If not - * specified, 3 fields i.e. entity type, id and created time is returned - * (Optional query param). + * {@link org.apache.hadoop.yarn.server.timelineservice.storage + * .TimelineReader.Field}. All fields will be retrieved if fields=ALL. + * If not specified, 3 fields i.e. entity type, id and created time is + * returned (Optional query param). * @param metricsLimit If specified, defines the number of metrics to return. * Considered only if fields contains METRICS/ALL or metricsToRetrieve is * specified. Ignored otherwise. The maximum possible value for @@ -390,9 +390,10 @@ public TimelineAbout about( * irrespective of whether metrics are specified in fields to retrieve or * not. * @param fields Specifies which fields of the entity object to retrieve, see - * {@link Field}. All fields will be retrieved if fields=ALL. If not - * specified, 3 fields i.e. entity type, id, created time is returned - * (Optional query param). + * {@link org.apache.hadoop.yarn.server.timelineservice.storage + * .TimelineReader.Field}. All fields will be retrieved if fields=ALL. + * If not specified, 3 fields i.e. entity type, id, created time is + * returned (Optional query param). * @param metricsLimit If specified, defines the number of metrics to return. * Considered only if fields contains METRICS/ALL or metricsToRetrieve is * specified. Ignored otherwise. The maximum possible value for @@ -500,9 +501,10 @@ public TimelineAbout about( * irrespective of whether metrics are specified in fields to retrieve or * not. * @param fields Specifies which fields of the entity object to retrieve, see - * {@link Field}. All fields will be retrieved if fields=ALL. If not - * specified, 3 fields i.e. entity type, id, created time is returned - * (Optional query param). + * {@link org.apache.hadoop.yarn.server.timelineservice.storage + * .TimelineReader.Field}. All fields will be retrieved if fields=ALL. + * If not specified, 3 fields i.e. entity type, id, created time is + * returned (Optional query param). * @param metricsLimit If specified, defines the number of metrics to return. * Considered only if fields contains METRICS/ALL or metricsToRetrieve is * specified. Ignored otherwise. The maximum possible value for @@ -598,9 +600,10 @@ public TimelineAbout about( * irrespective of whether metrics are specified in fields to retrieve or * not. * @param fields Specifies which fields of the entity object to retrieve, see - * {@link Field}. All fields will be retrieved if fields=ALL. If not - * specified, 3 fields i.e. entity type, id, created time is returned - * (Optional query param). + * {@link org.apache.hadoop.yarn.server.timelineservice.storage + * .TimelineReader.Field}. All fields will be retrieved if fields=ALL. + * If not specified, 3 fields i.e. entity type, id, created time is + * returned (Optional query param). * @param metricsLimit If specified, defines the number of metrics to return. * Considered only if fields contains METRICS/ALL or metricsToRetrieve is * specified. Ignored otherwise. The maximum possible value for @@ -693,9 +696,10 @@ public TimelineEntity getEntity( * irrespective of whether metrics are specified in fields to retrieve or * not. * @param fields Specifies which fields of the entity object to retrieve, see - * {@link Field}. All fields will be retrieved if fields=ALL. If not - * specified, 3 fields i.e. entity type, id, created time is returned - * (Optional query param). + * {@link org.apache.hadoop.yarn.server.timelineservice.storage + * .TimelineReader.Field}. All fields will be retrieved if fields=ALL. + * If not specified, 3 fields i.e. entity type, id, created time is + * returned (Optional query param). * @param metricsLimit If specified, defines the number of metrics to return. * Considered only if fields contains METRICS/ALL or metricsToRetrieve is * specified. Ignored otherwise. The maximum possible value for @@ -764,9 +768,10 @@ public TimelineEntity getEntity( * irrespective of whether metrics are specified in fields to retrieve or * not. * @param fields Specifies which fields of the entity object to retrieve, see - * {@link Field}. All fields will be retrieved if fields=ALL. If not - * specified, 3 fields i.e. entity type, id and created time is returned - * (Optional query param). + * {@link org.apache.hadoop.yarn.server.timelineservice.storage + * .TimelineReader.Field}. All fields will be retrieved if fields=ALL. + * If not specified, 3 fields i.e. entity type, id and created time is + * returned (Optional query param). * @param metricsLimit If specified, defines the number of metrics to return. * Considered only if fields contains METRICS/ALL or metricsToRetrieve is * specified. Ignored otherwise. The maximum possible value for @@ -1033,9 +1038,10 @@ public TimelineEntity getFlowRun( * and send back in response. These metrics will be retrieved * irrespective of whether metrics are specified in fields to retrieve or * not. - * @param fields Specifies which fields to retrieve, see {@link Field}. All - * fields will be retrieved if fields=ALL. Amongst all the fields, only - * METRICS makes sense for flow runs hence only ALL or METRICS are + * @param fields Specifies which fields to retrieve, see {@link org.apache + * .hadoop.yarn.server.timelineservice.storage.TimelineReader.Field}. + * All fields will be retrieved if fields=ALL. Amongst all the fields, + * only METRICS makes sense for flow runs hence only ALL or METRICS are * supported as fields for fetching flow runs. Other fields will lead to * HTTP 400 (Bad Request) response. (Optional query param). * @@ -1118,9 +1124,10 @@ public TimelineEntity getFlowRun( * and send back in response. These metrics will be retrieved * irrespective of whether metrics are specified in fields to retrieve or * not. - * @param fields Specifies which fields to retrieve, see {@link Field}. All - * fields will be retrieved if fields=ALL. Amongst all the fields, only - * METRICS makes sense for flow runs hence only ALL or METRICS are + * @param fields Specifies which fields to retrieve, see {@link org.apache + * .hadoop.yarn.server.timelineservice.storage.TimelineReader.Field}. + * All fields will be retrieved if fields=ALL. Amongst all the fields, + * only METRICS makes sense for flow runs hence only ALL or METRICS are * supported as fields for fetching flow runs. Other fields will lead to * HTTP 400 (Bad Request) response. (Optional query param). * @@ -1173,9 +1180,10 @@ public TimelineEntity getFlowRun( * and send back in response. These metrics will be retrieved * irrespective of whether metrics are specified in fields to retrieve or * not. - * @param fields Specifies which fields to retrieve, see {@link Field}. All - * fields will be retrieved if fields=ALL. Amongst all the fields, only - * METRICS makes sense for flow runs hence only ALL or METRICS are + * @param fields Specifies which fields to retrieve, see {@link org.apache + * .hadoop.yarn.server.timelineservice.storage.TimelineReader.Field}. + * All fields will be retrieved if fields=ALL. Amongst all the fields, + * only METRICS makes sense for flow runs hence only ALL or METRICS are * supported as fields for fetching flow runs. Other fields will lead to * HTTP 400 (Bad Request) response. (Optional query param). * @@ -1378,9 +1386,11 @@ public TimelineEntity getFlowRun( * irrespective of whether metrics are specified in fields to retrieve or * not. * @param fields Specifies which fields of the app entity object to retrieve, - * see {@link Field}. All fields will be retrieved if fields=ALL. If not - * specified, 3 fields i.e. entity type(equivalent to YARN_APPLICATION), - * app id and app created time is returned(Optional query param). + * see {@link org.apache.hadoop.yarn.server.timelineservice.storage + * .TimelineReader.Field}. All fields will be retrieved if fields=ALL. + * If not specified, 3 fields i.e. entity type(equivalent to + * YARN_APPLICATION), app id and app created time is returned (Optional + * query param). * @param metricsLimit If specified, defines the number of metrics to return. * Considered only if fields contains METRICS/ALL or metricsToRetrieve is * specified. Ignored otherwise. The maximum possible value for @@ -1469,9 +1479,11 @@ public TimelineEntity getApp( * irrespective of whether metrics are specified in fields to retrieve or * not. * @param fields Specifies which fields of the app entity object to retrieve, - * see {@link Field}. All fields will be retrieved if fields=ALL. If not - * specified, 3 fields i.e. entity type(equivalent to YARN_APPLICATION), - * app id and app created time is returned(Optional query param). + * see {@link org.apache.hadoop.yarn.server.timelineservice.storage + * .TimelineReader.Field}. All fields will be retrieved if fields=ALL. + * If not specified, 3 fields i.e. entity type(equivalent to + * YARN_APPLICATION), app id and app created time is returned (Optional + * query param). * @param metricsLimit If specified, defines the number of metrics to return. * Considered only if fields contains METRICS/ALL or metricsToRetrieve is * specified. Ignored otherwise. The maximum possible value for @@ -1533,9 +1545,11 @@ public TimelineEntity getApp( * irrespective of whether metrics are specified in fields to retrieve or * not. * @param fields Specifies which fields of the app entity object to retrieve, - * see {@link Field}. All fields will be retrieved if fields=ALL. If not - * specified, 3 fields i.e. entity type(equivalent to YARN_APPLICATION), - * app id and app created time is returned(Optional query param). + * see {@link org.apache.hadoop.yarn.server.timelineservice.storage + * .TimelineReader.Field}. All fields will be retrieved if fields=ALL. + * If not specified, 3 fields i.e. entity type(equivalent to + * YARN_APPLICATION), app id and app created time is returned (Optional + * query param). * @param metricsLimit If specified, defines the number of metrics to return. * Considered only if fields contains METRICS/ALL or metricsToRetrieve is * specified. Ignored otherwise. The maximum possible value for @@ -1649,9 +1663,11 @@ public TimelineEntity getApp( * irrespective of whether metrics are specified in fields to retrieve or * not. * @param fields Specifies which fields of the app entity object to retrieve, - * see {@link Field}. All fields will be retrieved if fields=ALL. If not - * specified, 3 fields i.e. entity type(equivalent to YARN_APPLICATION), - * app id and app created time is returned(Optional query param). + * see {@link org.apache.hadoop.yarn.server.timelineservice.storage + * .TimelineReader.Field}. All fields will be retrieved if fields=ALL. + * If not specified, 3 fields i.e. entity type(equivalent to + * YARN_APPLICATION), app id and app created time is returned (Optional + * query param). * @param metricsLimit If specified, defines the number of metrics to return. * Considered only if fields contains METRICS/ALL or metricsToRetrieve is * specified. Ignored otherwise. The maximum possible value for @@ -1776,9 +1792,11 @@ public TimelineEntity getApp( * irrespective of whether metrics are specified in fields to retrieve or * not. * @param fields Specifies which fields of the app entity object to retrieve, - * see {@link Field}. All fields will be retrieved if fields=ALL. If not - * specified, 3 fields i.e. entity type(equivalent to YARN_APPLICATION), - * app id and app created time is returned(Optional query param). + * see {@link org.apache.hadoop.yarn.server.timelineservice.storage + * .TimelineReader.Field}. All fields will be retrieved if fields=ALL. + * If not specified, 3 fields i.e. entity type(equivalent to + * YARN_APPLICATION), app id and app created time is returned (Optional + * query param). * @param metricsLimit If specified, defines the number of metrics to return. * Considered only if fields contains METRICS/ALL or metricsToRetrieve is * specified. Ignored otherwise. The maximum possible value for @@ -1876,9 +1894,11 @@ public TimelineEntity getApp( * irrespective of whether metrics are specified in fields to retrieve or * not. * @param fields Specifies which fields of the app entity object to retrieve, - * see {@link Field}. All fields will be retrieved if fields=ALL. If not - * specified, 3 fields i.e. entity type(equivalent to YARN_APPLICATION), - * app id and app created time is returned(Optional query param). + * see {@link org.apache.hadoop.yarn.server.timelineservice.storage + * .TimelineReader.Field}. All fields will be retrieved if fields=ALL. + * If not specified, 3 fields i.e. entity type(equivalent to + * YARN_APPLICATION), app id and app created time is returned (Optional + * query param). * @param metricsLimit If specified, defines the number of metrics to return. * Considered only if fields contains METRICS/ALL or metricsToRetrieve is * specified. Ignored otherwise. The maximum possible value for @@ -1975,9 +1995,11 @@ public TimelineEntity getApp( * irrespective of whether metrics are specified in fields to retrieve or * not. * @param fields Specifies which fields of the app entity object to retrieve, - * see {@link Field}. All fields will be retrieved if fields=ALL. If not - * specified, 3 fields i.e. entity type(equivalent to YARN_APPLICATION), - * app id and app created time is returned(Optional query param). + * see {@link org.apache.hadoop.yarn.server.timelineservice.storage + * .TimelineReader.Field}. All fields will be retrieved if fields=ALL. + * If not specified, 3 fields i.e. entity type(equivalent to + * YARN_APPLICATION), app id and app created time is returned (Optional + * query param). * @param metricsLimit If specified, defines the number of metrics to return. * Considered only if fields contains METRICS/ALL or metricsToRetrieve is * specified. Ignored otherwise. The maximum possible value for @@ -2072,9 +2094,11 @@ public TimelineEntity getApp( * irrespective of whether metrics are specified in fields to retrieve or * not. * @param fields Specifies which fields of the app entity object to retrieve, - * see {@link Field}. All fields will be retrieved if fields=ALL. If not - * specified, 3 fields i.e. entity type(equivalent to YARN_APPLICATION), - * app id and app created time is returned(Optional query param). + * see {@link org.apache.hadoop.yarn.server.timelineservice.storage + * .TimelineReader.Field}. All fields will be retrieved if fields=ALL. + * If not specified, 3 fields i.e. entity type(equivalent to + * YARN_APPLICATION), app id and app created time is returned (Optional + * query param). * @param metricsLimit If specified, defines the number of metrics to return. * Considered only if fields contains METRICS/ALL or metricsToRetrieve is * specified. Ignored otherwise. The maximum possible value for