Updated Branches: refs/heads/trunk bd32d4f0b -> 03ea58a94
Revert "StorageProxy throws NPEs for when there's no hostids for a target" This reverts commit bd32d4f0b9f0f88fed97e8ddf2ee41b5b048d31d. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/03ea58a9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/03ea58a9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/03ea58a9 Branch: refs/heads/trunk Commit: 03ea58a94827087ac75bf48ae1ef8698fb48fda0 Parents: bd32d4f Author: Eric Evans <[email protected]> Authored: Tue May 22 19:37:16 2012 -0500 Committer: Eric Evans <[email protected]> Committed: Tue May 22 19:37:16 2012 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/service/StorageProxy.java | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/03ea58a9/src/java/org/apache/cassandra/service/StorageProxy.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java index 10189a0..9fad95a 100644 --- a/src/java/org/apache/cassandra/service/StorageProxy.java +++ b/src/java/org/apache/cassandra/service/StorageProxy.java @@ -362,11 +362,8 @@ public class StorageProxy implements StorageProxyMBean try { UUID hostId = StorageService.instance.getTokenMetadata().getHostId(target); - if (hostId == null) // The node in question will not have a host id if older than MessagingService.VERSION_12 in a mixed version cluster - { - logger.warn("Unable to store hint for host with missing ID, {} (old node?)", target.toString()); - return; - } + if ((hostId == null) && (Gossiper.instance.getVersion(target) < MessagingService.VERSION_12)) + logger.info("Unable to store hint for host with missing ID, {} (old node?)", target.toString()); RowMutation hintedMutation = RowMutation.hintFor(mutation, ByteBuffer.wrap(UUIDGen.decompose(hostId))); hintedMutation.apply();
