Updated Branches: refs/heads/trunk 318b00e25 -> f2be80c61
Handle no matching endpoint for hint target Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f2be80c6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f2be80c6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f2be80c6 Branch: refs/heads/trunk Commit: f2be80c6170f469a42b0f01d91b4ad206b5c1cf3 Parents: 318b00e Author: Tyler Hobbs <ty...@datastax.com> Authored: Mon Jul 29 13:15:00 2013 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Tue Jul 30 12:46:15 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/HintedHandOffManager.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f2be80c6/src/java/org/apache/cassandra/db/HintedHandOffManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/HintedHandOffManager.java b/src/java/org/apache/cassandra/db/HintedHandOffManager.java index 6b69354..014a4cc 100644 --- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java +++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java @@ -122,7 +122,13 @@ public class HintedHandOffManager implements HintedHandOffManagerMBean public RowMutation hintFor(RowMutation mutation, int ttl, UUID targetId) { assert ttl > 0; - metrics.incrCreatedHints(StorageService.instance.getTokenMetadata().getEndpointForHostId(targetId)); + + InetAddress endpoint = StorageService.instance.getTokenMetadata().getEndpointForHostId(targetId); + // during tests we may not have a matching endpoint, but this would be unexpected in real clusters + if (endpoint != null) + metrics.incrCreatedHints(endpoint); + else + logger.warn("Unable to find matching endpoint for target {} when storing a hint", targetId); UUID hintId = UUIDGen.getTimeUUID(); // serialize the hint with id and version as a composite column name