Revert "YARN-9128. Use SerializationUtils from apache commons to serialize / deserialize ResourceMappings. Contributed by Zoltan Siegl"

This reverts commit 42177e8b78.

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ResourceMappings.java

@@ -18,10 +18,11 @@
 
 package org.apache.hadoop.yarn.server.nodemanager.containermanager.container;
 
-import org.apache.commons.lang3.SerializationException;
+import java.io.ByteArrayInputStream;
-import org.apache.commons.lang3.SerializationUtils;
+import java.io.ByteArrayOutputStream;
-
 import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -29,6 +30,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.io.IOUtils;
+
 /**
  * This class is used to store assigned resource to a single container by
  * resource types.
@@ -88,11 +91,16 @@ public class ResourceMappings {
     @SuppressWarnings("unchecked")
     public static AssignedResources fromBytes(byte[] bytes)
         throws IOException {
-      final List<Serializable> resources;
+      ObjectInputStream ois = null;
+      List<Serializable> resources;
       try {
-        resources = SerializationUtils.deserialize(bytes);
+        ByteArrayInputStream bis = new ByteArrayInputStream(bytes);
-      } catch (SerializationException e) {
+        ois = new ObjectInputStream(bis);
+        resources = (List<Serializable>) ois.readObject();
+      } catch (ClassNotFoundException e) {
         throw new IOException(e);
+      } finally {
+        IOUtils.closeQuietly(ois);
       }
       AssignedResources ar = new AssignedResources();
       ar.updateAssignedResources(resources);
@@ -100,11 +108,15 @@ public class ResourceMappings {
     }
 
     public byte[] toBytes() throws IOException {
-      final byte[] bytes;
+      ObjectOutputStream oos = null;
+      byte[] bytes;
       try {
-        bytes = SerializationUtils.serialize((Serializable) resources);
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-      } catch (SerializationException e) {
+        oos = new ObjectOutputStream(bos);
-        throw new IOException(e);
+        oos.writeObject(resources);
+        bytes = bos.toByteArray();
+      } finally {
+        IOUtils.closeQuietly(oos);
       }
       return bytes;
     }

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/TestResourceMappings.java

@@ -1,118 +0,0 @@
-/**
- * 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.nodemanager.containermanager.container;
-
-import com.google.common.collect.ImmutableList;
-import org.apache.commons.io.IOUtils;
-import org.apache.hadoop.yarn.server.nodemanager.api.deviceplugin.Device;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectOutputStream;
-import java.io.Serializable;
-import java.util.List;
-
-public class TestResourceMappings {
-
-  private static final ResourceMappings.AssignedResources testResources =
-      new ResourceMappings.AssignedResources();
-
-  @BeforeClass
-  public static void setup() {
-    testResources.updateAssignedResources(ImmutableList.of(
-        Device.Builder.newInstance()
-            .setId(0)
-            .setDevPath("/dev/hdwA0")
-            .setMajorNumber(256)
-            .setMinorNumber(0)
-            .setBusID("0000:80:00.0")
-            .setHealthy(true)
-            .build(),
-        Device.Builder.newInstance()
-            .setId(1)
-            .setDevPath("/dev/hdwA1")
-            .setMajorNumber(256)
-            .setMinorNumber(0)
-            .setBusID("0000:80:00.1")
-            .setHealthy(true)
-            .build()
-    ));
-  }
-
-  @Test
-  public void testSerializeAssignedResourcesWithSerializationUtils() {
-    try {
-      byte[] serializedString = testResources.toBytes();
-
-      ResourceMappings.AssignedResources deserialized =
-          ResourceMappings.AssignedResources.fromBytes(serializedString);
-
-      Assert.assertEquals(testResources.getAssignedResources(),
-          deserialized.getAssignedResources());
-
-    } catch (IOException e) {
-      e.printStackTrace();
-      Assert.fail(String.format("Serialization of test AssignedResources " +
-          "failed with %s", e.getMessage()));
-    }
-  }
-
-  @Test
-  public void testAssignedResourcesCanDeserializePreviouslySerializedValues() {
-    try {
-      byte[] serializedString = toBytes(testResources.getAssignedResources());
-
-      ResourceMappings.AssignedResources deserialized =
-          ResourceMappings.AssignedResources.fromBytes(serializedString);
-
-      Assert.assertEquals(testResources.getAssignedResources(),
-          deserialized.getAssignedResources());
-
-    } catch (IOException e) {
-      e.printStackTrace();
-      Assert.fail(String.format("Deserialization of test AssignedResources " +
-          "failed with %s", e.getMessage()));
-    }
-  }
-
-  /**
-   * This was the legacy way to serialize resources. This is here for
-   * backward compatibility to ensure that after YARN-9128 we can still
-   * deserialize previously serialized resources.
-   *
-   * @param resources the list of resources
-   * @return byte array representation of the resource
-   * @throws IOException
-   */
-  private byte[] toBytes(List<Serializable> resources) throws IOException {
-    ObjectOutputStream oos = null;
-    byte[] bytes;
-    try {
-      ByteArrayOutputStream bos = new ByteArrayOutputStream();
-      oos = new ObjectOutputStream(bos);
-      oos.writeObject(resources);
-      bytes = bos.toByteArray();
-    } finally {
-      IOUtils.closeQuietly(oos);
-    }
-    return bytes;
-  }
-}