You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2017/12/22 07:53:51 UTC
[1/6] cassandra git commit: Log file names of sstables streamed in to
a node
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 0521f8dc5 -> 5b4485b29
refs/heads/cassandra-3.11 adc32ac83 -> b28fc1bff
refs/heads/trunk 882c28230 -> d52326af6
Log file names of sstables streamed in to a node
Patch by marcuse; reviewed by Jeff Jirsa for CASSANDRA-14133
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5b4485b2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5b4485b2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5b4485b2
Branch: refs/heads/cassandra-3.0
Commit: 5b4485b29ecf36b750a75435580d82e749a825e8
Parents: 0521f8d
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Dec 21 09:19:02 2017 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Fri Dec 22 07:55:12 2017 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/streaming/StreamReceiveTask.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b4485b2/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java b/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java
index b6b8387..9e65d34 100644
--- a/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java
+++ b/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java
@@ -196,6 +196,7 @@ public class StreamReceiveTask extends StreamTask
{
task.finishTransaction();
+ logger.debug("[Stream #{}] Received {} sstables from {} ({})", task.session.planId(), readers.size(), task.session.peer, readers);
// add sstables and build secondary indexes
cfs.addSSTables(readers);
cfs.indexManager.buildAllIndexesBlocking(readers);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[2/6] cassandra git commit: Log file names of sstables streamed in to
a node
Posted by ma...@apache.org.
Log file names of sstables streamed in to a node
Patch by marcuse; reviewed by Jeff Jirsa for CASSANDRA-14133
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5b4485b2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5b4485b2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5b4485b2
Branch: refs/heads/cassandra-3.11
Commit: 5b4485b29ecf36b750a75435580d82e749a825e8
Parents: 0521f8d
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Dec 21 09:19:02 2017 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Fri Dec 22 07:55:12 2017 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/streaming/StreamReceiveTask.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b4485b2/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java b/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java
index b6b8387..9e65d34 100644
--- a/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java
+++ b/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java
@@ -196,6 +196,7 @@ public class StreamReceiveTask extends StreamTask
{
task.finishTransaction();
+ logger.debug("[Stream #{}] Received {} sstables from {} ({})", task.session.planId(), readers.size(), task.session.peer, readers);
// add sstables and build secondary indexes
cfs.addSSTables(readers);
cfs.indexManager.buildAllIndexesBlocking(readers);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[3/6] cassandra git commit: Log file names of sstables streamed in to
a node
Posted by ma...@apache.org.
Log file names of sstables streamed in to a node
Patch by marcuse; reviewed by Jeff Jirsa for CASSANDRA-14133
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5b4485b2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5b4485b2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5b4485b2
Branch: refs/heads/trunk
Commit: 5b4485b29ecf36b750a75435580d82e749a825e8
Parents: 0521f8d
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Dec 21 09:19:02 2017 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Fri Dec 22 07:55:12 2017 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/streaming/StreamReceiveTask.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b4485b2/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java b/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java
index b6b8387..9e65d34 100644
--- a/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java
+++ b/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java
@@ -196,6 +196,7 @@ public class StreamReceiveTask extends StreamTask
{
task.finishTransaction();
+ logger.debug("[Stream #{}] Received {} sstables from {} ({})", task.session.planId(), readers.size(), task.session.peer, readers);
// add sstables and build secondary indexes
cfs.addSSTables(readers);
cfs.indexManager.buildAllIndexesBlocking(readers);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by ma...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b28fc1bf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b28fc1bf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b28fc1bf
Branch: refs/heads/cassandra-3.11
Commit: b28fc1bff35800450c03343b85b8bc38b645f20d
Parents: adc32ac 5b4485b
Author: Marcus Eriksson <ma...@apache.org>
Authored: Fri Dec 22 07:55:59 2017 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Fri Dec 22 07:55:59 2017 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/streaming/StreamReceiveTask.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b28fc1bf/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by ma...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b28fc1bf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b28fc1bf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b28fc1bf
Branch: refs/heads/trunk
Commit: b28fc1bff35800450c03343b85b8bc38b645f20d
Parents: adc32ac 5b4485b
Author: Marcus Eriksson <ma...@apache.org>
Authored: Fri Dec 22 07:55:59 2017 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Fri Dec 22 07:55:59 2017 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/streaming/StreamReceiveTask.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b28fc1bf/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[6/6] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Posted by ma...@apache.org.
Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d52326af
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d52326af
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d52326af
Branch: refs/heads/trunk
Commit: d52326af623f371f820c20269bc1113db443cf38
Parents: 882c282 b28fc1b
Author: Marcus Eriksson <ma...@apache.org>
Authored: Fri Dec 22 08:53:03 2017 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Fri Dec 22 08:53:03 2017 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/streaming/StreamReceiveTask.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d52326af/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/streaming/StreamReceiveTask.java
index 988bc9e,f3966a7..b823311
--- a/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java
+++ b/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java
@@@ -233,11 -210,13 +233,12 @@@ public class StreamReceiveTask extends
{
task.finishTransaction();
+ // add sstables (this will build secondary indexes too, see CASSANDRA-10130)
+ logger.debug("[Stream #{}] Received {} sstables from {} ({})", task.session.planId(), readers.size(), task.session.peer, readers);
- // add sstables and build secondary indexes
cfs.addSSTables(readers);
- cfs.indexManager.buildAllIndexesBlocking(readers);
//invalidate row and counter cache
- if (cfs.isRowCacheEnabled() || cfs.metadata.isCounter())
+ if (cfs.isRowCacheEnabled() || cfs.metadata().isCounter())
{
List<Bounds<Token>> boundsToInvalidate = new ArrayList<>(readers.size());
readers.forEach(sstable -> boundsToInvalidate.add(new Bounds<Token>(sstable.first.getToken(), sstable.last.getToken())));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org