Author: jbellis
Date: Mon Apr 25 21:38:51 2011
New Revision: 1096613
URL: http://svn.apache.org/viewvc?rev=1096613&view=rev
Log:
revert unreviewed code
Modified:
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cache/AutoSavingCache.java
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/HintedHandOffManager.java
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/Table.java
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/gms/Gossiper.java
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/StorageService.java
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/tools/NodeCmd.java
Modified:
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cache/AutoSavingCache.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cache/AutoSavingCache.java?rev=1096613&r1=1096612&r2=1096613&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cache/AutoSavingCache.java
(original)
+++
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cache/AutoSavingCache.java
Mon Apr 25 21:38:51 2011
@@ -99,10 +99,10 @@ public abstract class AutoSavingCache<K,
submitWrite();
}
};
- saveTask = StorageService.tasks.scheduleWithFixedDelay(runnable,
-
savePeriodInSeconds,
-
savePeriodInSeconds,
-
TimeUnit.SECONDS);
+ saveTask =
StorageService.scheduledTasks.scheduleWithFixedDelay(runnable,
+
savePeriodInSeconds,
+
savePeriodInSeconds,
+
TimeUnit.SECONDS);
}
}
Modified:
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/HintedHandOffManager.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/HintedHandOffManager.java?rev=1096613&r1=1096612&r2=1096613&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/HintedHandOffManager.java
(original)
+++
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/HintedHandOffManager.java
Mon Apr 25 21:38:51 2011
@@ -216,7 +216,7 @@ public class HintedHandOffManager implem
}
}
};
- StorageService.tasks.execute(runnable);
+ StorageService.scheduledTasks.execute(runnable);
}
private static boolean pagingFinished(ColumnFamily hintColumnFamily,
ByteBuffer startColumn)
Modified:
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/Table.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/Table.java?rev=1096613&r1=1096612&r2=1096613&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/Table.java
(original)
+++
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/Table.java
Mon Apr 25 21:38:51 2011
@@ -317,7 +317,7 @@ public class Table
}
}
};
- flushTask = StorageService.tasks.scheduleWithFixedDelay(runnable, 10,
10, TimeUnit.SECONDS);
+ flushTask =
StorageService.scheduledTasks.scheduleWithFixedDelay(runnable, 10, 10,
TimeUnit.SECONDS);
}
public void createReplicationStrategy(KSMetaData ksm) throws
ConfigurationException
Modified:
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/gms/Gossiper.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/gms/Gossiper.java?rev=1096613&r1=1096612&r2=1096613&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/gms/Gossiper.java
(original)
+++
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/gms/Gossiper.java
Mon Apr 25 21:38:51 2011
@@ -33,7 +33,6 @@ import org.cliffc.high_scale_lib.NonBloc
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.cassandra.concurrent.RetryingScheduledThreadPoolExecutor;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.net.Message;
@@ -53,8 +52,6 @@ import org.apache.cassandra.service.Stor
public class Gossiper implements IFailureDetectionEventListener
{
- private static final RetryingScheduledThreadPoolExecutor executor = new
RetryingScheduledThreadPoolExecutor("GossipTasks");
-
static final ApplicationState[] STATES = ApplicationState.values();
private ScheduledFuture<?> scheduledGossipTask;
public final static int intervalInMillis = 1000;
@@ -850,10 +847,10 @@ public class Gossiper implements IFailur
if (logger.isTraceEnabled())
logger.trace("gossip started with generation " +
localState.getHeartBeatState().getGeneration());
- scheduledGossipTask = executor.scheduleWithFixedDelay(new GossipTask(),
-
Gossiper.intervalInMillis,
-
Gossiper.intervalInMillis,
-
TimeUnit.MILLISECONDS);
+ scheduledGossipTask =
StorageService.scheduledTasks.scheduleWithFixedDelay(new GossipTask(),
+
Gossiper.intervalInMillis,
+
Gossiper.intervalInMillis,
+
TimeUnit.MILLISECONDS);
}
/**
Modified:
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/StorageService.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/StorageService.java?rev=1096613&r1=1096612&r2=1096613&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/StorageService.java
(original)
+++
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/StorageService.java
Mon Apr 25 21:38:51 2011
@@ -150,12 +150,12 @@ public class StorageService implements I
/**
- * This pool is used for periodic short (sub-second) tasks.
+ * This pool is used for periodic short time execution tasks.
*/
public static final RetryingScheduledThreadPoolExecutor scheduledTasks =
new RetryingScheduledThreadPoolExecutor("ScheduledTasks");
/**
- * This pool is used by tasks that can have longer execution times, and
usually are non periodic.
+ * This pool is used by tasks that can have long execution, (and usually
are non periodic).
*/
public static final RetryingScheduledThreadPoolExecutor tasks = new
RetryingScheduledThreadPoolExecutor("NonPeriodicTasks");
Modified:
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/tools/NodeCmd.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/tools/NodeCmd.java?rev=1096613&r1=1096612&r2=1096613&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/tools/NodeCmd.java
(original)
+++
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/tools/NodeCmd.java
Mon Apr 25 21:38:51 2011
@@ -332,10 +332,6 @@ public class NodeCmd
outs.println("column family: " + c.getColumnFamily());
outs.println("bytes compacted: " + c.getBytesComplete());
outs.println("bytes total: " + c.getTotalBytes());
- String percentComplete = c.getTotalBytes() == 0
- ? "n/a"
- : new DecimalFormat("#.##").format((double)
c.getBytesComplete() / c.getTotalBytes() * 100) + "%";
- outs.println("compaction progress: " + percentComplete);
outs.println("-----------------");
}
outs.println("pending tasks: " + cm.getPendingTasks());
