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/08/06 21:28:28 UTC
[5/6] git commit: fix build
fix build
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/368b63f0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/368b63f0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/368b63f0
Branch: refs/heads/cassandra-2.1
Commit: 368b63f06d86edbcbdd87e0fddd7ca662da6b367
Parents: bb0112b
Author: Brandon Williams <br...@apache.org>
Authored: Wed Aug 6 14:27:20 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Aug 6 14:28:00 2014 -0500
----------------------------------------------------------------------
.../apache/cassandra/hadoop/cql3/CqlConfigHelper.java | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/368b63f0/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
index b375ce2..7a5fd47 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
@@ -422,15 +422,15 @@ public class CqlConfigHelper
poolingOptions.setCoreConnectionsPerHost(HostDistance.LOCAL, coreConnections.get());
if (maxConnections.isPresent())
poolingOptions.setMaxConnectionsPerHost(HostDistance.LOCAL, maxConnections.get());
- if (maxSimultaneousRequests.isPresent())
- poolingOptions.setMaxSimultaneousRequestsPerConnectionThreshold(HostDistance.LOCAL, maxSimultaneousRequests.get());
if (minSimultaneousRequests.isPresent())
poolingOptions.setMinSimultaneousRequestsPerConnectionThreshold(HostDistance.LOCAL, minSimultaneousRequests.get());
+ if (maxSimultaneousRequests.isPresent())
+ poolingOptions.setMaxSimultaneousRequestsPerConnectionThreshold(HostDistance.LOCAL, maxSimultaneousRequests.get());
poolingOptions.setCoreConnectionsPerHost(HostDistance.REMOTE, 0)
.setMaxConnectionsPerHost(HostDistance.REMOTE, 0)
- .setMaxSimultaneousRequestsPerConnectionThreshold(HostDistance.REMOTE, 0)
- .setMinSimultaneousRequestsPerConnectionThreshold(HostDistance.REMOTE, 0);
+ .setMinSimultaneousRequestsPerConnectionThreshold(HostDistance.REMOTE, 0)
+ .setMaxSimultaneousRequestsPerConnectionThreshold(HostDistance.REMOTE, 0);
return poolingOptions;
}
@@ -519,6 +519,11 @@ public class CqlConfigHelper
}
@Override
+ public void onSuspected(Host host)
+ {
+ }
+
+ @Override
public HostDistance distance(Host host)
{
if (host.getAddress().getHostName().equals(stickHost))