[39/50] [abbrv] hadoop git commit: YARN-7637. GPU volume creation command fails when work preserving is disabled at NM. Contributed by Zian Chen.

2018-03-02 Thread aengineer 
YARN-7637. GPU volume creation command fails when work preserving is disabled 
at NM. Contributed by Zian Chen.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/22928c0c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/22928c0c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/22928c0c

Branch: refs/heads/HDFS-7240
Commit: 22928c0c60de3ccbd6b27ac3a410e7566ce4136b
Parents: 6ca4e30
Author: Sunil G 
Authored: Thu Mar 1 22:39:32 2018 +0530
Committer: Sunil G 
Committed: Thu Mar 1 22:39:32 2018 +0530

--
 .../recovery/NMNullStateStoreService.java   |  1 +
 .../resources/gpu/TestGpuResourceHandler.java   | 30 
 2 files changed, 31 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/22928c0c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/recovery/NMNullStateStoreService.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/recovery/NMNullStateStoreService.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/recovery/NMNullStateStoreService.java
index 2d522a9..78137bb 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/recovery/NMNullStateStoreService.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/recovery/NMNullStateStoreService.java
@@ -272,6 +272,7 @@ public class NMNullStateStoreService extends 
NMStateStoreService {
   public void storeAssignedResources(Container container,
   String resourceType, List assignedResources)
   throws IOException {
+updateContainerResourceMapping(container, resourceType, assignedResources);
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/hadoop/blob/22928c0c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/gpu/TestGpuResourceHandler.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/gpu/TestGpuResourceHandler.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/gpu/TestGpuResourceHandler.java
index 87ab249..9a8a4c9 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/gpu/TestGpuResourceHandler.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/gpu/TestGpuResourceHandler.java
@@ -38,6 +38,7 @@ import 
org.apache.hadoop.yarn.server.nodemanager.containermanager.linux.resource
 import 
org.apache.hadoop.yarn.server.nodemanager.containermanager.resourceplugin.gpu.GpuDevice;
 import 
org.apache.hadoop.yarn.server.nodemanager.containermanager.resourceplugin.gpu.GpuDiscoverer;
 import 
org.apache.hadoop.yarn.server.nodemanager.containermanager.runtime.ContainerRuntimeConstants;
+import 
org.apache.hadoop.yarn.server.nodemanager.recovery.NMNullStateStoreService;
 import org.apache.hadoop.yarn.server.nodemanager.recovery.NMStateStoreService;
 import org.apache.hadoop.yarn.util.resource.TestResourceUtils;
 import org.junit.Assert;
@@ -343,6 +344,35 @@ public class TestGpuResourceHandler {
   }
 
   @Test
+  public void testAllocationStoredWithNULLStateStore() throws Exception {
+NMNullStateStoreService mockNMNULLStateStore = 
mock(NMNullStateStoreService.class);
+
+Context nmnctx = mock(Context.class);
+when(nmnctx.getNMStateStore()).thenReturn(mockNMNULLStateStore);
+
+GpuResourceHandlerImpl gpuNULLStateResourceHandler =
+new GpuResourceHandlerImpl(nmnctx, mockCGroupsHandler,
+mockPrivilegedExecutor);
+
+Configuration conf = new YarnConfiguration();
+conf.set(YarnConfiguration.NM_GPU_ALLOWED_DEVICES, "0:0,1:1,2:3,3:4");
+GpuDiscoverer.getInstance().initialize(conf);
+
+gpuNULLStateResourceHandler.bootstrap(conf);
+Assert.assertEquals(4,
+gpuNULLStateResourceHandler.getGpuAllocator().ge

[39/50] [abbrv] hadoop git commit: YARN-7637. GPU volume creation command fails when work preserving is disabled at NM. Contributed by Zian Chen.

2018-03-01 Thread rohithsharmaks 
YARN-7637. GPU volume creation command fails when work preserving is disabled 
at NM. Contributed by Zian Chen.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/628e246a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/628e246a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/628e246a

Branch: refs/heads/YARN-7055
Commit: 628e246a7eddb07007f356d32df34f9c0f75e7f4
Parents: d9b6787
Author: Sunil G 
Authored: Thu Mar 1 22:39:32 2018 +0530
Committer: Rohith Sharma K S 
Committed: Fri Mar 2 11:08:29 2018 +0530

--
 .../recovery/NMNullStateStoreService.java   |  1 +
 .../resources/gpu/TestGpuResourceHandler.java   | 30 
 2 files changed, 31 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/628e246a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/recovery/NMNullStateStoreService.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/recovery/NMNullStateStoreService.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/recovery/NMNullStateStoreService.java
index 2d522a9..78137bb 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/recovery/NMNullStateStoreService.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/recovery/NMNullStateStoreService.java
@@ -272,6 +272,7 @@ public class NMNullStateStoreService extends 
NMStateStoreService {
   public void storeAssignedResources(Container container,
   String resourceType, List assignedResources)
   throws IOException {
+updateContainerResourceMapping(container, resourceType, assignedResources);
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/hadoop/blob/628e246a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/gpu/TestGpuResourceHandler.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/gpu/TestGpuResourceHandler.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/gpu/TestGpuResourceHandler.java
index 87ab249..9a8a4c9 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/gpu/TestGpuResourceHandler.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/gpu/TestGpuResourceHandler.java
@@ -38,6 +38,7 @@ import 
org.apache.hadoop.yarn.server.nodemanager.containermanager.linux.resource
 import 
org.apache.hadoop.yarn.server.nodemanager.containermanager.resourceplugin.gpu.GpuDevice;
 import 
org.apache.hadoop.yarn.server.nodemanager.containermanager.resourceplugin.gpu.GpuDiscoverer;
 import 
org.apache.hadoop.yarn.server.nodemanager.containermanager.runtime.ContainerRuntimeConstants;
+import 
org.apache.hadoop.yarn.server.nodemanager.recovery.NMNullStateStoreService;
 import org.apache.hadoop.yarn.server.nodemanager.recovery.NMStateStoreService;
 import org.apache.hadoop.yarn.util.resource.TestResourceUtils;
 import org.junit.Assert;
@@ -343,6 +344,35 @@ public class TestGpuResourceHandler {
   }
 
   @Test
+  public void testAllocationStoredWithNULLStateStore() throws Exception {
+NMNullStateStoreService mockNMNULLStateStore = 
mock(NMNullStateStoreService.class);
+
+Context nmnctx = mock(Context.class);
+when(nmnctx.getNMStateStore()).thenReturn(mockNMNULLStateStore);
+
+GpuResourceHandlerImpl gpuNULLStateResourceHandler =
+new GpuResourceHandlerImpl(nmnctx, mockCGroupsHandler,
+mockPrivilegedExecutor);
+
+Configuration conf = new YarnConfiguration();
+conf.set(YarnConfiguration.NM_GPU_ALLOWED_DEVICES, "0:0,1:1,2:3,3:4");
+GpuDiscoverer.getInstance().initialize(conf);
+
+gpuNULLStateResourceHandler.bootstrap(conf);
+Assert.assertEquals(4,
+gpuNULLStateResourceHandler.getGpuAllo