Repository: cassandra Updated Branches: refs/heads/trunk 5ccbebaf8 -> 6a7fad601
fix race condition in PendingRepairManager Patch by Blake Eggleston; reviewed by Marcus Eriksson for CASSANDRA-13659 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6a7fad60 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6a7fad60 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6a7fad60 Branch: refs/heads/trunk Commit: 6a7fad6011dcc586344334c95aa9601477b9c5a3 Parents: 5ccbeba Author: Blake Eggleston <bdeggles...@gmail.com> Authored: Mon Jul 3 15:00:38 2017 -0700 Committer: Blake Eggleston <bdeggles...@gmail.com> Committed: Wed Jul 5 17:06:07 2017 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/db/compaction/PendingRepairManager.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6a7fad60/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 6840bdd..98c9cad 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 4.0 + * fix race condition in PendingRepairManager (CASSANDRA-13659) * Allow noop incremental repair state transitions (CASSANDRA-13658) * Run repair with down replicas (CASSANDRA-10446) * Added started & completed repair metrics (CASSANDRA-13598) http://git-wip-us.apache.org/repos/asf/cassandra/blob/6a7fad60/src/java/org/apache/cassandra/db/compaction/PendingRepairManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/PendingRepairManager.java b/src/java/org/apache/cassandra/db/compaction/PendingRepairManager.java index eafa03c..afde263 100644 --- a/src/java/org/apache/cassandra/db/compaction/PendingRepairManager.java +++ b/src/java/org/apache/cassandra/db/compaction/PendingRepairManager.java @@ -359,7 +359,7 @@ class PendingRepairManager Set<ISSTableScanner> scanners = new HashSet<>(sessionSSTables.size()); for (Map.Entry<UUID, Set<SSTableReader>> entry : sessionSSTables.entrySet()) { - scanners.addAll(get(entry.getKey()).getScanners(entry.getValue(), ranges).scanners); + scanners.addAll(getOrCreate(entry.getKey()).getScanners(entry.getValue(), ranges).scanners); } return scanners; } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
