-
Notifications
You must be signed in to change notification settings - Fork 8.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
YARN-5203.Return ResourceRequest JAXB object in ResourceManager Clust…
…er Applications REST API. Contributed by Ellen Hui.
- Loading branch information
Showing
8 changed files
with
330 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
63 changes: 63 additions & 0 deletions
63
...va/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/ExecutionTypeRequestInfo.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -0,0 +1,63 @@ | |||
/** | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
* or more contributor license agreements. See the NOTICE file | |||
* distributed with this work for additional information | |||
* regarding copyright ownership. The ASF licenses this file | |||
* to you under the Apache License, Version 2.0 (the | |||
* "License"); you may not use this file except in compliance | |||
* with the License. You may obtain a copy of the License at | |||
* | |||
* http://www.apache.org/licenses/LICENSE-2.0 | |||
* | |||
* Unless required by applicable law or agreed to in writing, software | |||
* distributed under the License is distributed on an "AS IS" BASIS, | |||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
|
|||
package org.apache.hadoop.yarn.server.resourcemanager.webapp.dao; | |||
|
|||
import javax.xml.bind.annotation.XmlAccessType; | |||
import javax.xml.bind.annotation.XmlAccessorType; | |||
import javax.xml.bind.annotation.XmlElement; | |||
import javax.xml.bind.annotation.XmlRootElement; | |||
|
|||
import org.apache.hadoop.yarn.api.records.ExecutionType; | |||
import org.apache.hadoop.yarn.api.records.ExecutionTypeRequest; | |||
|
|||
/** | |||
* Simple class representing an execution type request. | |||
*/ | |||
@XmlRootElement(name = "ExecutionTypeRequest") | |||
@XmlAccessorType(XmlAccessType.FIELD) | |||
public class ExecutionTypeRequestInfo { | |||
@XmlElement(name = "executionType") | |||
private String executionType; | |||
@XmlElement(name = "enforceExecutionType") | |||
private boolean enforceExecutionType; | |||
|
|||
public ExecutionTypeRequestInfo() { | |||
} | |||
|
|||
public ExecutionTypeRequestInfo(ExecutionTypeRequest executionTypeRequest) { | |||
executionType = executionTypeRequest.getExecutionType().name(); | |||
enforceExecutionType = executionTypeRequest.getEnforceExecutionType(); | |||
} | |||
|
|||
public ExecutionType getExecutionType() { | |||
return ExecutionType.valueOf(executionType); | |||
} | |||
|
|||
public void setExecutionType(ExecutionType executionType) { | |||
this.executionType = executionType.name(); | |||
} | |||
|
|||
public boolean getEnforceExecutionType() { | |||
return enforceExecutionType; | |||
} | |||
|
|||
public void setEnforceExecutionType(boolean enforceExecutionType) { | |||
this.enforceExecutionType = enforceExecutionType; | |||
} | |||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
131 changes: 131 additions & 0 deletions
131
...in/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/ResourceRequestInfo.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -0,0 +1,131 @@ | |||
/** | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
* or more contributor license agreements. See the NOTICE file | |||
* distributed with this work for additional information | |||
* regarding copyright ownership. The ASF licenses this file | |||
* to you under the Apache License, Version 2.0 (the | |||
* "License"); you may not use this file except in compliance | |||
* with the License. You may obtain a copy of the License at | |||
* | |||
* http://www.apache.org/licenses/LICENSE-2.0 | |||
* | |||
* Unless required by applicable law or agreed to in writing, software | |||
* distributed under the License is distributed on an "AS IS" BASIS, | |||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |||
* See the License for the specific language governing permissions and | |||
* limitations under the License. | |||
*/ | |||
|
|||
package org.apache.hadoop.yarn.server.resourcemanager.webapp.dao; | |||
|
|||
import org.apache.hadoop.yarn.api.records.ExecutionTypeRequest; | |||
import org.apache.hadoop.yarn.api.records.Priority; | |||
import org.apache.hadoop.yarn.api.records.ResourceRequest; | |||
|
|||
import javax.xml.bind.annotation.XmlAccessType; | |||
import javax.xml.bind.annotation.XmlAccessorType; | |||
import javax.xml.bind.annotation.XmlElement; | |||
import javax.xml.bind.annotation.XmlRootElement; | |||
|
|||
/** | |||
* Simple class representing a resource request. | |||
*/ | |||
@XmlRootElement(name = "resourceRequests") | |||
@XmlAccessorType(XmlAccessType.FIELD) | |||
public class ResourceRequestInfo { | |||
|
|||
@XmlElement(name = "priority") | |||
private int priority; | |||
@XmlElement(name = "resourceName") | |||
private String resourceName; | |||
@XmlElement(name = "capability") | |||
private ResourceInfo capability; | |||
@XmlElement(name = "numContainers") | |||
private int numContainers; | |||
@XmlElement(name = "relaxLocality") | |||
private boolean relaxLocality; | |||
@XmlElement(name = "nodeLabelExpression") | |||
private String nodeLabelExpression; | |||
|
|||
@XmlElement(name = "executionTypeRequest") | |||
private ExecutionTypeRequestInfo executionTypeRequest; | |||
|
|||
@XmlElement(name = "executionType") | |||
private String executionType; | |||
@XmlElement(name = "enforceExecutionType") | |||
private boolean enforceExecutionType; | |||
|
|||
public ResourceRequestInfo() { | |||
} | |||
|
|||
public ResourceRequestInfo(ResourceRequest request) { | |||
priority = request.getPriority().getPriority(); | |||
resourceName = request.getResourceName(); | |||
capability = new ResourceInfo(request.getCapability()); | |||
numContainers = request.getNumContainers(); | |||
relaxLocality = request.getRelaxLocality(); | |||
nodeLabelExpression = request.getNodeLabelExpression(); | |||
if (request.getExecutionTypeRequest() != null) { | |||
executionTypeRequest = | |||
new ExecutionTypeRequestInfo(request.getExecutionTypeRequest()); | |||
} | |||
} | |||
|
|||
public Priority getPriority() { | |||
return Priority.newInstance(priority); | |||
} | |||
|
|||
public void setPriority(Priority priority) { | |||
this.priority = priority.getPriority(); | |||
} | |||
|
|||
public String getResourceName() { | |||
return resourceName; | |||
} | |||
|
|||
public void setResourceName(String resourceName) { | |||
this.resourceName = resourceName; | |||
} | |||
|
|||
public ResourceInfo getCapability() { | |||
return capability; | |||
} | |||
|
|||
public void setCapability(ResourceInfo capability) { | |||
this.capability = capability; | |||
} | |||
|
|||
public int getNumContainers() { | |||
return numContainers; | |||
} | |||
|
|||
public void setNumContainers(int numContainers) { | |||
this.numContainers = numContainers; | |||
} | |||
|
|||
public boolean getRelaxLocality() { | |||
return relaxLocality; | |||
} | |||
|
|||
public void setRelaxLocality(boolean relaxLocality) { | |||
this.relaxLocality = relaxLocality; | |||
} | |||
|
|||
public String getNodeLabelExpression() { | |||
return nodeLabelExpression; | |||
} | |||
|
|||
public void setNodeLabelExpression(String nodeLabelExpression) { | |||
this.nodeLabelExpression = nodeLabelExpression; | |||
} | |||
|
|||
public void setExecutionTypeRequest( | |||
ExecutionTypeRequest executionTypeRequest) { | |||
this.executionTypeRequest = | |||
new ExecutionTypeRequestInfo(executionTypeRequest); | |||
} | |||
|
|||
public ExecutionTypeRequestInfo getExecutionTypeRequest() { | |||
return executionTypeRequest; | |||
} | |||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.