big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

YARN-7531. ResourceRequest.equal does not check ExecutionTypeRequest.enforceExecutionType().

Browse Source
This commit is contained in:
Haibo Chen 2017-11-17 14:30:43 -08:00
parent 0ed44f2565
commit 67bbbe1c0c
2 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ResourceRequest.java
View File

@ -630,8 +630,7 @@ public boolean equals(Object obj) {
if (other.getExecutionTypeRequest() != null) {
return false;
}
} else if (!execTypeRequest.getExecutionType()
.equals(other.getExecutionTypeRequest().getExecutionType())) {
} else if (!execTypeRequest.equals(other.getExecutionTypeRequest())) {
return false;
}

47
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/TestResourceRequest.java Normal file
View File

@ -0,0 +1,47 @@
/**
* 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.api;
import org.apache.hadoop.yarn.api.records.ExecutionType;
import org.apache.hadoop.yarn.api.records.ExecutionTypeRequest;
import org.apache.hadoop.yarn.api.records.Priority;
import org.apache.hadoop.yarn.api.records.Resource;
import org.apache.hadoop.yarn.api.records.ResourceRequest;
import org.junit.Assert;
import org.junit.Test;
/**
* The class to test {@link ResourceRequest}.
*/
public class TestResourceRequest {
@Test
public void testEqualsOnExecutionTypeRequest() {
ResourceRequest resourceRequestA =
ResourceRequest.newInstance(Priority.newInstance(0), "localhost",
Resource.newInstance(1024, 1), 1, false, "",
ExecutionTypeRequest.newInstance(ExecutionType.GUARANTEED, true));
ResourceRequest resourceRequestB =
ResourceRequest.newInstance(Priority.newInstance(0), "localhost",
Resource.newInstance(1024, 1), 1, false, "",
ExecutionTypeRequest.newInstance(ExecutionType.GUARANTEED, false));
Assert.assertFalse(resourceRequestA.equals(resourceRequestB));
}
}