git commit: Catch and log all REEs in Auth#setup instead of propagating
Updated Branches:
refs/heads/cassandra-1.2.0 24f95e03c - 35a653cfd
Catch and log all REEs 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/35a653cf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/35a653cf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/35a653cf
Branch: refs/heads/cassandra-1.2.0
Commit: 35a653cfded6d91937432a73630ddf4fd6be2b4d
Parents: 24f95e0
Author: Aleksey Yeschenko alek...@apache.org
Authored: Mon Dec 10 21:59:14 2012 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Mon Dec 10 21:59:14 2012 +0300
--
src/java/org/apache/cassandra/auth/Auth.java | 14 +++---
.../org/apache/cassandra/cql3/QueryProcessor.java | 12 ++--
.../cql3/statements/AlterUserStatement.java|4 ++--
.../cql3/statements/CreateUserStatement.java |4 ++--
.../cql3/statements/DropUserStatement.java |4 ++--
5 files changed, 15 insertions(+), 23 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/35a653cf/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 6791455..45b4435 100644
--- a/src/java/org/apache/cassandra/auth/Auth.java
+++ b/src/java/org/apache/cassandra/auth/Auth.java
@@ -26,7 +26,7 @@ import org.slf4j.LoggerFactory;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.cql3.UntypedResultSet;
import org.apache.cassandra.cql3.QueryProcessor;
-import org.apache.cassandra.exceptions.UnavailableException;
+import org.apache.cassandra.exceptions.RequestExecutionException;
import org.apache.cassandra.service.MigrationManager;
import org.apache.cassandra.service.StorageService;
@@ -52,7 +52,7 @@ public class Auth
{
return !QueryProcessor.process(query).isEmpty();
}
-catch (UnavailableException e)
+catch (RequestExecutionException e)
{
throw new RuntimeException(e);
}
@@ -72,7 +72,7 @@ public class Auth
UntypedResultSet result = QueryProcessor.process(query);
return !result.isEmpty() result.one().getBoolean(super);
}
-catch (UnavailableException e)
+catch (RequestExecutionException e)
{
throw new RuntimeException(e);
}
@@ -84,7 +84,7 @@ public class Auth
* @param username Username to insert.
* @param isSuper User's new status.
*/
-public static void insertUser(String username, boolean isSuper) throws
UnavailableException
+public static void insertUser(String username, boolean isSuper) throws
RequestExecutionException
{
QueryProcessor.process(String.format(INSERT INTO %s.%s (name, super)
VALUES ('%s', %s),
AUTH_KS,
@@ -98,7 +98,7 @@ public class Auth
*
* @param username Username to delete.
*/
-public static void deleteUser(String username) throws UnavailableException
+public static void deleteUser(String username) throws
RequestExecutionException
{
QueryProcessor.process(String.format(DELETE FROM %s.%s WHERE name =
'%s',
AUTH_KS,
@@ -128,9 +128,9 @@ public class Auth
if (QueryProcessor.process(String.format(SELECT * FROM
%s.%s, AUTH_KS, USERS_CF)).isEmpty())
insertUser(DEFAULT_SUPERUSER_NAME, true);
}
-catch (UnavailableException e)
+catch (RequestExecutionException e)
{
-logger.warn(Skipping default superuser setup: some nodes
are unavailable);
+logger.warn(Skipping default superuser setup: some nodes
are not ready);
}
}
};
http://git-wip-us.apache.org/repos/asf/cassandra/blob/35a653cf/src/java/org/apache/cassandra/cql3/QueryProcessor.java
--
diff --git a/src/java/org/apache/cassandra/cql3/QueryProcessor.java
b/src/java/org/apache/cassandra/cql3/QueryProcessor.java
index e172e59..fec45e6 100644
--- a/src/java/org/apache/cassandra/cql3/QueryProcessor.java
+++ b/src/java/org/apache/cassandra/cql3/QueryProcessor.java
@@ -140,7 +140,7 @@ public class QueryProcessor
return processStatement(getStatement(queryString,
queryState.getClientState()).statement, cl, queryState,
Collections.ByteBufferemptyList());
}
-public static UntypedResultSet process(String query) throws
UnavailableException
+public static UntypedResultSet
[2/2] git commit: Catch and log all REEs in Auth#setup instead of propagating
Catch and log all REEs 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/35a653cf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/35a653cf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/35a653cf
Branch: refs/heads/cassandra-1.2
Commit: 35a653cfded6d91937432a73630ddf4fd6be2b4d
Parents: 24f95e0
Author: Aleksey Yeschenko alek...@apache.org
Authored: Mon Dec 10 21:59:14 2012 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Mon Dec 10 21:59:14 2012 +0300
--
src/java/org/apache/cassandra/auth/Auth.java | 14 +++---
.../org/apache/cassandra/cql3/QueryProcessor.java | 12 ++--
.../cql3/statements/AlterUserStatement.java|4 ++--
.../cql3/statements/CreateUserStatement.java |4 ++--
.../cql3/statements/DropUserStatement.java |4 ++--
5 files changed, 15 insertions(+), 23 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/35a653cf/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 6791455..45b4435 100644
--- a/src/java/org/apache/cassandra/auth/Auth.java
+++ b/src/java/org/apache/cassandra/auth/Auth.java
@@ -26,7 +26,7 @@ import org.slf4j.LoggerFactory;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.cql3.UntypedResultSet;
import org.apache.cassandra.cql3.QueryProcessor;
-import org.apache.cassandra.exceptions.UnavailableException;
+import org.apache.cassandra.exceptions.RequestExecutionException;
import org.apache.cassandra.service.MigrationManager;
import org.apache.cassandra.service.StorageService;
@@ -52,7 +52,7 @@ public class Auth
{
return !QueryProcessor.process(query).isEmpty();
}
-catch (UnavailableException e)
+catch (RequestExecutionException e)
{
throw new RuntimeException(e);
}
@@ -72,7 +72,7 @@ public class Auth
UntypedResultSet result = QueryProcessor.process(query);
return !result.isEmpty() result.one().getBoolean(super);
}
-catch (UnavailableException e)
+catch (RequestExecutionException e)
{
throw new RuntimeException(e);
}
@@ -84,7 +84,7 @@ public class Auth
* @param username Username to insert.
* @param isSuper User's new status.
*/
-public static void insertUser(String username, boolean isSuper) throws
UnavailableException
+public static void insertUser(String username, boolean isSuper) throws
RequestExecutionException
{
QueryProcessor.process(String.format(INSERT INTO %s.%s (name, super)
VALUES ('%s', %s),
AUTH_KS,
@@ -98,7 +98,7 @@ public class Auth
*
* @param username Username to delete.
*/
-public static void deleteUser(String username) throws UnavailableException
+public static void deleteUser(String username) throws
RequestExecutionException
{
QueryProcessor.process(String.format(DELETE FROM %s.%s WHERE name =
'%s',
AUTH_KS,
@@ -128,9 +128,9 @@ public class Auth
if (QueryProcessor.process(String.format(SELECT * FROM
%s.%s, AUTH_KS, USERS_CF)).isEmpty())
insertUser(DEFAULT_SUPERUSER_NAME, true);
}
-catch (UnavailableException e)
+catch (RequestExecutionException e)
{
-logger.warn(Skipping default superuser setup: some nodes
are unavailable);
+logger.warn(Skipping default superuser setup: some nodes
are not ready);
}
}
};
http://git-wip-us.apache.org/repos/asf/cassandra/blob/35a653cf/src/java/org/apache/cassandra/cql3/QueryProcessor.java
--
diff --git a/src/java/org/apache/cassandra/cql3/QueryProcessor.java
b/src/java/org/apache/cassandra/cql3/QueryProcessor.java
index e172e59..fec45e6 100644
--- a/src/java/org/apache/cassandra/cql3/QueryProcessor.java
+++ b/src/java/org/apache/cassandra/cql3/QueryProcessor.java
@@ -140,7 +140,7 @@ public class QueryProcessor
return processStatement(getStatement(queryString,
queryState.getClientState()).statement, cl, queryState,
Collections.ByteBufferemptyList());
}
-public static UntypedResultSet process(String query) throws
UnavailableException
+public static UntypedResultSet process(String query) throws
RequestExecutionException
{
try
[3/3] git commit: Catch and log all REEs in Auth#setup instead of propagating
Catch and log all REEs 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/35a653cf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/35a653cf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/35a653cf
Branch: refs/heads/trunk
Commit: 35a653cfded6d91937432a73630ddf4fd6be2b4d
Parents: 24f95e0
Author: Aleksey Yeschenko alek...@apache.org
Authored: Mon Dec 10 21:59:14 2012 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Mon Dec 10 21:59:14 2012 +0300
--
src/java/org/apache/cassandra/auth/Auth.java | 14 +++---
.../org/apache/cassandra/cql3/QueryProcessor.java | 12 ++--
.../cql3/statements/AlterUserStatement.java|4 ++--
.../cql3/statements/CreateUserStatement.java |4 ++--
.../cql3/statements/DropUserStatement.java |4 ++--
5 files changed, 15 insertions(+), 23 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/35a653cf/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 6791455..45b4435 100644
--- a/src/java/org/apache/cassandra/auth/Auth.java
+++ b/src/java/org/apache/cassandra/auth/Auth.java
@@ -26,7 +26,7 @@ import org.slf4j.LoggerFactory;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.cql3.UntypedResultSet;
import org.apache.cassandra.cql3.QueryProcessor;
-import org.apache.cassandra.exceptions.UnavailableException;
+import org.apache.cassandra.exceptions.RequestExecutionException;
import org.apache.cassandra.service.MigrationManager;
import org.apache.cassandra.service.StorageService;
@@ -52,7 +52,7 @@ public class Auth
{
return !QueryProcessor.process(query).isEmpty();
}
-catch (UnavailableException e)
+catch (RequestExecutionException e)
{
throw new RuntimeException(e);
}
@@ -72,7 +72,7 @@ public class Auth
UntypedResultSet result = QueryProcessor.process(query);
return !result.isEmpty() result.one().getBoolean(super);
}
-catch (UnavailableException e)
+catch (RequestExecutionException e)
{
throw new RuntimeException(e);
}
@@ -84,7 +84,7 @@ public class Auth
* @param username Username to insert.
* @param isSuper User's new status.
*/
-public static void insertUser(String username, boolean isSuper) throws
UnavailableException
+public static void insertUser(String username, boolean isSuper) throws
RequestExecutionException
{
QueryProcessor.process(String.format(INSERT INTO %s.%s (name, super)
VALUES ('%s', %s),
AUTH_KS,
@@ -98,7 +98,7 @@ public class Auth
*
* @param username Username to delete.
*/
-public static void deleteUser(String username) throws UnavailableException
+public static void deleteUser(String username) throws
RequestExecutionException
{
QueryProcessor.process(String.format(DELETE FROM %s.%s WHERE name =
'%s',
AUTH_KS,
@@ -128,9 +128,9 @@ public class Auth
if (QueryProcessor.process(String.format(SELECT * FROM
%s.%s, AUTH_KS, USERS_CF)).isEmpty())
insertUser(DEFAULT_SUPERUSER_NAME, true);
}
-catch (UnavailableException e)
+catch (RequestExecutionException e)
{
-logger.warn(Skipping default superuser setup: some nodes
are unavailable);
+logger.warn(Skipping default superuser setup: some nodes
are not ready);
}
}
};
http://git-wip-us.apache.org/repos/asf/cassandra/blob/35a653cf/src/java/org/apache/cassandra/cql3/QueryProcessor.java
--
diff --git a/src/java/org/apache/cassandra/cql3/QueryProcessor.java
b/src/java/org/apache/cassandra/cql3/QueryProcessor.java
index e172e59..fec45e6 100644
--- a/src/java/org/apache/cassandra/cql3/QueryProcessor.java
+++ b/src/java/org/apache/cassandra/cql3/QueryProcessor.java
@@ -140,7 +140,7 @@ public class QueryProcessor
return processStatement(getStatement(queryString,
queryState.getClientState()).statement, cl, queryState,
Collections.ByteBufferemptyList());
}
-public static UntypedResultSet process(String query) throws
UnavailableException
+public static UntypedResultSet process(String query) throws
RequestExecutionException
{
try
{
