You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/01/25 00:03:51 UTC
[1/3] git commit: Ensure native transport is running before setting
isRunning Patch by Ravi Prasad, reviewed by brandonwilliams for CASSANDRA-6618
Updated Branches:
refs/heads/cassandra-2.0 a16986374 -> 1b858be48
refs/heads/trunk e488e5879 -> 4724d562c
Ensure native transport is running before setting isRunning
Patch by Ravi Prasad, reviewed by brandonwilliams for CASSANDRA-6618
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1b858be4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1b858be4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1b858be4
Branch: refs/heads/cassandra-2.0
Commit: 1b858be482114e6038a555bf0937a5e10c9ae7e7
Parents: a169863
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jan 24 17:01:19 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jan 24 17:01:19 2014 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/transport/Server.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b858be4/src/java/org/apache/cassandra/transport/Server.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/transport/Server.java b/src/java/org/apache/cassandra/transport/Server.java
index bd403fe..4f46614 100644
--- a/src/java/org/apache/cassandra/transport/Server.java
+++ b/src/java/org/apache/cassandra/transport/Server.java
@@ -106,7 +106,6 @@ public class Server implements CassandraDaemon.Server
if(!isRunning())
{
run();
- isRunning.set(true);
}
}
@@ -156,6 +155,7 @@ public class Server implements CassandraDaemon.Server
logger.info("Starting listening for CQL clients on {}...", socket);
Channel channel = bootstrap.bind(socket);
connectionTracker.allChannels.add(channel);
+ isRunning.set(true);
}
private void registerMetrics()
[3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4724d562
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4724d562
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4724d562
Branch: refs/heads/trunk
Commit: 4724d562ca02e06dcc26c7126f1ba3ddeb811250
Parents: e488e58 1b858be
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jan 24 17:01:57 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jan 24 17:01:57 2014 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/transport/Server.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[2/3] git commit: Ensure native transport is running before setting
isRunning Patch by Ravi Prasad, reviewed by brandonwilliams for CASSANDRA-6618
Posted by br...@apache.org.
Ensure native transport is running before setting isRunning
Patch by Ravi Prasad, reviewed by brandonwilliams for CASSANDRA-6618
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1b858be4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1b858be4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1b858be4
Branch: refs/heads/trunk
Commit: 1b858be482114e6038a555bf0937a5e10c9ae7e7
Parents: a169863
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jan 24 17:01:19 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jan 24 17:01:19 2014 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/transport/Server.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b858be4/src/java/org/apache/cassandra/transport/Server.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/transport/Server.java b/src/java/org/apache/cassandra/transport/Server.java
index bd403fe..4f46614 100644
--- a/src/java/org/apache/cassandra/transport/Server.java
+++ b/src/java/org/apache/cassandra/transport/Server.java
@@ -106,7 +106,6 @@ public class Server implements CassandraDaemon.Server
if(!isRunning())
{
run();
- isRunning.set(true);
}
}
@@ -156,6 +155,7 @@ public class Server implements CassandraDaemon.Server
logger.info("Starting listening for CQL clients on {}...", socket);
Channel channel = bootstrap.bind(socket);
connectionTracker.allChannels.add(channel);
+ isRunning.set(true);
}
private void registerMetrics()