cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [8/9] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Mon, 04 Apr 2016 12:06:05 GMT
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/736a0cef
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/736a0cef
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/736a0cef

Branch: refs/heads/cassandra-3.0
Commit: 736a0cefbd9886e743219f58960d75827b814e97
Parents: 8b32d48 1ff9df7
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Mon Apr 4 14:01:13 2016 +0200
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Mon Apr 4 14:01:29 2016 +0200

----------------------------------------------------------------------
 src/java/org/apache/cassandra/repair/RepairJob.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/736a0cef/src/java/org/apache/cassandra/repair/RepairJob.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/repair/RepairJob.java
index 1e54f88,a92233b..cba176c
--- a/src/java/org/apache/cassandra/repair/RepairJob.java
+++ b/src/java/org/apache/cassandra/repair/RepairJob.java
@@@ -190,7 -195,10 +188,10 @@@ public class RepairJob extends Abstract
       */
      private ListenableFuture<List<TreeResponse>> sendSequentialValidationRequest(Collection<InetAddress>
endpoints)
      {
+         String message = String.format("Requesting merkle trees for %s (to %s)", desc.columnFamily,
endpoints);
+         logger.info("[repair #{}] {}", desc.sessionId, message);
+         Tracing.traceRepair(message);
 -        int gcBefore = Keyspace.open(desc.keyspace).getColumnFamilyStore(desc.columnFamily).gcBefore(System.currentTimeMillis());
 +        int gcBefore = Keyspace.open(desc.keyspace).getColumnFamilyStore(desc.columnFamily).gcBefore(FBUtilities.nowInSeconds());
          List<ListenableFuture<TreeResponse>> tasks = new ArrayList<>(endpoints.size());
  
          Queue<InetAddress> requests = new LinkedList<>(endpoints);
@@@ -229,7 -237,10 +230,10 @@@
       */
      private ListenableFuture<List<TreeResponse>> sendDCAwareValidationRequest(Collection<InetAddress>
endpoints)
      {
+         String message = String.format("Requesting merkle trees for %s (to %s)", desc.columnFamily,
endpoints);
+         logger.info("[repair #{}] {}", desc.sessionId, message);
+         Tracing.traceRepair(message);
 -        int gcBefore = Keyspace.open(desc.keyspace).getColumnFamilyStore(desc.columnFamily).gcBefore(System.currentTimeMillis());
 +        int gcBefore = Keyspace.open(desc.keyspace).getColumnFamilyStore(desc.columnFamily).gcBefore(FBUtilities.nowInSeconds());
          List<ListenableFuture<TreeResponse>> tasks = new ArrayList<>(endpoints.size());
  
          Map<String, Queue<InetAddress>> requestsByDatacenter = new HashMap<>();


Mime
View raw message