natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't update system table for unknown nodes/dead states 

Patch by Tyler Hobbs, reviewed by brandonwilliams for CASSANDRA-6053
This commit is contained in:
Brandon Williams 2014-01-10 12:48:08 -06:00
parent 32d7cb5066
commit 5977e7b6d6
2 changed files with 81 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
src/java/org/apache/cassandra/service/StorageService.java
View File

@ -1307,48 +1307,59 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
*/
public void onChange(InetAddress endpoint, ApplicationState state, VersionedValue value)
{
switch (state)
if (state.equals(ApplicationState.STATUS))
{
case STATUS:
String apStateValue = value.value;
String[] pieces = apStateValue.split(VersionedValue.DELIMITER_STR, -1);
assert (pieces.length > 0);
String apStateValue = value.value;
String[] pieces = apStateValue.split(VersionedValue.DELIMITER_STR, -1);
assert (pieces.length > 0);
String moveName = pieces[0];
String moveName = pieces[0];
if (moveName.equals(VersionedValue.STATUS_BOOTSTRAPPING))
handleStateBootstrap(endpoint, pieces);
else if (moveName.equals(VersionedValue.STATUS_NORMAL))
handleStateNormal(endpoint, pieces);
else if (moveName.equals(VersionedValue.REMOVING_TOKEN) || moveName.equals(VersionedValue.REMOVED_TOKEN))
handleStateRemoving(endpoint, pieces);
else if (moveName.equals(VersionedValue.STATUS_LEAVING))
handleStateLeaving(endpoint, pieces);
else if (moveName.equals(VersionedValue.STATUS_LEFT))
handleStateLeft(endpoint, pieces);
else if (moveName.equals(VersionedValue.STATUS_MOVING))
handleStateMoving(endpoint, pieces);
else if (moveName.equals(VersionedValue.STATUS_RELOCATING))
handleStateRelocating(endpoint, pieces);
break;
case RELEASE_VERSION:
SystemTable.updatePeerInfo(endpoint, "release_version", quote(value.value));
break;
case DC:
SystemTable.updatePeerInfo(endpoint, "data_center", quote(value.value));
break;
case RACK:
SystemTable.updatePeerInfo(endpoint, "rack", quote(value.value));
break;
case RPC_ADDRESS:
SystemTable.updatePeerInfo(endpoint, "rpc_address", quote(value.value));
break;
case SCHEMA:
SystemTable.updatePeerInfo(endpoint, "schema_version", value.value);
break;
case HOST_ID:
SystemTable.updatePeerInfo(endpoint, "host_id", value.value);
break;
if (moveName.equals(VersionedValue.STATUS_BOOTSTRAPPING))
handleStateBootstrap(endpoint, pieces);
else if (moveName.equals(VersionedValue.STATUS_NORMAL))
handleStateNormal(endpoint, pieces);
else if (moveName.equals(VersionedValue.REMOVING_TOKEN) || moveName.equals(VersionedValue.REMOVED_TOKEN))
handleStateRemoving(endpoint, pieces);
else if (moveName.equals(VersionedValue.STATUS_LEAVING))
handleStateLeaving(endpoint, pieces);
else if (moveName.equals(VersionedValue.STATUS_LEFT))
handleStateLeft(endpoint, pieces);
else if (moveName.equals(VersionedValue.STATUS_MOVING))
handleStateMoving(endpoint, pieces);
else if (moveName.equals(VersionedValue.STATUS_RELOCATING))
handleStateRelocating(endpoint, pieces);
}
else
{
EndpointState epState = Gossiper.instance.getEndpointStateForEndpoint(endpoint);
if (epState == null || Gossiper.instance.isDeadState(epState))
{
logger.debug("Ignoring state change for dead or unknown endpoint: {}", endpoint);
return;
}
switch (state)
{
case RELEASE_VERSION:
SystemTable.updatePeerInfo(endpoint, "release_version", quote(value.value));
break;
case DC:
SystemTable.updatePeerInfo(endpoint, "data_center", quote(value.value));
break;
case RACK:
SystemTable.updatePeerInfo(endpoint, "rack", quote(value.value));
break;
case RPC_ADDRESS:
SystemTable.updatePeerInfo(endpoint, "rpc_address", quote(value.value));
break;
case SCHEMA:
SystemTable.updatePeerInfo(endpoint, "schema_version", value.value);
break;
case HOST_ID:
SystemTable.updatePeerInfo(endpoint, "host_id", value.value);
break;
}
}
}

31
test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java
View File

@ -24,6 +24,7 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.*;
import org.apache.cassandra.db.SystemKeyspace;
import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.config.Schema;
import org.junit.Test;
@ -650,6 +651,36 @@ public class LeaveAndBootstrapTest
assertFalse(tmd.isLeaving(hosts.get(2)));
}
/**
* Tests that the system.peers table is not updated after a node has been removed. (See CASSANDRA-6053)
*/
@Test
public void testStateChangeOnRemovedNode() throws UnknownHostException
{
StorageService ss = StorageService.instance;
VersionedValue.VersionedValueFactory valueFactory = new VersionedValue.VersionedValueFactory(partitioner);
// create a ring of 2 nodes
ArrayList<Token> endpointTokens = new ArrayList<>();
List<InetAddress> hosts = new ArrayList<>();
Util.createInitialRing(ss, partitioner, endpointTokens, new ArrayList<Token>(), hosts, new ArrayList<UUID>(), 2);
InetAddress toRemove = hosts.get(1);
SystemKeyspace.updatePeerInfo(toRemove, "data_center", "'dc42'");
SystemKeyspace.updatePeerInfo(toRemove, "rack", "'rack42'");
assertEquals("rack42", SystemKeyspace.loadDcRackInfo().get(toRemove).get("rack"));
// mark the node as removed
Gossiper.instance.injectApplicationState(toRemove, ApplicationState.STATUS,
valueFactory.left(Collections.singleton(endpointTokens.get(1)), Gossiper.computeExpireTime()));
assertTrue(Gossiper.instance.isDeadState(Gossiper.instance.getEndpointStateForEndpoint(hosts.get(1))));
// state changes made after the endpoint has left should be ignored
ss.onChange(hosts.get(1), ApplicationState.RACK,
valueFactory.rack("rack9999"));
assertEquals("rack42", SystemKeyspace.loadDcRackInfo().get(toRemove).get("rack"));
}
private static Collection<InetAddress> makeAddrs(String... hosts) throws UnknownHostException
{
ArrayList<InetAddress> addrs = new ArrayList<InetAddress>(hosts.length);