Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cd33e0fd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cd33e0fd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cd33e0fd Branch: refs/heads/trunk Commit: cd33e0fdad7c8e3c5645908e5218ecf5e39c93c2 Parents: 3b27533 e58c26a Author: Jeff Jirsa <[email protected]> Authored: Fri Feb 10 15:54:11 2017 -0800 Committer: Jeff Jirsa <[email protected]> Committed: Fri Feb 10 15:54:42 2017 -0800 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../org/apache/cassandra/hints/HintVerbHandler.java | 6 ++++-- .../apache/cassandra/hints/HintsDispatchExecutor.java | 13 +++++++------ src/java/org/apache/cassandra/hints/HintsReader.java | 7 +++++-- 4 files changed, 18 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd33e0fd/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd33e0fd/src/java/org/apache/cassandra/hints/HintsDispatchExecutor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd33e0fd/src/java/org/apache/cassandra/hints/HintsReader.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/hints/HintsReader.java index 6ede205,e41340a..158e778 --- a/src/java/org/apache/cassandra/hints/HintsReader.java +++ b/src/java/org/apache/cassandra/hints/HintsReader.java @@@ -30,10 -30,12 +30,11 @@@ import com.google.common.util.concurren import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.cassandra.db.UnknownColumnFamilyException; +import org.apache.cassandra.exceptions.UnknownTableException; import org.apache.cassandra.io.FSReadError; + import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.AbstractIterator; import org.apache.cassandra.utils.ByteBufferUtil; -import org.apache.cassandra.utils.CLibrary; /** * A paged non-compressed hints reader that provides two iterators: @@@ -224,11 -226,12 +225,12 @@@ class HintsReader implements AutoClosea hint = Hint.serializer.deserialize(input, descriptor.messagingVersion()); input.checkLimit(0); } - catch (UnknownColumnFamilyException e) + catch (UnknownTableException e) { - logger.warn("Failed to read a hint for {} - table with id {} is unknown in file {}", + logger.warn("Failed to read a hint for {}: {} - table with id {} is unknown in file {}", + StorageService.instance.getEndpointForHostId(descriptor.hostId), descriptor.hostId, - e.cfId, + e.id, descriptor.fileName()); input.skipBytes(Ints.checkedCast(size - input.bytesPastLimit()));
