You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by be...@apache.org on 2015/08/08 12:37:04 UTC
[01/10] cassandra git commit: Make batch commit log mode easier to
tune
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 1e3f03e5b -> 98a08ebcf
refs/heads/cassandra-2.2 67903d778 -> 6fd41ab15
refs/heads/cassandra-3.0 489a9e8fa -> 7ea2ce124
refs/heads/trunk 05de664ac -> 6292aaa72
Make batch commit log mode easier to tune
This patch effectively ignores the batch commit log
mode sync interval option, and performs a sync as soon
as work becomes available, causing a natural grouping
of writes and minimal latency.
patch by benedict; reviewed by ariel for CASSANDRA-9533
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/98a08ebc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/98a08ebc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/98a08ebc
Branch: refs/heads/cassandra-2.1
Commit: 98a08ebcf11a5124ddf865b5337c781a11377588
Parents: 1e3f03e
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Tue Aug 4 12:47:10 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Sat Aug 8 12:33:22 2015 +0200
----------------------------------------------------------------------
.../apache/cassandra/db/commitlog/AbstractCommitLogService.java | 3 ++-
.../org/apache/cassandra/db/commitlog/BatchCommitLogService.java | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/98a08ebc/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java b/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
index d9ea683..9f3b410 100644
--- a/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
+++ b/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
@@ -43,7 +43,7 @@ public abstract class AbstractCommitLogService
// signal that writers can wait on to be notified of a completed sync
protected final WaitQueue syncComplete = new WaitQueue();
- private final Semaphore haveWork = new Semaphore(1);
+ protected final Semaphore haveWork = new Semaphore(1);
private static final Logger logger = LoggerFactory.getLogger(AbstractCommitLogService.class);
@@ -114,6 +114,7 @@ public abstract class AbstractCommitLogService
try
{
haveWork.tryAcquire(sleep, TimeUnit.MILLISECONDS);
+ haveWork.drainPermits();
}
catch (InterruptedException e)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/98a08ebc/src/java/org/apache/cassandra/db/commitlog/BatchCommitLogService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/BatchCommitLogService.java b/src/java/org/apache/cassandra/db/commitlog/BatchCommitLogService.java
index 65bee40..dd55d24 100644
--- a/src/java/org/apache/cassandra/db/commitlog/BatchCommitLogService.java
+++ b/src/java/org/apache/cassandra/db/commitlog/BatchCommitLogService.java
@@ -30,6 +30,7 @@ class BatchCommitLogService extends AbstractCommitLogService
{
// wait until record has been safely persisted to disk
pending.incrementAndGet();
+ haveWork.release();
alloc.awaitDiskSync();
pending.decrementAndGet();
}
[02/10] cassandra git commit: Make batch commit log mode easier to
tune
Posted by be...@apache.org.
Make batch commit log mode easier to tune
This patch effectively ignores the batch commit log
mode sync interval option, and performs a sync as soon
as work becomes available, causing a natural grouping
of writes and minimal latency.
patch by benedict; reviewed by ariel for CASSANDRA-9533
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/98a08ebc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/98a08ebc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/98a08ebc
Branch: refs/heads/cassandra-2.2
Commit: 98a08ebcf11a5124ddf865b5337c781a11377588
Parents: 1e3f03e
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Tue Aug 4 12:47:10 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Sat Aug 8 12:33:22 2015 +0200
----------------------------------------------------------------------
.../apache/cassandra/db/commitlog/AbstractCommitLogService.java | 3 ++-
.../org/apache/cassandra/db/commitlog/BatchCommitLogService.java | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/98a08ebc/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java b/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
index d9ea683..9f3b410 100644
--- a/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
+++ b/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
@@ -43,7 +43,7 @@ public abstract class AbstractCommitLogService
// signal that writers can wait on to be notified of a completed sync
protected final WaitQueue syncComplete = new WaitQueue();
- private final Semaphore haveWork = new Semaphore(1);
+ protected final Semaphore haveWork = new Semaphore(1);
private static final Logger logger = LoggerFactory.getLogger(AbstractCommitLogService.class);
@@ -114,6 +114,7 @@ public abstract class AbstractCommitLogService
try
{
haveWork.tryAcquire(sleep, TimeUnit.MILLISECONDS);
+ haveWork.drainPermits();
}
catch (InterruptedException e)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/98a08ebc/src/java/org/apache/cassandra/db/commitlog/BatchCommitLogService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/BatchCommitLogService.java b/src/java/org/apache/cassandra/db/commitlog/BatchCommitLogService.java
index 65bee40..dd55d24 100644
--- a/src/java/org/apache/cassandra/db/commitlog/BatchCommitLogService.java
+++ b/src/java/org/apache/cassandra/db/commitlog/BatchCommitLogService.java
@@ -30,6 +30,7 @@ class BatchCommitLogService extends AbstractCommitLogService
{
// wait until record has been safely persisted to disk
pending.incrementAndGet();
+ haveWork.release();
alloc.awaitDiskSync();
pending.decrementAndGet();
}
[06/10] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by be...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
src/java/org/apache/cassandra/db/commitlog/BatchCommitLogService.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6fd41ab1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6fd41ab1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6fd41ab1
Branch: refs/heads/cassandra-2.2
Commit: 6fd41ab158cb68189712ad61d0894d2c58ebac2e
Parents: 67903d7 98a08eb
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Sat Aug 8 12:36:21 2015 +0200
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Sat Aug 8 12:36:21 2015 +0200
----------------------------------------------------------------------
.../apache/cassandra/db/commitlog/AbstractCommitLogService.java | 3 ++-
.../org/apache/cassandra/db/commitlog/BatchCommitLogService.java | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6fd41ab1/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
index 2a55600,9f3b410..fa981a3
--- a/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
+++ b/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
@@@ -43,12 -43,8 +43,12 @@@ public abstract class AbstractCommitLog
// signal that writers can wait on to be notified of a completed sync
protected final WaitQueue syncComplete = new WaitQueue();
- private final Semaphore haveWork = new Semaphore(1);
+ protected final Semaphore haveWork = new Semaphore(1);
+ final CommitLog commitLog;
+ private final String name;
+ private final long pollIntervalMillis;
+
private static final Logger logger = LoggerFactory.getLogger(AbstractCommitLogService.class);
/**
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6fd41ab1/src/java/org/apache/cassandra/db/commitlog/BatchCommitLogService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/commitlog/BatchCommitLogService.java
index b433754,dd55d24..ceb5d64
--- a/src/java/org/apache/cassandra/db/commitlog/BatchCommitLogService.java
+++ b/src/java/org/apache/cassandra/db/commitlog/BatchCommitLogService.java
@@@ -30,7 -30,8 +30,8 @@@ class BatchCommitLogService extends Abs
{
// wait until record has been safely persisted to disk
pending.incrementAndGet();
+ haveWork.release();
- alloc.awaitDiskSync();
+ alloc.awaitDiskSync(commitLog.metrics.waitingOnCommit);
pending.decrementAndGet();
}
}
[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by be...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7ea2ce12
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7ea2ce12
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7ea2ce12
Branch: refs/heads/trunk
Commit: 7ea2ce124a3144039540455430652f03021e7ffc
Parents: 489a9e8 6fd41ab
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Sat Aug 8 12:36:30 2015 +0200
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Sat Aug 8 12:36:30 2015 +0200
----------------------------------------------------------------------
.../apache/cassandra/db/commitlog/AbstractCommitLogService.java | 3 ++-
.../org/apache/cassandra/db/commitlog/BatchCommitLogService.java | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7ea2ce12/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
----------------------------------------------------------------------
[03/10] cassandra git commit: Make batch commit log mode easier to
tune
Posted by be...@apache.org.
Make batch commit log mode easier to tune
This patch effectively ignores the batch commit log
mode sync interval option, and performs a sync as soon
as work becomes available, causing a natural grouping
of writes and minimal latency.
patch by benedict; reviewed by ariel for CASSANDRA-9533
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/98a08ebc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/98a08ebc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/98a08ebc
Branch: refs/heads/cassandra-3.0
Commit: 98a08ebcf11a5124ddf865b5337c781a11377588
Parents: 1e3f03e
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Tue Aug 4 12:47:10 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Sat Aug 8 12:33:22 2015 +0200
----------------------------------------------------------------------
.../apache/cassandra/db/commitlog/AbstractCommitLogService.java | 3 ++-
.../org/apache/cassandra/db/commitlog/BatchCommitLogService.java | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/98a08ebc/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java b/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
index d9ea683..9f3b410 100644
--- a/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
+++ b/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
@@ -43,7 +43,7 @@ public abstract class AbstractCommitLogService
// signal that writers can wait on to be notified of a completed sync
protected final WaitQueue syncComplete = new WaitQueue();
- private final Semaphore haveWork = new Semaphore(1);
+ protected final Semaphore haveWork = new Semaphore(1);
private static final Logger logger = LoggerFactory.getLogger(AbstractCommitLogService.class);
@@ -114,6 +114,7 @@ public abstract class AbstractCommitLogService
try
{
haveWork.tryAcquire(sleep, TimeUnit.MILLISECONDS);
+ haveWork.drainPermits();
}
catch (InterruptedException e)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/98a08ebc/src/java/org/apache/cassandra/db/commitlog/BatchCommitLogService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/BatchCommitLogService.java b/src/java/org/apache/cassandra/db/commitlog/BatchCommitLogService.java
index 65bee40..dd55d24 100644
--- a/src/java/org/apache/cassandra/db/commitlog/BatchCommitLogService.java
+++ b/src/java/org/apache/cassandra/db/commitlog/BatchCommitLogService.java
@@ -30,6 +30,7 @@ class BatchCommitLogService extends AbstractCommitLogService
{
// wait until record has been safely persisted to disk
pending.incrementAndGet();
+ haveWork.release();
alloc.awaitDiskSync();
pending.decrementAndGet();
}
[08/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by be...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7ea2ce12
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7ea2ce12
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7ea2ce12
Branch: refs/heads/cassandra-3.0
Commit: 7ea2ce124a3144039540455430652f03021e7ffc
Parents: 489a9e8 6fd41ab
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Sat Aug 8 12:36:30 2015 +0200
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Sat Aug 8 12:36:30 2015 +0200
----------------------------------------------------------------------
.../apache/cassandra/db/commitlog/AbstractCommitLogService.java | 3 ++-
.../org/apache/cassandra/db/commitlog/BatchCommitLogService.java | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7ea2ce12/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
----------------------------------------------------------------------
[05/10] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by be...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
src/java/org/apache/cassandra/db/commitlog/BatchCommitLogService.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6fd41ab1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6fd41ab1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6fd41ab1
Branch: refs/heads/cassandra-3.0
Commit: 6fd41ab158cb68189712ad61d0894d2c58ebac2e
Parents: 67903d7 98a08eb
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Sat Aug 8 12:36:21 2015 +0200
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Sat Aug 8 12:36:21 2015 +0200
----------------------------------------------------------------------
.../apache/cassandra/db/commitlog/AbstractCommitLogService.java | 3 ++-
.../org/apache/cassandra/db/commitlog/BatchCommitLogService.java | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6fd41ab1/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
index 2a55600,9f3b410..fa981a3
--- a/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
+++ b/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
@@@ -43,12 -43,8 +43,12 @@@ public abstract class AbstractCommitLog
// signal that writers can wait on to be notified of a completed sync
protected final WaitQueue syncComplete = new WaitQueue();
- private final Semaphore haveWork = new Semaphore(1);
+ protected final Semaphore haveWork = new Semaphore(1);
+ final CommitLog commitLog;
+ private final String name;
+ private final long pollIntervalMillis;
+
private static final Logger logger = LoggerFactory.getLogger(AbstractCommitLogService.class);
/**
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6fd41ab1/src/java/org/apache/cassandra/db/commitlog/BatchCommitLogService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/commitlog/BatchCommitLogService.java
index b433754,dd55d24..ceb5d64
--- a/src/java/org/apache/cassandra/db/commitlog/BatchCommitLogService.java
+++ b/src/java/org/apache/cassandra/db/commitlog/BatchCommitLogService.java
@@@ -30,7 -30,8 +30,8 @@@ class BatchCommitLogService extends Abs
{
// wait until record has been safely persisted to disk
pending.incrementAndGet();
+ haveWork.release();
- alloc.awaitDiskSync();
+ alloc.awaitDiskSync(commitLog.metrics.waitingOnCommit);
pending.decrementAndGet();
}
}
[04/10] cassandra git commit: Make batch commit log mode easier to
tune
Posted by be...@apache.org.
Make batch commit log mode easier to tune
This patch effectively ignores the batch commit log
mode sync interval option, and performs a sync as soon
as work becomes available, causing a natural grouping
of writes and minimal latency.
patch by benedict; reviewed by ariel for CASSANDRA-9533
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/98a08ebc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/98a08ebc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/98a08ebc
Branch: refs/heads/trunk
Commit: 98a08ebcf11a5124ddf865b5337c781a11377588
Parents: 1e3f03e
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Tue Aug 4 12:47:10 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Sat Aug 8 12:33:22 2015 +0200
----------------------------------------------------------------------
.../apache/cassandra/db/commitlog/AbstractCommitLogService.java | 3 ++-
.../org/apache/cassandra/db/commitlog/BatchCommitLogService.java | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/98a08ebc/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java b/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
index d9ea683..9f3b410 100644
--- a/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
+++ b/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
@@ -43,7 +43,7 @@ public abstract class AbstractCommitLogService
// signal that writers can wait on to be notified of a completed sync
protected final WaitQueue syncComplete = new WaitQueue();
- private final Semaphore haveWork = new Semaphore(1);
+ protected final Semaphore haveWork = new Semaphore(1);
private static final Logger logger = LoggerFactory.getLogger(AbstractCommitLogService.class);
@@ -114,6 +114,7 @@ public abstract class AbstractCommitLogService
try
{
haveWork.tryAcquire(sleep, TimeUnit.MILLISECONDS);
+ haveWork.drainPermits();
}
catch (InterruptedException e)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/98a08ebc/src/java/org/apache/cassandra/db/commitlog/BatchCommitLogService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/BatchCommitLogService.java b/src/java/org/apache/cassandra/db/commitlog/BatchCommitLogService.java
index 65bee40..dd55d24 100644
--- a/src/java/org/apache/cassandra/db/commitlog/BatchCommitLogService.java
+++ b/src/java/org/apache/cassandra/db/commitlog/BatchCommitLogService.java
@@ -30,6 +30,7 @@ class BatchCommitLogService extends AbstractCommitLogService
{
// wait until record has been safely persisted to disk
pending.incrementAndGet();
+ haveWork.release();
alloc.awaitDiskSync();
pending.decrementAndGet();
}
[07/10] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by be...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
src/java/org/apache/cassandra/db/commitlog/BatchCommitLogService.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6fd41ab1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6fd41ab1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6fd41ab1
Branch: refs/heads/trunk
Commit: 6fd41ab158cb68189712ad61d0894d2c58ebac2e
Parents: 67903d7 98a08eb
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Sat Aug 8 12:36:21 2015 +0200
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Sat Aug 8 12:36:21 2015 +0200
----------------------------------------------------------------------
.../apache/cassandra/db/commitlog/AbstractCommitLogService.java | 3 ++-
.../org/apache/cassandra/db/commitlog/BatchCommitLogService.java | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6fd41ab1/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
index 2a55600,9f3b410..fa981a3
--- a/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
+++ b/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
@@@ -43,12 -43,8 +43,12 @@@ public abstract class AbstractCommitLog
// signal that writers can wait on to be notified of a completed sync
protected final WaitQueue syncComplete = new WaitQueue();
- private final Semaphore haveWork = new Semaphore(1);
+ protected final Semaphore haveWork = new Semaphore(1);
+ final CommitLog commitLog;
+ private final String name;
+ private final long pollIntervalMillis;
+
private static final Logger logger = LoggerFactory.getLogger(AbstractCommitLogService.class);
/**
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6fd41ab1/src/java/org/apache/cassandra/db/commitlog/BatchCommitLogService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/commitlog/BatchCommitLogService.java
index b433754,dd55d24..ceb5d64
--- a/src/java/org/apache/cassandra/db/commitlog/BatchCommitLogService.java
+++ b/src/java/org/apache/cassandra/db/commitlog/BatchCommitLogService.java
@@@ -30,7 -30,8 +30,8 @@@ class BatchCommitLogService extends Abs
{
// wait until record has been safely persisted to disk
pending.incrementAndGet();
+ haveWork.release();
- alloc.awaitDiskSync();
+ alloc.awaitDiskSync(commitLog.metrics.waitingOnCommit);
pending.decrementAndGet();
}
}
[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by be...@apache.org.
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6292aaa7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6292aaa7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6292aaa7
Branch: refs/heads/trunk
Commit: 6292aaa729ffb7f6367b149fb84edce3613c7872
Parents: 05de664 7ea2ce1
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Sat Aug 8 12:36:36 2015 +0200
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Sat Aug 8 12:36:36 2015 +0200
----------------------------------------------------------------------
.../apache/cassandra/db/commitlog/AbstractCommitLogService.java | 3 ++-
.../org/apache/cassandra/db/commitlog/BatchCommitLogService.java | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------