Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E13CA1765E for ; Tue, 11 Nov 2014 17:38:43 +0000 (UTC) Received: (qmail 20142 invoked by uid 500); 11 Nov 2014 17:38:43 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 20111 invoked by uid 500); 11 Nov 2014 17:38:43 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 20100 invoked by uid 99); 11 Nov 2014 17:38:43 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Nov 2014 17:38:43 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 742AAA0D2ED; Tue, 11 Nov 2014 17:38:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tylerhobbs@apache.org To: commits@cassandra.apache.org Message-Id: <5cab8b66713e423ea6232f77e28e2309@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cassandra git commit: Include ks name in failed streaming error message Date: Tue, 11 Nov 2014 17:38:43 +0000 (UTC) Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 c3a809584 -> a6802aa47 Include ks name in failed streaming error message Patch by Rajanarayanan Thottuvaikkatumana; reviewed by Tyler Hobbs for CASSANDRA-8221 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a6802aa4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a6802aa4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a6802aa4 Branch: refs/heads/cassandra-2.0 Commit: a6802aa479a46b6f3fb1855786f72f6e3b08e0b9 Parents: c3a8095 Author: Rajanarayanan Thottuvaikkatumana Authored: Tue Nov 11 11:38:06 2014 -0600 Committer: Tyler Hobbs Committed: Tue Nov 11 11:38:06 2014 -0600 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/dht/RangeStreamer.java | 10 +++++----- src/java/org/apache/cassandra/service/StorageService.java | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6802aa4/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 2b3bd3c..842643c 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,6 @@ 2.0.12: + * Include keyspace name in error message when there are insufficient + live nodes to stream from (CASSANDRA-8221) * Avoid overlap in L1 when L0 contains many nonoverlapping sstables (CASSANDRA-8211) * Improve PropertyFileSnitch logging (CASSANDRA-8183) http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6802aa4/src/java/org/apache/cassandra/dht/RangeStreamer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/dht/RangeStreamer.java b/src/java/org/apache/cassandra/dht/RangeStreamer.java index 4e925d3..8846e1d 100644 --- a/src/java/org/apache/cassandra/dht/RangeStreamer.java +++ b/src/java/org/apache/cassandra/dht/RangeStreamer.java @@ -123,7 +123,7 @@ public class RangeStreamer logger.debug(String.format("%s: range %s exists on %s", description, entry.getKey(), entry.getValue())); } - for (Map.Entry>> entry : getRangeFetchMap(rangesForKeyspace, sourceFilters).asMap().entrySet()) + for (Map.Entry>> entry : getRangeFetchMap(rangesForKeyspace, sourceFilters, keyspaceName).asMap().entrySet()) { if (logger.isDebugEnabled()) { @@ -170,7 +170,7 @@ public class RangeStreamer * @return */ private static Multimap> getRangeFetchMap(Multimap, InetAddress> rangesWithSources, - Collection sourceFilters) + Collection sourceFilters, String keyspace) { Multimap> rangeFetchMapMap = HashMultimap.create(); for (Range range : rangesWithSources.keySet()) @@ -199,15 +199,15 @@ public class RangeStreamer } if (!foundSource) - throw new IllegalStateException("unable to find sufficient sources for streaming range " + range); + throw new IllegalStateException("unable to find sufficient sources for streaming range " + range + " in keyspace " + keyspace); } return rangeFetchMapMap; } - public static Multimap> getWorkMap(Multimap, InetAddress> rangesWithSourceTarget) + public static Multimap> getWorkMap(Multimap, InetAddress> rangesWithSourceTarget, String keyspace) { - return getRangeFetchMap(rangesWithSourceTarget, Collections.singleton(new FailureDetectorSourceFilter(FailureDetector.instance))); + return getRangeFetchMap(rangesWithSourceTarget, Collections.singleton(new FailureDetectorSourceFilter(FailureDetector.instance)), keyspace); } // For testing purposes http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6802aa4/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java index 066544a..4bc1eee 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -3200,7 +3200,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE } // stream requests - Multimap> workMap = RangeStreamer.getWorkMap(rangesToFetchWithPreferredEndpoints); + Multimap> workMap = RangeStreamer.getWorkMap(rangesToFetchWithPreferredEndpoints, keyspace); for (InetAddress address : workMap.keySet()) { InetAddress preferred = SystemKeyspace.getPreferredIP(address);