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 6C6D5D263 for ; Sat, 8 Dec 2012 17:45:33 +0000 (UTC) Received: (qmail 76719 invoked by uid 500); 8 Dec 2012 17:45:33 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 76680 invoked by uid 500); 8 Dec 2012 17:45:33 -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 76652 invoked by uid 99); 8 Dec 2012 17:45:32 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 08 Dec 2012 17:45:32 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8CCAC81A0FD; Sat, 8 Dec 2012 17:45:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aleksey@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: Catch and log UAE in Auth#setup instead of propagating Message-Id: <20121208174532.8CCAC81A0FD@tyr.zones.apache.org> Date: Sat, 8 Dec 2012 17:45:32 +0000 (UTC) Updated Branches: refs/heads/cassandra-1.2.0 62b9037d1 -> dbbca5e29 Catch and log UAE in Auth#setup instead of propagating Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dbbca5e2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dbbca5e2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dbbca5e2 Branch: refs/heads/cassandra-1.2.0 Commit: dbbca5e296d969550caca3519125dfe9f3f9a657 Parents: 62b9037 Author: Aleksey Yeschenko Authored: Sat Dec 8 20:44:20 2012 +0300 Committer: Aleksey Yeschenko Committed: Sat Dec 8 20:44:20 2012 +0300 ---------------------------------------------------------------------- src/java/org/apache/cassandra/auth/Auth.java | 22 +++++++++++++++----- 1 files changed, 16 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dbbca5e2/src/java/org/apache/cassandra/auth/Auth.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/auth/Auth.java b/src/java/org/apache/cassandra/auth/Auth.java index 123ffe6..6791455 100644 --- a/src/java/org/apache/cassandra/auth/Auth.java +++ b/src/java/org/apache/cassandra/auth/Auth.java @@ -20,6 +20,8 @@ package org.apache.cassandra.auth; import java.util.concurrent.TimeUnit; import org.apache.commons.lang.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.UntypedResultSet; @@ -27,10 +29,11 @@ import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.exceptions.UnavailableException; import org.apache.cassandra.service.MigrationManager; import org.apache.cassandra.service.StorageService; -import org.apache.cassandra.utils.WrappedRunnable; public class Auth { + private static final Logger logger = LoggerFactory.getLogger(Auth.class); + public static final String DEFAULT_SUPERUSER_NAME = "cassandra"; public static final String AUTH_KS = "system_auth"; @@ -115,13 +118,20 @@ public class Auth MigrationManager.instance.register(new MigrationListener()); // schedule seeding a superuser in RING_DELAY milliseconds. - Runnable runnable = new WrappedRunnable() + Runnable runnable = new Runnable() { - public void runMayThrow() throws UnavailableException + public void run() { - // insert a default superuser if AUTH_KS.USERS_CF is empty. - if (QueryProcessor.process(String.format("SELECT * FROM %s.%s", AUTH_KS, USERS_CF)).isEmpty()) - insertUser(DEFAULT_SUPERUSER_NAME, true); + try + { + // insert a default superuser if AUTH_KS.USERS_CF is empty. + if (QueryProcessor.process(String.format("SELECT * FROM %s.%s", AUTH_KS, USERS_CF)).isEmpty()) + insertUser(DEFAULT_SUPERUSER_NAME, true); + } + catch (UnavailableException e) + { + logger.warn("Skipping default superuser setup: some nodes are unavailable"); + } } }; StorageService.tasks.schedule(runnable, StorageService.RING_DELAY, TimeUnit.MILLISECONDS);