YARN-10991. Fix to ignore the grouping "[]" for resourcesStr in parseResourcesString method (#3592)
Signed-off-by: Akira Ajisaka <aajisaka@apache.org>
(cherry picked from commit 08f3df3ea2
)
This commit is contained in:
parent
f5ff4e1ca8
commit
850224255c
|
@ -1274,7 +1274,7 @@ public class Client {
|
||||||
resourcesStr = resourcesStr.substring(1);
|
resourcesStr = resourcesStr.substring(1);
|
||||||
}
|
}
|
||||||
if (resourcesStr.endsWith("]")) {
|
if (resourcesStr.endsWith("]")) {
|
||||||
resourcesStr = resourcesStr.substring(0, resourcesStr.length());
|
resourcesStr = resourcesStr.substring(0, resourcesStr.length() - 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
for (String resource : resourcesStr.trim().split(",")) {
|
for (String resource : resourcesStr.trim().split(",")) {
|
||||||
|
|
|
@ -0,0 +1,42 @@
|
||||||
|
/**
|
||||||
|
* 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
|
||||||
|
* <p>
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
* <p>
|
||||||
|
* 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.applications.distributedshell;
|
||||||
|
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
import static org.junit.Assert.assertEquals;
|
||||||
|
|
||||||
|
public class TestClient {
|
||||||
|
@Test
|
||||||
|
public void testParseResourcesString() {
|
||||||
|
// Setup
|
||||||
|
final Map<String, Long> expectedResult = new HashMap<>();
|
||||||
|
expectedResult.put("memory-mb", 3072L);
|
||||||
|
expectedResult.put("vcores", 1L);
|
||||||
|
|
||||||
|
// Run the test
|
||||||
|
final Map<String, Long> result = Client.parseResourcesString("[memory-mb=3072,vcores=1]");
|
||||||
|
|
||||||
|
// Verify the results
|
||||||
|
assertEquals(expectedResult, result);
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue