Author: jbellis
Date: Fri Dec 11 16:59:57 2009
New Revision: 889698
URL: http://svn.apache.org/viewvc?rev=889698&view=rev
Log:
finish removing LogUtil. patch by jbellis
Removed:
incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/LogUtil.java
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/BinaryVerbHandler.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ReadRepairVerbHandler.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/FailureDetector.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/io/Streaming.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/RackAwareStrategy.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/AsyncResult.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/FileStreamTask.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessageDeserializationTask.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/SelectionKeyHandler.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/TcpConnection.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/TcpConnectionHandler.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/UdpConnection.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraServer.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/LoadDisseminator.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ReadRepairManager.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ReadResponseResolver.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StreamManager.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/Cachetable.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/GuidGenerator.java
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/BinaryVerbHandler.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/BinaryVerbHandler.java?rev=889698&r1=889697&r2=889698&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/BinaryVerbHandler.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/BinaryVerbHandler.java
Fri Dec 11 16:59:57 2009
@@ -20,7 +20,6 @@
import org.apache.cassandra.net.IVerbHandler;
import org.apache.cassandra.net.Message;
-import org.apache.cassandra.utils.LogUtil;
import org.apache.cassandra.io.DataInputBuffer;
import org.apache.log4j.Logger;
@@ -35,17 +34,16 @@
DataInputBuffer buffer = new DataInputBuffer();
buffer.reset(bytes, bytes.length);
- try
- {
+ try
+ {
RowMutationMessage rmMsg =
RowMutationMessage.serializer().deserialize(buffer);
- RowMutation rm = rmMsg.getRowMutation();
+ RowMutation rm = rmMsg.getRowMutation();
rm.applyBinary();
- }
- catch ( Exception e )
- {
- if (logger_.isDebugEnabled())
- logger_.debug(LogUtil.throwableToString(e));
- }
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
}
}
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ReadRepairVerbHandler.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ReadRepairVerbHandler.java?rev=889698&r1=889697&r2=889698&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ReadRepairVerbHandler.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ReadRepairVerbHandler.java
Fri Dec 11 16:59:57 2009
@@ -23,12 +23,8 @@
import org.apache.cassandra.io.DataInputBuffer;
import org.apache.cassandra.net.IVerbHandler;
import org.apache.cassandra.net.Message;
-import org.apache.cassandra.utils.LogUtil;
+
import org.apache.log4j.Logger;
-import org.apache.cassandra.service.*;
-import org.apache.cassandra.utils.*;
-import org.apache.cassandra.concurrent.*;
-import org.apache.cassandra.net.*;
public class ReadRepairVerbHandler implements IVerbHandler
{
@@ -46,10 +42,9 @@
RowMutation rm = rmMsg.getRowMutation();
rm.apply();
}
- catch ( IOException e )
+ catch (IOException e)
{
- if (logger_.isDebugEnabled())
- logger_.debug(LogUtil.throwableToString(e));
- }
+ throw new IOError(e);
+ }
}
}
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/FailureDetector.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/FailureDetector.java?rev=889698&r1=889697&r2=889698&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/FailureDetector.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/FailureDetector.java
Fri Dec 11 16:59:57 2009
@@ -19,8 +19,9 @@
package org.apache.cassandra.gms;
import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.IOError;
import java.lang.management.ManagementFactory;
-import java.net.UnknownHostException;
import java.util.*;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
@@ -29,10 +30,8 @@
import org.apache.commons.lang.StringUtils;
-import org.apache.cassandra.config.DatabaseDescriptor;
import java.net.InetAddress;
import org.apache.cassandra.utils.FBUtilities;
-import org.apache.cassandra.utils.LogUtil;
import org.apache.cassandra.utils.BoundedStatsDeque;
import org.apache.log4j.Logger;
@@ -88,7 +87,7 @@
}
catch (Exception e)
{
- logger_.error(LogUtil.throwableToString(e));
+ throw new RuntimeException(e);
}
}
@@ -103,9 +102,9 @@
fos.write(toString().getBytes());
fos.close();
}
- catch(Throwable th)
+ catch (IOException e)
{
- logger_.warn(LogUtil.throwableToString(th));
+ throw new IOError(e);
}
}
@@ -128,9 +127,9 @@
fos.write(hWnd.toString().getBytes());
fos.close();
}
- catch(Throwable th)
+ catch (IOException e)
{
- logger_.warn(LogUtil.throwableToString(th));
+ throw new IOError(e);
}
}
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/io/Streaming.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/io/Streaming.java?rev=889698&r1=889697&r2=889698&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/io/Streaming.java
(original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/io/Streaming.java
Fri Dec 11 16:59:57 2009
@@ -43,7 +43,6 @@
import org.apache.cassandra.service.StreamManager;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.FBUtilities;
-import org.apache.cassandra.utils.LogUtil;
public class Streaming
{
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/RackAwareStrategy.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/RackAwareStrategy.java?rev=889698&r1=889697&r2=889698&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/RackAwareStrategy.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/RackAwareStrategy.java
Fri Dec 11 16:59:57 2009
@@ -22,13 +22,11 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import java.util.Map;
import org.apache.cassandra.dht.Token;
import org.apache.cassandra.dht.IPartitioner;
import java.net.InetAddress;
import org.apache.cassandra.service.StorageService;
-import org.apache.cassandra.utils.LogUtil;
/*
* This class returns the nodes responsible for a given
@@ -103,8 +101,7 @@
}
catch (UnknownHostException e)
{
- if (logger_.isDebugEnabled())
- logger_.debug(LogUtil.throwableToString(e));
+ throw new RuntimeException(e);
}
}
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/AsyncResult.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/net/AsyncResult.java?rev=889698&r1=889697&r2=889698&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/AsyncResult.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/AsyncResult.java
Fri Dec 11 16:59:57 2009
@@ -18,7 +18,6 @@
package org.apache.cassandra.net;
-import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -26,7 +25,6 @@
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
-import org.apache.cassandra.utils.LogUtil;
import org.apache.log4j.Logger;
class AsyncResult implements IAsyncResult
@@ -49,19 +47,19 @@
lock_.lock();
try
{
- if ( !done_.get() )
+ if (!done_.get())
{
- condition_.await();
+ condition_.await();
}
}
- catch ( InterruptedException ex )
+ catch (InterruptedException ex)
{
- logger_.warn( LogUtil.throwableToString(ex) );
+ throw new AssertionError(ex);
}
finally
{
- lock_.unlock();
- }
+ lock_.unlock();
+ }
return result_;
}
@@ -87,9 +85,9 @@
bVal = false;
}
}
- catch ( InterruptedException ex )
+ catch (InterruptedException ex)
{
- logger_.warn( LogUtil.throwableToString(ex) );
+ throw new AssertionError(ex);
}
if ( !bVal && !done_.get() )
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/FileStreamTask.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/net/FileStreamTask.java?rev=889698&r1=889697&r2=889698&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/FileStreamTask.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/FileStreamTask.java
Fri Dec 11 16:59:57 2009
@@ -19,11 +19,8 @@
package org.apache.cassandra.net;
import java.io.*;
-import java.net.SocketException;
import java.net.InetAddress;
-import org.apache.cassandra.net.sink.SinkManager;
-import org.apache.cassandra.utils.LogUtil;
import org.apache.log4j.Logger;
class FileStreamTask implements Runnable
@@ -55,27 +52,15 @@
connection.stream(file, startPosition_, total_);
if (logger_.isDebugEnabled())
logger_.debug("Done streaming " + file);
- }
- catch ( SocketException se )
- {
- logger_.info(LogUtil.throwableToString(se));
}
- catch ( IOException e )
+ catch (Exception e)
{
- logConnectAndIOException(e, connection);
+ if (connection != null)
+ {
+ connection.errorClose();
+ }
+ throw new RuntimeException(e);
}
- catch (Throwable th)
- {
- logger_.warn(LogUtil.throwableToString(th));
- }
- }
-
- private void logConnectAndIOException(IOException ex, TcpConnection
connection)
- {
- if ( connection != null )
- {
- connection.errorClose();
- }
- logger_.info(LogUtil.throwableToString(ex));
}
+
}
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessageDeserializationTask.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessageDeserializationTask.java?rev=889698&r1=889697&r2=889698&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessageDeserializationTask.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessageDeserializationTask.java
Fri Dec 11 16:59:57 2009
@@ -20,13 +20,10 @@
import java.io.IOException;
-import org.apache.cassandra.concurrent.DebuggableThreadPoolExecutor;
-import org.apache.cassandra.concurrent.StageManager;
import org.apache.cassandra.net.io.FastSerializer;
import org.apache.cassandra.net.io.ISerializer;
import org.apache.cassandra.net.sink.SinkManager;
-import org.apache.cassandra.service.StorageService;
-import org.apache.cassandra.utils.LogUtil;
+
import org.apache.log4j.Logger;
class MessageDeserializationTask implements Runnable
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java?rev=889698&r1=889697&r2=889698&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java
Fri Dec 11 16:59:57 2009
@@ -177,10 +177,9 @@
MessageDigest messageDigest = MessageDigest.getInstance(type);
result = messageDigest.digest(data);
}
- catch(Exception e)
+ catch (Exception e)
{
- if (logger_.isDebugEnabled())
- logger_.debug(LogUtil.throwableToString(e));
+ throw new RuntimeException(e);
}
return result;
}
@@ -218,9 +217,9 @@
endPoints_.add(localEp);
udpConnections_.put(localEp, connection);
}
- catch ( IOException e )
+ catch (IOException e)
{
- logger_.warn(LogUtil.throwableToString(e));
+ throw new RuntimeException(e);
}
}
@@ -462,10 +461,10 @@
connection.init();
connection.write(message, to);
}
- catch ( IOException e )
- {
- logger_.warn(LogUtil.throwableToString(e));
- }
+ catch (IOException e)
+ {
+ throw new RuntimeException(e);
+ }
finally
{
if ( connection != null )
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/SelectionKeyHandler.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/net/SelectionKeyHandler.java?rev=889698&r1=889697&r2=889698&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/SelectionKeyHandler.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/SelectionKeyHandler.java
Fri Dec 11 16:59:57 2009
@@ -19,6 +19,7 @@
package org.apache.cassandra.net;
import java.nio.channels.*;
+import java.io.IOException;
public class SelectionKeyHandler
{
@@ -47,7 +48,7 @@
*
* @param key The key which is readable.
*/
- public void read(SelectionKey key)
+ public void read(SelectionKey key) throws IOException
{
throw new UnsupportedOperationException("read() cannot be called on "
+ getClass().getName() + "!");
}
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/TcpConnection.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/net/TcpConnection.java?rev=889698&r1=889697&r2=889698&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/TcpConnection.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/TcpConnection.java
Fri Dec 11 16:59:57 2009
@@ -31,7 +31,6 @@
import java.util.concurrent.locks.ReentrantLock;
import java.net.InetAddress;
import java.net.InetSocketAddress;
-import java.net.SocketAddress;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.net.io.FastSerializer;
@@ -39,7 +38,7 @@
import org.apache.cassandra.net.io.ProtocolState;
import org.apache.cassandra.net.io.StartState;
import org.apache.cassandra.net.io.TcpReader;
-import org.apache.cassandra.utils.LogUtil;
+
import org.apache.log4j.Logger;
public class TcpConnection extends SelectionKeyHandler implements Comparable
@@ -398,9 +397,9 @@
}
}
- catch(IOException ex)
+ catch (IOException ex)
{
- logger_.error(LogUtil.throwableToString(ex));
+ logger_.error(ex);
// This is to fix the wierd Linux bug with NIO.
errorClose();
}
@@ -481,8 +480,7 @@
private void handleException(Throwable th)
{
- logger_.warn("Problem reading from socket connected to : " +
socketChannel_);
- logger_.warn(LogUtil.throwableToString(th));
+ logger_.warn("Problem reading from socket connected to : " +
socketChannel_, th);
// This is to fix the weird Linux bug with NIO.
errorClose();
}
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/TcpConnectionHandler.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/net/TcpConnectionHandler.java?rev=889698&r1=889697&r2=889698&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/TcpConnectionHandler.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/TcpConnectionHandler.java
Fri Dec 11 16:59:57 2009
@@ -22,7 +22,6 @@
import java.io.IOException;
import java.net.*;
-import org.apache.cassandra.utils.LogUtil;
import org.apache.log4j.Logger;
public class TcpConnectionHandler extends SelectionKeyHandler
@@ -48,9 +47,9 @@
TcpConnection.acceptConnection(client, localEp_, true);
}
}
- catch(IOException e)
+ catch (IOException e)
{
- logger_.warn(LogUtil.throwableToString(e));
+ throw new RuntimeException(e);
}
}
}
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/UdpConnection.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/net/UdpConnection.java?rev=889698&r1=889697&r2=889698&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/UdpConnection.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/UdpConnection.java
Fri Dec 11 16:59:57 2009
@@ -29,7 +29,6 @@
import java.io.DataOutputStream;
import java.io.IOException;
-import org.apache.cassandra.utils.LogUtil;
import org.apache.log4j.Logger;
import org.apache.cassandra.utils.*;
@@ -93,9 +92,9 @@
if ( socketChannel_ != null )
socketChannel_.close();
}
- catch ( IOException ex )
+ catch (IOException ex)
{
- logger_.error( LogUtil.throwableToString(ex) );
+ logger_.error("error closing channel", ex);
}
}
@@ -121,7 +120,7 @@
return body;
}
- public void read(SelectionKey key)
+ public void read(SelectionKey key) throws IOException
{
turnOffInterestOps(key, SelectionKey.OP_READ);
ByteBuffer buffer = ByteBuffer.allocate(BUFFER_SIZE);
@@ -147,10 +146,6 @@
}
}
}
- catch ( IOException ioe )
- {
- logger_.warn(LogUtil.throwableToString(ioe));
- }
finally
{
turnOnInterestOps(key_, SelectionKey.OP_READ );
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java?rev=889698&r1=889697&r2=889698&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java
Fri Dec 11 16:59:57 2009
@@ -43,7 +43,6 @@
import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.utils.Cachetable;
import org.apache.cassandra.utils.FBUtilities;
-import org.apache.cassandra.utils.LogUtil;
import org.apache.cassandra.utils.MerkleTree;
import org.apache.log4j.Logger;
@@ -726,10 +725,10 @@
Table table = Table.open(request.table);
CompactionManager.instance().submitReadonly(table.getColumnFamilyStore(request.cf),
message.getFrom());
}
- catch (Exception e)
+ catch (IOException e)
{
- logger.warn(LogUtil.throwableToString(e));
- }
+ throw new IOError(e);
+ }
}
}
@@ -792,10 +791,10 @@
Validator rvalidator = this.deserialize(buffer);
AntiEntropyService.instance().register(rvalidator.cf,
message.getFrom(), rvalidator.tree);
}
- catch (Exception e)
+ catch (IOException e)
{
- logger.warn(LogUtil.throwableToString(e));
- }
+ throw new IOError(e);
+ }
}
}
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraServer.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraServer.java?rev=889698&r1=889697&r2=889698&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraServer.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraServer.java
Fri Dec 11 16:59:57 2009
@@ -21,9 +21,11 @@
import java.io.BufferedInputStream;
import java.io.FileInputStream;
import java.io.IOException;
+import java.io.File;
import java.util.*;
import org.apache.log4j.Logger;
+import org.apache.log4j.PropertyConfigurator;
import org.apache.commons.lang.ArrayUtils;
@@ -33,7 +35,6 @@
import org.apache.cassandra.db.marshal.MarshalException;
import org.apache.cassandra.db.filter.QueryPath;
import org.apache.cassandra.service.StorageService;
-import org.apache.cassandra.utils.LogUtil;
import org.apache.cassandra.utils.Pair;
import org.apache.thrift.TException;
@@ -64,8 +65,11 @@
*/
public void start() throws IOException
{
- LogUtil.init();
- // Start the storage service
+ // log4j
+ String file = System.getProperty("storage-config") + File.separator +
"log4j.properties";
+ PropertyConfigurator.configure(file);
+
+ // Start the storage service
storageService.initServer();
}
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/LoadDisseminator.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/LoadDisseminator.java?rev=889698&r1=889697&r2=889698&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/LoadDisseminator.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/LoadDisseminator.java
Fri Dec 11 16:59:57 2009
@@ -21,8 +21,7 @@
import org.apache.cassandra.gms.ApplicationState;
import org.apache.cassandra.gms.Gossiper;
-import org.apache.cassandra.utils.FileUtils;
-import org.apache.cassandra.utils.LogUtil;
+
import org.apache.log4j.Logger;
class LoadDisseminator extends TimerTask
@@ -32,16 +31,9 @@
public void run()
{
- try
- {
- String diskUtilization =
String.valueOf(StorageService.instance().getLoad());
- if (logger_.isDebugEnabled())
- logger_.debug("Disseminating load info ...");
-
Gossiper.instance().addApplicationState(LoadDisseminator.loadInfo_, new
ApplicationState(diskUtilization));
- }
- catch ( Throwable ex )
- {
- logger_.warn( LogUtil.throwableToString(ex) );
- }
+ String diskUtilization =
String.valueOf(StorageService.instance().getLoad());
+ if (logger_.isDebugEnabled())
+ logger_.debug("Disseminating load info ...");
+ Gossiper.instance().addApplicationState(LoadDisseminator.loadInfo_,
new ApplicationState(diskUtilization));
}
}
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ReadRepairManager.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ReadRepairManager.java?rev=889698&r1=889697&r2=889698&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ReadRepairManager.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ReadRepairManager.java
Fri Dec 11 16:59:57 2009
@@ -19,6 +19,7 @@
package org.apache.cassandra.service;
import java.io.IOException;
+import java.io.IOError;
import java.util.concurrent.locks.*;
import org.apache.cassandra.db.RowMutationMessage;
@@ -31,7 +32,7 @@
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.ICacheExpungeHook;
import org.apache.cassandra.utils.ICachetable;
-import org.apache.cassandra.utils.LogUtil;
+
import org.apache.log4j.Logger;
@@ -117,9 +118,9 @@
String key = target.getHostAddress() + ":" +
message.getMessageId();
readRepairTable_.put(key, message);
}
- catch ( IOException ex )
+ catch (IOException ex)
{
- logger_.error(LogUtil.throwableToString(ex));
+ throw new IOError(ex);
}
- }
+ }
}
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ReadResponseResolver.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ReadResponseResolver.java?rev=889698&r1=889697&r2=889698&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ReadResponseResolver.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ReadResponseResolver.java
Fri Dec 11 16:59:57 2009
@@ -31,7 +31,6 @@
import org.apache.cassandra.io.DataInputBuffer;
import java.net.InetAddress;
import org.apache.cassandra.net.Message;
-import org.apache.cassandra.utils.LogUtil;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.config.DatabaseDescriptor;
@@ -182,7 +181,7 @@
}
catch (IOException ex)
{
- logger_.info(LogUtil.throwableToString(ex));
+ throw new RuntimeException(ex);
}
}
return isDataPresent;
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java?rev=889698&r1=889697&r2=889698&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
Fri Dec 11 16:59:57 2009
@@ -38,7 +38,6 @@
import org.apache.cassandra.net.*;
import org.apache.cassandra.service.AntiEntropyService.TreeRequestVerbHandler;
import org.apache.cassandra.utils.FileUtils;
-import org.apache.cassandra.utils.LogUtil;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.io.SSTableReader;
import org.apache.cassandra.io.Streaming;
@@ -48,7 +47,6 @@
import org.apache.log4j.Level;
import org.apache.commons.lang.StringUtils;
-import com.google.common.base.Function;
import com.google.common.collect.Multimap;
import com.google.common.collect.HashMultimap;
@@ -116,15 +114,7 @@
{
if (instance_ == null)
{
- try
- {
- instance_ = new StorageService();
- }
- catch (Throwable th)
- {
- logger_.error(LogUtil.throwableToString(th));
- System.exit(1);
- }
+ instance_ = new StorageService();
}
}
}
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StreamManager.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StreamManager.java?rev=889698&r1=889697&r2=889698&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StreamManager.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StreamManager.java
Fri Dec 11 16:59:57 2009
@@ -30,7 +30,6 @@
import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.net.io.StreamContextManager;
import org.apache.cassandra.utils.FileUtils;
-import org.apache.cassandra.utils.LogUtil;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.log4j.Logger;
@@ -120,9 +119,9 @@
{
wait();
}
- catch(InterruptedException ex)
+ catch (InterruptedException ex)
{
- logger_.warn(LogUtil.throwableToString(ex));
+ throw new AssertionError(ex);
}
}
}
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/Cachetable.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/Cachetable.java?rev=889698&r1=889697&r2=889698&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/Cachetable.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/Cachetable.java
Fri Dec 11 16:59:57 2009
@@ -91,20 +91,13 @@
{
V value = expungedValues.get(key);
ICacheExpungeHook<K,V> hook = hooks_.remove(key);
- try
+ if (hook != null)
{
- if ( hook != null )
- {
- hook.callMe(key, value);
- }
- else if ( globalHook_ != null )
- {
- globalHook_.callMe(key, value);
- }
+ hook.callMe(key, value);
}
- catch(Throwable e)
+ else if (globalHook_ != null)
{
- logger_.info(LogUtil.throwableToString(e));
+ globalHook_.callMe(key, value);
}
}
expungedValues.clear();
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/GuidGenerator.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/GuidGenerator.java?rev=889698&r1=889697&r2=889698&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/GuidGenerator.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/GuidGenerator.java
Fri Dec 11 16:59:57 2009
@@ -42,8 +42,7 @@
s_id = InetAddress.getLocalHost().toString();
}
catch (UnknownHostException e) {
- if (logger_.isDebugEnabled())
- logger_.debug(LogUtil.throwableToString(e));
+ throw new AssertionError(e);
}
try {
@@ -51,8 +50,7 @@
md5 = new SafeMessageDigest(myMd5);
}
catch (NoSuchAlgorithmException e) {
- if (logger_.isDebugEnabled())
- logger_.debug(LogUtil.throwableToString(e));
+ throw new AssertionError(e);
}
}
