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 2016/02/19 15:54:39 UTC
[03/10] storm git commit: remove IRunnableCallback.java
remove IRunnableCallback.java
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a9975b62
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a9975b62
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a9975b62
Branch: refs/heads/master
Commit: a9975b62f60751b7d25c5d451dcc0bdb9b758daf
Parents: a261c3a
Author: xiaojian.fxj <xi...@alibaba-inc.com>
Authored: Wed Feb 17 11:08:04 2016 +0800
Committer: xiaojian.fxj <xi...@alibaba-inc.com>
Committed: Wed Feb 17 11:08:04 2016 +0800
----------------------------------------------------------------------
.../clj/org/apache/storm/daemon/supervisor.clj | 13 ++++++------
.../storm/callback/IRunnableCallback.java | 22 --------------------
.../org/apache/storm/event/EventManager.java | 4 +---
.../org/apache/storm/event/EventManagerImp.java | 16 +++++++-------
4 files changed, 14 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/a9975b62/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj b/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
index 76a4691..1d3fd23 100644
--- a/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
@@ -32,7 +32,6 @@
(:import [org.apache.storm.generated WorkerResources ProfileAction])
(:import [org.apache.storm.localizer LocalResource])
(:import [org.apache.storm.event EventManagerImp])
- (:import [org.apache.storm.callback IRunnableCallback])
(:use [org.apache.storm.daemon common])
(:require [org.apache.storm.command [healthcheck :as healthcheck]])
(:require [org.apache.storm.daemon [worker :as worker]]
@@ -547,7 +546,7 @@
storm-cluster-state (:storm-cluster-state supervisor)
^ISupervisor isupervisor (:isupervisor supervisor)
^LocalState local-state (:local-state supervisor)
- sync-callback (fn [& ignored] (.add event-manager (reify IRunnableCallback
+ sync-callback (fn [& ignored] (.add event-manager (reify Runnable
(^void run [this]
(callback-supervisor)))))
assignment-versions @(:assignment-versions supervisor)
@@ -618,7 +617,7 @@
(log-message "Removing code for storm id "
storm-id)
(rm-topo-files conf storm-id localizer true)))
- (.add processes-event-manager (reify IRunnableCallback
+ (.add processes-event-manager (reify Runnable
(^void run [this]
(sync-processes)))))))
@@ -830,14 +829,14 @@
(when (conf SUPERVISOR-ENABLE)
;; This isn't strictly necessary, but it doesn't hurt and ensures that the machine stays up
;; to date even if callbacks don't all work exactly right
- (schedule-recurring (:event-timer supervisor) 0 10 (fn [] (.add event-manager (reify IRunnableCallback
+ (schedule-recurring (:event-timer supervisor) 0 10 (fn [] (.add event-manager (reify Runnable
(^void run [this]
(synchronize-supervisor))))))
(schedule-recurring (:event-timer supervisor)
0
(conf SUPERVISOR-MONITOR-FREQUENCY-SECS)
- (fn [] (.add processes-event-manager (reify IRunnableCallback
+ (fn [] (.add processes-event-manager (reify Runnable
(^void run [this]
(sync-processes))))))
@@ -845,7 +844,7 @@
(schedule-recurring (:blob-update-timer supervisor)
30
30
- (fn [] (.add event-manager (reify IRunnableCallback
+ (fn [] (.add event-manager (reify Runnable
(^void run [this]
(synchronize-blobs-fn))))))
@@ -864,7 +863,7 @@
(schedule-recurring (:event-timer supervisor)
30
30
- (fn [] (.add event-manager (reify IRunnableCallback
+ (fn [] (.add event-manager (reify Runnable
(^void run [this]
(run-profiler-actions-fn))))))
)
http://git-wip-us.apache.org/repos/asf/storm/blob/a9975b62/storm-core/src/jvm/org/apache/storm/callback/IRunnableCallback.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/callback/IRunnableCallback.java b/storm-core/src/jvm/org/apache/storm/callback/IRunnableCallback.java
deleted file mode 100644
index 9c18e1d..0000000
--- a/storm-core/src/jvm/org/apache/storm/callback/IRunnableCallback.java
+++ /dev/null
@@ -1,22 +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.storm.callback;
-
-public interface IRunnableCallback {
- public void run();
-}
http://git-wip-us.apache.org/repos/asf/storm/blob/a9975b62/storm-core/src/jvm/org/apache/storm/event/EventManager.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/event/EventManager.java b/storm-core/src/jvm/org/apache/storm/event/EventManager.java
index 8ee4345..7429d31 100644
--- a/storm-core/src/jvm/org/apache/storm/event/EventManager.java
+++ b/storm-core/src/jvm/org/apache/storm/event/EventManager.java
@@ -17,10 +17,8 @@
*/
package org.apache.storm.event;
-import org.apache.storm.callback.IRunnableCallback;
-
public interface EventManager {
- void add(IRunnableCallback eventFn);
+ void add(Runnable eventFn);
boolean waiting();
void shutdown();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/a9975b62/storm-core/src/jvm/org/apache/storm/event/EventManagerImp.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/event/EventManagerImp.java b/storm-core/src/jvm/org/apache/storm/event/EventManagerImp.java
index 35e5823..1c63ddc 100644
--- a/storm-core/src/jvm/org/apache/storm/event/EventManagerImp.java
+++ b/storm-core/src/jvm/org/apache/storm/event/EventManagerImp.java
@@ -17,7 +17,6 @@
*/
package org.apache.storm.event;
-import org.apache.storm.callback.IRunnableCallback;
import org.apache.storm.utils.Time;
import org.apache.storm.utils.Utils;
import org.slf4j.Logger;
@@ -36,9 +35,9 @@ public class EventManagerImp implements EventManager {
private AtomicBoolean running;
private Thread runner;
- private LinkedBlockingQueue<IRunnableCallback> queue = new LinkedBlockingQueue<IRunnableCallback>();
+ private LinkedBlockingQueue<Runnable> queue = new LinkedBlockingQueue<Runnable>();
- public EventManagerImp(boolean daemon) {
+ public EventManagerImp(boolean isDaemon) {
added = new AtomicInteger();
processed = new AtomicInteger();
running = new AtomicBoolean(true);
@@ -47,13 +46,13 @@ public class EventManagerImp implements EventManager {
public void run() {
while (running.get()) {
try {
- IRunnableCallback r = queue.take();
+ Runnable r = queue.take();
if (r == null) {
return;
}
r.run();
- proccessinc();
+ proccessInc();
} catch (Throwable t) {
if (Utils.exceptionCauseIsInstanceOf(InterruptedIOException.class, t)) {
LOG.info("Event manager interrupted while doing IO");
@@ -67,16 +66,16 @@ public class EventManagerImp implements EventManager {
}
}
};
- runner.setDaemon(daemon);
+ runner.setDaemon(isDaemon);
runner.start();
}
- public void proccessinc() {
+ public void proccessInc() {
processed.incrementAndGet();
}
@Override
- public void add(IRunnableCallback eventFn) {
+ public void add(Runnable eventFn) {
if (!running.get()) {
throw new RuntimeException("Cannot add events to a shutdown event manager");
}
@@ -87,7 +86,6 @@ public class EventManagerImp implements EventManager {
@Override
public boolean waiting() {
return (Time.isThreadWaiting(runner) || (processed.get() == added.get()));
-
}
public void shutdown() {