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 <[email protected]> Authored: Fri Dec 22 08:53:03 2017 +0100 Committer: Marcus Eriksson <[email protected]> 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: [email protected] For additional commands, e-mail: [email protected]
