Author: jbellis
Date: Thu May 19 17:10:49 2011
New Revision: 1125002
URL: http://svn.apache.org/viewvc?rev=1125002&view=rev
Log:
don't perform HH to client-mode
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-2668
Modified:
cassandra/branches/cassandra-0.7/CHANGES.txt
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/gms/EndpointState.java
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/gms/Gossiper.java
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java
Modified: cassandra/branches/cassandra-0.7/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/CHANGES.txt?rev=1125002&r1=1125001&r2=1125002&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7/CHANGES.txt Thu May 19 17:10:49 2011
@@ -3,6 +3,7 @@
(CASSANDRA-2652)
* mark BRAF buffer invalid post-flush so we don't re-flush partial
buffers again, especially on CL writes (CASSANDRA-2660)
+ * don't perform HH to client-mode [storageproxy] nodes (CASSANDRA-2668)
0.7.6
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/gms/EndpointState.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/gms/EndpointState.java?rev=1125002&r1=1125001&r2=1125002&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/gms/EndpointState.java
(original)
+++
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/gms/EndpointState.java
Thu May 19 17:10:49 2011
@@ -136,7 +136,7 @@ public class EndpointState
hasToken_ = value;
}
- public boolean getHasToken()
+ public boolean hasToken()
{
return hasToken_;
}
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/gms/Gossiper.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/gms/Gossiper.java?rev=1125002&r1=1125001&r2=1125002&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/gms/Gossiper.java
(original)
+++
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/gms/Gossiper.java
Thu May 19 17:10:49 2011
@@ -431,7 +431,7 @@ public class Gossiper implements IFailur
// check if this is a fat client. fat clients are removed
automatically from
// gosip after FatClientTimeout
- if (!epState.getHasToken() && !epState.isAlive() && (duration
> FatClientTimeout_))
+ if (!epState.hasToken() && !epState.isAlive() && (duration >
FatClientTimeout_))
{
if
(StorageService.instance.getTokenMetadata().isMember(endpoint))
epState.setHasToken(true);
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java?rev=1125002&r1=1125001&r2=1125002&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java
(original)
+++
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java
Thu May 19 17:10:49 2011
@@ -1130,7 +1130,7 @@ public class StorageService implements I
public void onAlive(InetAddress endpoint, EndpointState state)
{
- if (!isClientMode)
+ if (!isClientMode && state.hasToken())
deliverHints(endpoint);
}
