Author: jbellis
Date: Wed Dec 29 19:20:14 2010
New Revision: 1053710
URL: http://svn.apache.org/viewvc?rev=1053710&view=rev
Log:
revert #1780 for CASSANDRA-1917
Modified:
cassandra/branches/cassandra-0.7.0/CHANGES.txt
cassandra/branches/cassandra-0.7.0/conf/cassandra.yaml
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/config/Config.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
Modified: cassandra/branches/cassandra-0.7.0/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/CHANGES.txt?rev=1053710&r1=1053709&r2=1053710&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7.0/CHANGES.txt Wed Dec 29 19:20:14 2010
@@ -11,6 +11,7 @@ dev
replication Strategies
* increased amount of index locks for faster commitlog replay
* collect secondary index tombstones immediately (CASSANDRA-1914)
+ * revert commitlog changes from #1780 (CASSANDRA-1917)
0.7.0-rc3
Modified: cassandra/branches/cassandra-0.7.0/conf/cassandra.yaml
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/conf/cassandra.yaml?rev=1053710&r1=1053709&r2=1053710&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/conf/cassandra.yaml (original)
+++ cassandra/branches/cassandra-0.7.0/conf/cassandra.yaml Wed Dec 29 19:20:14
2010
@@ -61,32 +61,17 @@ saved_caches_directory: /var/lib/cassand
# Size to allow commitlog to grow to before creating a new segment
commitlog_rotation_threshold_in_mb: 128
-# commitlog_sync supports the following modes:
-#
-# batch:
-# In batch mode, Cassandra won't ack writes until the commit log
-# has been fsynced to disk. But fsyncing each write at once is
-# performance-prohibitive, so instead Cassandra will wait up to
-# commitlog_sync_batch_window_in_ms milliseconds for other writes, before
-# syncing that "batch" at once. This causes a performance penalty
-# of about 15% when the commitlog is on a separate device, and much more
-# when it shares the same device as the data files.
-#
-# periodic:
-# Writes may be acked immediately (without waiting for the commitlog
-# append) and the CommitLog is simply synced every
-# commitlog_sync_period_in_ms milliseconds.
-#
-# periodic_without_flush:
-# Like periodic, but the commitlog write buffer is only flushed
-# before the sync, so any interruption to the process can be
-# expected to lose some writes. This is the old 0.6 periodic
-# behavior and will be removed in future versions if testing
-# continues to show no performance benefit over normal periodic.
+# commitlog_sync may be either "periodic" or "batch."
+# When in batch mode, Cassandra won't ack writes until the commit log
+# has been fsynced to disk. It will wait up to
+# CommitLogSyncBatchWindowInMS milliseconds for other writes, before
+# performing the sync.
commitlog_sync: periodic
+
+# the other option is "timed," where writes may be acked immediately
+# and the CommitLog is simply synced every commitlog_sync_period_in_ms
+# milliseconds.
commitlog_sync_period_in_ms: 10000
-# commitlog_sync: batch
-# commitlog_sync_batch_window_in_ms: 10
# Addresses of hosts that are deemed contact points.
# Cassandra nodes use this list of hosts to find each other and learn
Modified:
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/config/Config.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/config/Config.java?rev=1053710&r1=1053709&r2=1053710&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/config/Config.java
(original)
+++
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/config/Config.java
Wed Dec 29 19:20:14 2010
@@ -105,8 +105,7 @@ public class Config
public static enum CommitLogSync {
periodic,
- batch,
- periodic_without_flush
+ batch
}
public static enum DiskAccessMode {
Modified:
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/commitlog/CommitLog.java?rev=1053710&r1=1053709&r2=1053710&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
(original)
+++
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
Wed Dec 29 19:20:14 2010
@@ -491,7 +491,6 @@ public class CommitLog
// TODO this should be a Runnable since it doesn't actually return
anything, but it's difficult to do that
// without breaking the fragile CheaterFutureTask in BatchCLES.
- final static boolean flushEachWrite =
DatabaseDescriptor.getCommitLogSync() == Config.CommitLogSync.periodic;
class LogRecordAdder implements Callable, Runnable
{
final RowMutation rowMutation;
@@ -514,10 +513,6 @@ public class CommitLog
sync();
segments.add(new CommitLogSegment());
}
- else if (flushEachWrite)
- {
- currentSegment().flush();
- }
}
catch (IOException e)
{
Modified:
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java?rev=1053710&r1=1053709&r2=1053710&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
(original)
+++
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
Wed Dec 29 19:20:14 2010
@@ -140,11 +140,6 @@ public class CommitLogSegment
logWriter.sync();
}
- public void flush() throws IOException
- {
- logWriter.flush();
- }
-
public CommitLogContext getContext()
{
return new CommitLogContext(logWriter.getFilePointer());
