Author: cnauroth Date: Thu Feb 27 18:53:54 2014 New Revision: 1572679 URL: http://svn.apache.org/r1572679 Log: HADOOP-10353. FsUrlStreamHandlerFactory is not thread safe. Contributed by Tudor Scurtu.
Added: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestUrlStreamHandlerFactory.java Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestUrlStreamHandler.java Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestUrlStreamHandler.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestUrlStreamHandler.java?rev=1572679&r1=1572678&r2=1572679&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestUrlStreamHandler.java (original) +++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestUrlStreamHandler.java Thu Feb 27 18:53:54 2014 @@ -35,7 +35,7 @@ import org.apache.hadoop.test.PathUtils; import org.junit.Test; /** - * Test of the URL stream handler factory. + * Test of the URL stream handler. */ public class TestUrlStreamHandler { Added: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestUrlStreamHandlerFactory.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestUrlStreamHandlerFactory.java?rev=1572679&view=auto ============================================================================== --- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestUrlStreamHandlerFactory.java (added) +++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestUrlStreamHandlerFactory.java Thu Feb 27 18:53:54 2014 @@ -0,0 +1,80 @@ +/** + * 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.fs; + +import org.junit.Test; + +import java.util.ArrayList; +import java.util.Random; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; + +/** + * Test of the URL stream handler factory. + */ +public class TestUrlStreamHandlerFactory { + + private static final int RUNS = 20; + private static final int THREADS = 10; + private static final int TASKS = 200; + private static final int TIMEOUT = 30; + + @Test + public void testConcurrency() throws Exception { + for (int i = 0; i < RUNS; i++) { + singleRun(); + } + } + + private void singleRun() throws Exception { + final FsUrlStreamHandlerFactory factory = new FsUrlStreamHandlerFactory(); + final Random random = new Random(); + ExecutorService executor = Executors.newFixedThreadPool(THREADS); + ArrayList<Future<?>> futures = new ArrayList<Future<?>>(TASKS); + + for (int i = 0; i < TASKS ; i++) { + final int aux = i; + futures.add(executor.submit(new Runnable() { + @Override + public void run() { + int rand = aux + random.nextInt(3); + factory.createURLStreamHandler(String.valueOf(rand)); + } + })); + } + + executor.shutdown(); + try { + executor.awaitTermination(TIMEOUT, TimeUnit.SECONDS); + executor.shutdownNow(); + } catch (InterruptedException e) { + // pass + } + + // check for exceptions + for (Future future : futures) { + if (!future.isDone()) { + break; // timed out + } + future.get(); + } + } +}