This is an automated email from the ASF dual-hosted git repository.
srdo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/storm.git.
from 8951e7a Merge branch 'STORM-3373' of https://github.com/srdo/storm
into STORM-3373-merge
new aaf1113 STORM-3376: Set Server callback before opening Netty socket,
so we don't drop messages during startup
new 2bf972e Merge branch 'STORM-3376' of https://github.com/srdo/storm
into asfgit-master
new c985695 STORM-3379: Fix intermittent NPE during worker boot in local
mode
new 26e6c06 Merge branch 'STORM-3379' of https://github.com/srdo/storm
into asfgit-master
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
integration-test/config/storm.yaml | 6 ++
.../test/org/apache/storm/sql/TestStormSql.java | 45 ++++-----
.../backends/streams/TestPlanCompiler.java | 96 +++++++++---------
.../src/test/org/apache/storm/sql/TestUtils.java | 23 ++---
.../org/apache/storm/cluster/IStateStorage.java | 4 +-
.../storm/cluster/StormClusterStateImpl.java | 8 +-
.../jvm/org/apache/storm/daemon/worker/Worker.java | 30 ++++--
.../apache/storm/daemon/worker/WorkerState.java | 83 ++++++++--------
.../org/apache/storm/messaging/IConnection.java | 14 ---
.../jvm/org/apache/storm/messaging/IContext.java | 5 +-
.../org/apache/storm/messaging/local/Context.java | 98 +++++++++----------
.../org/apache/storm/messaging/netty/Client.java | 15 ---
.../org/apache/storm/messaging/netty/Context.java | 6 +-
.../org/apache/storm/messaging/netty/Server.java | 29 +++---
.../apache/storm/security/auth/ThriftServer.java | 8 +-
.../auth/digest/DigestSaslTransportPlugin.java | 11 ++-
.../auth/kerberos/KerberosSaslTransportPlugin.java | 11 ++-
.../security/auth/sasl/SaslTransportPlugin.java | 11 ++-
.../auth/workertoken/WorkerTokenAuthorizer.java | 15 ++-
.../org/apache/storm/utils/SupervisorClient.java | 5 +-
.../apache/storm/utils/SupervisorIfaceFactory.java | 13 ++-
.../apache/storm/messaging/netty/NettyTest.java | 28 ++----
.../main/java/org/apache/storm/LocalCluster.java | 6 +-
.../apache/storm/blobstore/LocalFsBlobStore.java | 1 +
.../apache/storm/daemon/supervisor/Container.java | 4 +-
.../storm/daemon/supervisor/ContainerLauncher.java | 7 +-
.../storm/daemon/supervisor/LocalContainer.java | 10 +-
.../daemon/supervisor/LocalContainerLauncher.java | 7 +-
.../storm/daemon/supervisor/ReadClusterState.java | 3 +-
.../org/apache/storm/daemon/supervisor/Slot.java | 2 +-
.../apache/storm/daemon/supervisor/Supervisor.java | 108 ++++++++++++---------
.../org/apache/storm/localizer/AsyncLocalizer.java | 4 +-
.../nimbus/AssignmentDistributionService.java | 2 +-
.../security/auth/workertoken/WorkerTokenTest.java | 24 ++---
34 files changed, 389 insertions(+), 353 deletions(-)
copy
storm-server/src/main/java/org/apache/storm/daemon/drpc/RequestFactory.java =>
storm-client/src/jvm/org/apache/storm/utils/SupervisorIfaceFactory.java (78%)
