Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 86CC9200CF8 for ; Wed, 16 Aug 2017 05:09:47 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 84FA91636F5; Wed, 16 Aug 2017 03:09:47 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id CD1551636F0 for ; Wed, 16 Aug 2017 05:09:46 +0200 (CEST) Received: (qmail 44030 invoked by uid 500); 16 Aug 2017 03:09:45 -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 44007 invoked by uid 99); 16 Aug 2017 03:09:45 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Aug 2017 03:09:45 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 96D45E964C; Wed, 16 Aug 2017 03:09:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mck@apache.org To: commits@cassandra.apache.org Date: Wed, 16 Aug 2017 03:09:45 -0000 Message-Id: <5baf28c0e4d047fcbca403445c75657a@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/3] cassandra git commit: Better bootstrap failure message when blocked by (potential) range movement archived-at: Wed, 16 Aug 2017 03:09:47 -0000 Better bootstrap failure message when blocked by (potential) range movement patch by Mick Semb Wever; reviewed by Jeff Jirsa for CASSANDRA-13744 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2795d72b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2795d72b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2795d72b Branch: refs/heads/trunk Commit: 2795d72b46e493b87f74a4eb9c25520adff58f8c Parents: db57cbd Author: Mick Semb Wever Authored: Fri Aug 4 23:44:26 2017 +1000 Committer: mck Committed: Wed Aug 16 12:41:21 2017 +1000 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2795d72b/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 5403812..4ede932 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.11.1 + * Better bootstrap failure message when blocked by (potential) range movement (CASSANDRA-13744) * "ignore" option is ignored in sstableloader (CASSANDRA-13721) * Deadlock in AbstractCommitLogSegmentManager (CASSANDRA-13652) * Duplicate the buffer before passing it to analyser in SASI operation (CASSANDRA-13512) http://git-wip-us.apache.org/repos/asf/cassandra/blob/2795d72b/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 29619c4..cbf69b4 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -899,7 +899,10 @@ public class StorageService extends NotificationBroadcasterSupport implements IE tokenMetadata.getMovingEndpoints().size() > 0 )) { - throw new UnsupportedOperationException("Other bootstrapping/leaving/moving nodes detected, cannot bootstrap while cassandra.consistent.rangemovement is true"); + String bootstrapTokens = StringUtils.join(tokenMetadata.getBootstrapTokens().valueSet(), ','); + String leavingTokens = StringUtils.join(tokenMetadata.getLeavingEndpoints(), ','); + String movingTokens = StringUtils.join(tokenMetadata.getMovingEndpoints().stream().map(e -> e.right).toArray(), ','); + throw new UnsupportedOperationException(String.format("Other bootstrapping/leaving/moving nodes detected, cannot bootstrap while cassandra.consistent.rangemovement is true. Nodes detected, bootstrapping: %s; leaving: %s; moving: %s;", bootstrapTokens, leavingTokens, movingTokens)); } // get bootstrap tokens --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org For additional commands, e-mail: commits-help@cassandra.apache.org