forked from apache/storm
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'v0.9.2-incubating' into security
[maven-release-plugin] copy for tag v0.9.2-incubating Conflicts: storm-core/pom.xml
- Loading branch information
Showing
12 changed files
with
237 additions
and
33 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
153 changes: 153 additions & 0 deletions
153
storm-core/test/jvm/backtype/storm/utils/DisruptorQueueTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,153 @@ | ||
| /** | ||
| * 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 backtype.storm.utils; | ||
|
|
||
| import java.util.concurrent.atomic.AtomicBoolean; | ||
|
|
||
| import com.lmax.disruptor.BlockingWaitStrategy; | ||
| import com.lmax.disruptor.EventHandler; | ||
| import com.lmax.disruptor.InsufficientCapacityException; | ||
| import com.lmax.disruptor.MultiThreadedClaimStrategy; | ||
| import org.junit.Assert; | ||
| import org.junit.Test; | ||
| import junit.framework.TestCase; | ||
|
|
||
| public class DisruptorQueueTest extends TestCase { | ||
|
|
||
| private final static int TIMEOUT = 5; // MS | ||
| private final static int PRODUCER_NUM = 4; | ||
|
|
||
| @Test | ||
| public void testMessageDisorder() throws InterruptedException { | ||
|
|
||
| // Set queue length to bigger enough | ||
| DisruptorQueue queue = createQueue("messageOrder", 16); | ||
|
|
||
| queue.publish("1"); | ||
|
|
||
| Runnable producer = new Producer(queue, "2"); | ||
|
|
||
| final Object [] result = new Object[1]; | ||
| Runnable consumer = new Consumer(queue, new EventHandler<Object>() { | ||
| private boolean head = true; | ||
|
|
||
| @Override | ||
| public void onEvent(Object obj, long sequence, boolean endOfBatch) | ||
| throws Exception { | ||
| if (head) { | ||
| head = false; | ||
| result[0] = obj; | ||
| } | ||
| } | ||
| }); | ||
|
|
||
| run(producer, consumer); | ||
| Assert.assertEquals("We expect to receive first published message first, but received " + result[0], | ||
| "1", result[0]); | ||
| } | ||
|
|
||
| @Test | ||
| public void testConsumerHang() throws InterruptedException { | ||
| final AtomicBoolean messageConsumed = new AtomicBoolean(false); | ||
|
|
||
| // Set queue length to 1, so that the RingBuffer can be easily full | ||
| // to trigger consumer blocking | ||
| DisruptorQueue queue = createQueue("consumerHang", 1); | ||
| Runnable producer = new Producer(queue, "msg"); | ||
| Runnable consumer = new Consumer(queue, new EventHandler<Object>() { | ||
| @Override | ||
| public void onEvent(Object obj, long sequence, boolean endOfBatch) | ||
| throws Exception { | ||
| messageConsumed.set(true); | ||
| } | ||
| }); | ||
|
|
||
| run(producer, consumer); | ||
| Assert.assertTrue("disruptor message is never consumed due to consumer thread hangs", | ||
| messageConsumed.get()); | ||
| } | ||
|
|
||
|
|
||
| private void run(Runnable producer, Runnable consumer) | ||
| throws InterruptedException { | ||
|
|
||
| Thread[] producerThreads = new Thread[PRODUCER_NUM]; | ||
| for (int i = 0; i < PRODUCER_NUM; i++) { | ||
| producerThreads[i] = new Thread(producer); | ||
| producerThreads[i].start(); | ||
| } | ||
|
|
||
| Thread consumerThread = new Thread(consumer); | ||
| consumerThread.start(); | ||
|
|
||
| for (int i = 0; i < PRODUCER_NUM; i++) { | ||
| producerThreads[i].interrupt(); | ||
| producerThreads[i].join(TIMEOUT); | ||
| } | ||
| consumerThread.interrupt(); | ||
| consumerThread.join(TIMEOUT); | ||
| } | ||
|
|
||
| private class Producer implements Runnable { | ||
| private String msg; | ||
| private DisruptorQueue queue; | ||
|
|
||
| Producer(DisruptorQueue queue, String msg) { | ||
| this.msg = msg; | ||
| this.queue = queue; | ||
| } | ||
|
|
||
| @Override | ||
| public void run() { | ||
| try { | ||
| while (true) { | ||
| queue.publish(msg, false); | ||
| } | ||
| } catch (InsufficientCapacityException e) { | ||
| return; | ||
| } | ||
| } | ||
| }; | ||
|
|
||
| private class Consumer implements Runnable { | ||
| private EventHandler handler; | ||
| private DisruptorQueue queue; | ||
|
|
||
| Consumer(DisruptorQueue queue, EventHandler handler) { | ||
| this.handler = handler; | ||
| this.queue = queue; | ||
| } | ||
|
|
||
| @Override | ||
| public void run() { | ||
| queue.consumerStarted(); | ||
| try { | ||
| while(true) { | ||
| queue.consumeBatchWhenAvailable(handler); | ||
| } | ||
| }catch(RuntimeException e) { | ||
| //break | ||
| } | ||
| } | ||
| }; | ||
|
|
||
| private static DisruptorQueue createQueue(String name, int queueSize) { | ||
| return new DisruptorQueue(name, new MultiThreadedClaimStrategy( | ||
| queueSize), new BlockingWaitStrategy()); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.