You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2018/01/03 15:17:09 UTC
[1/2] storm git commit: STORM-2874: Minor refactoring of backpressure
test code
Repository: storm
Updated Branches:
refs/heads/1.x-branch 58ae04b09 -> 17173a51a
STORM-2874: Minor refactoring of backpressure test code
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/8a407dd8
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8a407dd8
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8a407dd8
Branch: refs/heads/1.x-branch
Commit: 8a407dd894d85555f95bee4b5886607031fd6a27
Parents: 894a0b0
Author: Stig Rohde Døssing <sr...@apache.org>
Authored: Sat Dec 30 11:43:12 2017 +0100
Committer: Stig Rohde Døssing <sr...@apache.org>
Committed: Sat Dec 30 11:43:12 2017 +0100
----------------------------------------------------------------------
.../storm/utils/WorkerBackpressureThread.java | 20 +++++++++--------
.../utils/WorkerBackpressureThreadTest.java | 23 ++++++++++----------
2 files changed, 22 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/8a407dd8/storm-core/src/jvm/org/apache/storm/utils/WorkerBackpressureThread.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/utils/WorkerBackpressureThread.java b/storm-core/src/jvm/org/apache/storm/utils/WorkerBackpressureThread.java
index f3b5a66..3c3ae6f 100644
--- a/storm-core/src/jvm/org/apache/storm/utils/WorkerBackpressureThread.java
+++ b/storm-core/src/jvm/org/apache/storm/utils/WorkerBackpressureThread.java
@@ -21,7 +21,7 @@ package org.apache.storm.utils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class WorkerBackpressureThread extends Thread {
+public final class WorkerBackpressureThread extends Thread {
private static final Logger LOG = LoggerFactory.getLogger(WorkerBackpressureThread.class);
private Object trigger;
@@ -66,14 +66,16 @@ public class WorkerBackpressureThread extends Thread {
}
}
}
-}
+
+ private static class BackpressureUncaughtExceptionHandler implements Thread.UncaughtExceptionHandler {
+
+ private static final Logger LOG = LoggerFactory.getLogger(BackpressureUncaughtExceptionHandler.class);
-class BackpressureUncaughtExceptionHandler implements Thread.UncaughtExceptionHandler {
- private static final Logger LOG = LoggerFactory.getLogger(BackpressureUncaughtExceptionHandler.class);
- @Override
- public void uncaughtException(Thread t, Throwable e) {
- // note that exception that happens during connecting to ZK has been ignored in the callback implementation
- LOG.error("Received error or exception in WorkerBackpressureThread.. terminating the worker...", e);
- Runtime.getRuntime().exit(1);
+ @Override
+ public void uncaughtException(Thread t, Throwable e) {
+ // note that exception that happens during connecting to ZK has been ignored in the callback implementation
+ LOG.error("Received error or exception in WorkerBackpressureThread.. terminating the worker...", e);
+ Runtime.getRuntime().exit(1);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/8a407dd8/storm-core/test/jvm/org/apache/storm/utils/WorkerBackpressureThreadTest.java
----------------------------------------------------------------------
diff --git a/storm-core/test/jvm/org/apache/storm/utils/WorkerBackpressureThreadTest.java b/storm-core/test/jvm/org/apache/storm/utils/WorkerBackpressureThreadTest.java
index b8e1770..ee271be 100644
--- a/storm-core/test/jvm/org/apache/storm/utils/WorkerBackpressureThreadTest.java
+++ b/storm-core/test/jvm/org/apache/storm/utils/WorkerBackpressureThreadTest.java
@@ -18,33 +18,32 @@
package org.apache.storm.utils;
-import java.util.concurrent.atomic.AtomicLong;
-import org.junit.Assert;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
import org.junit.Test;
-import junit.framework.TestCase;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class WorkerBackpressureThreadTest extends TestCase {
+public class WorkerBackpressureThreadTest {
private static final Logger LOG = LoggerFactory.getLogger(WorkerBackpressureThreadTest.class);
@Test
public void testNormalEvent() throws Exception {
Object trigger = new Object();
- AtomicLong workerData = new AtomicLong(0);
+ CountDownLatch latch = new CountDownLatch(1);
WorkerBackpressureCallback callback = new WorkerBackpressureCallback() {
@Override
public void onEvent(Object obj) {
- ((AtomicLong) obj).getAndDecrement();
+ ((CountDownLatch) obj).countDown();
}
};
- WorkerBackpressureThread workerBackpressureThread = new WorkerBackpressureThread(trigger, workerData, callback);
+ WorkerBackpressureThread workerBackpressureThread = new WorkerBackpressureThread(trigger, latch, callback);
workerBackpressureThread.start();
WorkerBackpressureThread.notifyBackpressureChecker(trigger);
- long start = System.currentTimeMillis();
- while (workerData.get() == 0) {
- assertTrue("Timeout", (System.currentTimeMillis() - start) < 1000);
- Thread.sleep(100);
- }
+ //The callback should be called when the trigger is notified
+ assertThat(latch.await(1, TimeUnit.SECONDS), is(true));
}
}
[2/2] storm git commit: Merge branch 'STORM-2874-1.x' of
https://github.com/srdo/storm into STORM-2874-1.x
Posted by bo...@apache.org.
Merge branch 'STORM-2874-1.x' of https://github.com/srdo/storm into STORM-2874-1.x
STORM-2874 1.x: Minor refactoring of backpressure test code
This closes #2489
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/17173a51
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/17173a51
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/17173a51
Branch: refs/heads/1.x-branch
Commit: 17173a51a86f633ef489b928d4060181a2ddc5cf
Parents: 58ae04b 8a407dd
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Tue Jan 2 15:54:39 2018 -0600
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Tue Jan 2 15:54:39 2018 -0600
----------------------------------------------------------------------
.../storm/utils/WorkerBackpressureThread.java | 20 +++++++++--------
.../utils/WorkerBackpressureThreadTest.java | 23 ++++++++++----------
2 files changed, 22 insertions(+), 21 deletions(-)
----------------------------------------------------------------------