You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ha...@apache.org on 2017/11/21 17:12:09 UTC
hadoop git commit: YARN-7531. ResourceRequest.equal does not check
ExecutionTypeRequest.enforceExecutionType().
Repository: hadoop
Updated Branches:
refs/heads/trunk 0ed44f256 -> 67bbbe1c0
YARN-7531. ResourceRequest.equal does not check ExecutionTypeRequest.enforceExecutionType().
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/67bbbe1c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/67bbbe1c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/67bbbe1c
Branch: refs/heads/trunk
Commit: 67bbbe1c0c05fa01b08a8dabe93c146935420450
Parents: 0ed44f2
Author: Haibo Chen <ha...@apache.org>
Authored: Fri Nov 17 14:30:43 2017 -0800
Committer: Haibo Chen <ha...@apache.org>
Committed: Tue Nov 21 09:09:16 2017 -0800
----------------------------------------------------------------------
.../yarn/api/records/ResourceRequest.java | 3 +-
.../hadoop/yarn/api/TestResourceRequest.java | 47 ++++++++++++++++++++
2 files changed, 48 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/67bbbe1c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ResourceRequest.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ResourceRequest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ResourceRequest.java
index beb3380..e46647a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ResourceRequest.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ResourceRequest.java
@@ -630,8 +630,7 @@ public abstract class ResourceRequest implements Comparable<ResourceRequest> {
if (other.getExecutionTypeRequest() != null) {
return false;
}
- } else if (!execTypeRequest.getExecutionType()
- .equals(other.getExecutionTypeRequest().getExecutionType())) {
+ } else if (!execTypeRequest.equals(other.getExecutionTypeRequest())) {
return false;
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/67bbbe1c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/TestResourceRequest.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/TestResourceRequest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/TestResourceRequest.java
new file mode 100644
index 0000000..aef838c
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/TestResourceRequest.java
@@ -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));
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org