[05/10] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

[benedict]

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 <bened...@apache.org>
Authored: Sat Aug 8 12:36:21 2015 +0200
Committer: Benedict Elliott Smith <bened...@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();
      }
  }