Author: acmurthy
Date: Sat Jun 29 00:54:32 2013
New Revision: 1497963
URL: http://svn.apache.org/r1497963
Log:
MAPREDUCE-5351. Fixed a memory leak in JobTracker due to stable FS objects in
FSCache. Contributed by Sandy Ryza.
Added:
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestCleanupQueue.java
Modified:
hadoop/common/branches/branch-1/CHANGES.txt
Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1497963&r1=1497962&r2=1497963&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Sat Jun 29 00:54:32 2013
@@ -105,7 +105,7 @@ Release 1.2.1 - Unreleased
HADOOP-9665. Fixed BlockDecompressorStream#decompress to return -1 rather
than throw EOF at end of file. (Zhijie Shen via acmurthy)
- HADOOP-5351. Fixed a memory leak in JobTracker due to stable FS objects in
+ MAPREDUCE-5351. Fixed a memory leak in JobTracker due to stable FS objects
in
FSCache. (Sandy Ryza via acmurthy)
Release 1.2.0 - 2013.05.05
Added:
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestCleanupQueue.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestCleanupQueue.java?rev=1497963&view=auto
==============================================================================
---
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestCleanupQueue.java
(added)
+++
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestCleanupQueue.java
Sat Jun 29 00:54:32 2013
@@ -0,0 +1,52 @@
+/**
+ * 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.mapred;
+
+import java.io.File;
+import java.io.IOException;
+
+import junit.framework.Assert;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.mapred.CleanupQueue.PathDeletionContext;
+import org.apache.hadoop.security.UserGroupInformation;
+import org.junit.Test;
+
+public class TestCleanupQueue {
+ @Test (timeout = 2000)
+ public void testCleanupQueueClosesFilesystem() throws IOException,
+ InterruptedException {
+ File file = new File("afile.txt");
+ file.createNewFile();
+ Path path = new Path(file.getAbsoluteFile().toURI());
+
+ FileSystem.get(new Configuration());
+ Assert.assertEquals(1, FileSystem.getCacheSize());
+
+ CleanupQueue cleanupQueue = new CleanupQueue();
+ PathDeletionContext context = new PathDeletionContext(path,
+ new Configuration(), UserGroupInformation.getLoginUser());
+ cleanupQueue.addToQueue(context);
+
+ while (FileSystem.getCacheSize() > 0) {
+ Thread.sleep(100);
+ }
+ }
+}
