cassandra git commit: Add ability to stop compaction by ID
Repository: cassandra
Updated Branches:
refs/heads/trunk 3faa17be5 - e194fe9d8
Add ability to stop compaction by ID
patch by Lyuben Todorov; reviewed by yukim for CASSANDRA-7207
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e194fe9d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e194fe9d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e194fe9d
Branch: refs/heads/trunk
Commit: e194fe9d8ca01718277ec316e2d19b5c75e387cd
Parents: 3faa17b
Author: Lyuben Todorov lyu...@mail.com
Authored: Tue May 19 11:36:38 2015 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Wed May 20 08:41:28 2015 -0500
--
CHANGES.txt | 1 +
.../apache/cassandra/cache/AutoSavingCache.java | 4 +++-
.../compaction/AbstractCompactionIterable.java | 8 ++--
.../cassandra/db/compaction/CompactionInfo.java | 20 +--
.../db/compaction/CompactionIterable.java | 9 +++--
.../db/compaction/CompactionManager.java| 21 +---
.../db/compaction/CompactionManagerMBean.java | 8
.../cassandra/db/compaction/CompactionTask.java | 2 +-
.../cassandra/db/compaction/Scrubber.java | 6 +-
.../cassandra/db/compaction/Upgrader.java | 3 ++-
.../cassandra/db/compaction/Verifier.java | 6 +-
.../db/index/SecondaryIndexBuilder.java | 7 ++-
.../org/apache/cassandra/tools/NodeProbe.java | 5 +
.../tools/nodetool/CompactionStats.java | 9 +
.../apache/cassandra/tools/nodetool/Stop.java | 17 ++--
15 files changed, 101 insertions(+), 25 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e194fe9d/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 5642cd4..1912372 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,7 @@
3.0:
* Decommissioned nodes will not rejoin the cluster (CASSANDRA-8801)
* Change gossip stabilization to use endpoit size (CASSANDRA-9401)
+ * Add ability to stop compaction by ID (CASSANDRA-7207)
2.2
* Ensure that UDF and UDAs are keyspace-isolated (CASSANDRA-9409)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e194fe9d/src/java/org/apache/cassandra/cache/AutoSavingCache.java
--
diff --git a/src/java/org/apache/cassandra/cache/AutoSavingCache.java
b/src/java/org/apache/cassandra/cache/AutoSavingCache.java
index 7a9c3da..b381224 100644
--- a/src/java/org/apache/cassandra/cache/AutoSavingCache.java
+++ b/src/java/org/apache/cassandra/cache/AutoSavingCache.java
@@ -42,6 +42,7 @@ import org.apache.cassandra.io.util.*;
import org.apache.cassandra.service.CacheService;
import org.apache.cassandra.utils.JVMStabilityInspector;
import org.apache.cassandra.utils.Pair;
+import org.apache.cassandra.utils.UUIDGen;
public class AutoSavingCacheK extends CacheKey, V extends
InstrumentingCacheK, V
{
@@ -210,7 +211,8 @@ public class AutoSavingCacheK extends CacheKey, V extends
InstrumentingCacheK
type,
0,
keysEstimate,
- keys);
+ keys,
+ UUIDGen.getTimeUUID());
}
public CacheService.CacheType cacheType()
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e194fe9d/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java
--
diff --git
a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java
b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java
index 5ac2c8b..9fe8fd9 100644
---
a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java
+++
b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java
@@ -18,6 +18,7 @@
package org.apache.cassandra.db.compaction;
import java.util.List;
+import java.util.UUID;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.cassandra.io.sstable.ISSTableScanner;
@@ -30,6 +31,7 @@ public abstract class AbstractCompactionIterable extends
CompactionInfo.Holder i
protected final long totalBytes;
protected volatile long bytesRead;
protected final ListISSTableScanner scanners;
+protected final UUID compactionId;
/*
* counters for merged rows.
* array index represents (number of merged rows - 1), so index 0 is
counter for no merge (1 row),
@@ -37,12 +39,13 @@ public abstract class AbstractCompactionIterable extends
CompactionInfo.Holder i
[2/3] cassandra git commit: Add ability to stop compaction by ID
Add ability to stop compaction by ID
patch by Lyuben Todorov; reviewed by yukim for CASSANDRA-7207
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/52dc63b6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/52dc63b6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/52dc63b6
Branch: refs/heads/trunk
Commit: 52dc63b6c75ca3f68e4c90dc76f8e1cc65690fb5
Parents: f9b6d3d
Author: Lyuben Todorov lyu...@mail.com
Authored: Tue May 19 11:36:38 2015 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Wed May 20 10:30:16 2015 -0500
--
CHANGES.txt | 1 +
.../apache/cassandra/cache/AutoSavingCache.java | 4 +++-
.../compaction/AbstractCompactionIterable.java | 8 ++--
.../cassandra/db/compaction/CompactionInfo.java | 20 +--
.../db/compaction/CompactionIterable.java | 9 +++--
.../db/compaction/CompactionManager.java| 21 +---
.../db/compaction/CompactionManagerMBean.java | 8
.../cassandra/db/compaction/CompactionTask.java | 2 +-
.../cassandra/db/compaction/Scrubber.java | 6 +-
.../cassandra/db/compaction/Upgrader.java | 3 ++-
.../cassandra/db/compaction/Verifier.java | 6 +-
.../db/index/SecondaryIndexBuilder.java | 7 ++-
.../org/apache/cassandra/tools/NodeProbe.java | 5 +
.../tools/nodetool/CompactionStats.java | 9 +
.../apache/cassandra/tools/nodetool/Stop.java | 17 ++--
15 files changed, 101 insertions(+), 25 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/52dc63b6/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index a227f5e..44f9e4c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,7 @@
2.2
* Ensure that UDF and UDAs are keyspace-isolated (CASSANDRA-9409)
* Revert CASSANDRA-7807 (tracing completion client notifications)
(CASSANDRA-9429)
+ * Add ability to stop compaction by ID (CASSANDRA-7207)
Merged from 2.1:
* Use configured gcgs in anticompaction (CASSANDRA-9397)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/52dc63b6/src/java/org/apache/cassandra/cache/AutoSavingCache.java
--
diff --git a/src/java/org/apache/cassandra/cache/AutoSavingCache.java
b/src/java/org/apache/cassandra/cache/AutoSavingCache.java
index 7a9c3da..b381224 100644
--- a/src/java/org/apache/cassandra/cache/AutoSavingCache.java
+++ b/src/java/org/apache/cassandra/cache/AutoSavingCache.java
@@ -42,6 +42,7 @@ import org.apache.cassandra.io.util.*;
import org.apache.cassandra.service.CacheService;
import org.apache.cassandra.utils.JVMStabilityInspector;
import org.apache.cassandra.utils.Pair;
+import org.apache.cassandra.utils.UUIDGen;
public class AutoSavingCacheK extends CacheKey, V extends
InstrumentingCacheK, V
{
@@ -210,7 +211,8 @@ public class AutoSavingCacheK extends CacheKey, V extends
InstrumentingCacheK
type,
0,
keysEstimate,
- keys);
+ keys,
+ UUIDGen.getTimeUUID());
}
public CacheService.CacheType cacheType()
http://git-wip-us.apache.org/repos/asf/cassandra/blob/52dc63b6/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java
--
diff --git
a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java
b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java
index 5ac2c8b..9fe8fd9 100644
---
a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java
+++
b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java
@@ -18,6 +18,7 @@
package org.apache.cassandra.db.compaction;
import java.util.List;
+import java.util.UUID;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.cassandra.io.sstable.ISSTableScanner;
@@ -30,6 +31,7 @@ public abstract class AbstractCompactionIterable extends
CompactionInfo.Holder i
protected final long totalBytes;
protected volatile long bytesRead;
protected final ListISSTableScanner scanners;
+protected final UUID compactionId;
/*
* counters for merged rows.
* array index represents (number of merged rows - 1), so index 0 is
counter for no merge (1 row),
@@ -37,12 +39,13 @@ public abstract class AbstractCompactionIterable extends
CompactionInfo.Holder i
*/
protected final AtomicLong[] mergeCounters;
-
[1/3] cassandra git commit: Add ability to stop compaction by ID
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 f9b6d3dac - 52dc63b6c
refs/heads/trunk e194fe9d8 - 2e48b6af9
Add ability to stop compaction by ID
patch by Lyuben Todorov; reviewed by yukim for CASSANDRA-7207
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/52dc63b6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/52dc63b6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/52dc63b6
Branch: refs/heads/cassandra-2.2
Commit: 52dc63b6c75ca3f68e4c90dc76f8e1cc65690fb5
Parents: f9b6d3d
Author: Lyuben Todorov lyu...@mail.com
Authored: Tue May 19 11:36:38 2015 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Wed May 20 10:30:16 2015 -0500
--
CHANGES.txt | 1 +
.../apache/cassandra/cache/AutoSavingCache.java | 4 +++-
.../compaction/AbstractCompactionIterable.java | 8 ++--
.../cassandra/db/compaction/CompactionInfo.java | 20 +--
.../db/compaction/CompactionIterable.java | 9 +++--
.../db/compaction/CompactionManager.java| 21 +---
.../db/compaction/CompactionManagerMBean.java | 8
.../cassandra/db/compaction/CompactionTask.java | 2 +-
.../cassandra/db/compaction/Scrubber.java | 6 +-
.../cassandra/db/compaction/Upgrader.java | 3 ++-
.../cassandra/db/compaction/Verifier.java | 6 +-
.../db/index/SecondaryIndexBuilder.java | 7 ++-
.../org/apache/cassandra/tools/NodeProbe.java | 5 +
.../tools/nodetool/CompactionStats.java | 9 +
.../apache/cassandra/tools/nodetool/Stop.java | 17 ++--
15 files changed, 101 insertions(+), 25 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/52dc63b6/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index a227f5e..44f9e4c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,7 @@
2.2
* Ensure that UDF and UDAs are keyspace-isolated (CASSANDRA-9409)
* Revert CASSANDRA-7807 (tracing completion client notifications)
(CASSANDRA-9429)
+ * Add ability to stop compaction by ID (CASSANDRA-7207)
Merged from 2.1:
* Use configured gcgs in anticompaction (CASSANDRA-9397)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/52dc63b6/src/java/org/apache/cassandra/cache/AutoSavingCache.java
--
diff --git a/src/java/org/apache/cassandra/cache/AutoSavingCache.java
b/src/java/org/apache/cassandra/cache/AutoSavingCache.java
index 7a9c3da..b381224 100644
--- a/src/java/org/apache/cassandra/cache/AutoSavingCache.java
+++ b/src/java/org/apache/cassandra/cache/AutoSavingCache.java
@@ -42,6 +42,7 @@ import org.apache.cassandra.io.util.*;
import org.apache.cassandra.service.CacheService;
import org.apache.cassandra.utils.JVMStabilityInspector;
import org.apache.cassandra.utils.Pair;
+import org.apache.cassandra.utils.UUIDGen;
public class AutoSavingCacheK extends CacheKey, V extends
InstrumentingCacheK, V
{
@@ -210,7 +211,8 @@ public class AutoSavingCacheK extends CacheKey, V extends
InstrumentingCacheK
type,
0,
keysEstimate,
- keys);
+ keys,
+ UUIDGen.getTimeUUID());
}
public CacheService.CacheType cacheType()
http://git-wip-us.apache.org/repos/asf/cassandra/blob/52dc63b6/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java
--
diff --git
a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java
b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java
index 5ac2c8b..9fe8fd9 100644
---
a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java
+++
b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java
@@ -18,6 +18,7 @@
package org.apache.cassandra.db.compaction;
import java.util.List;
+import java.util.UUID;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.cassandra.io.sstable.ISSTableScanner;
@@ -30,6 +31,7 @@ public abstract class AbstractCompactionIterable extends
CompactionInfo.Holder i
protected final long totalBytes;
protected volatile long bytesRead;
protected final ListISSTableScanner scanners;
+protected final UUID compactionId;
/*
* counters for merged rows.
* array index represents (number of merged rows - 1), so index 0 is
counter for no merge (1 row),
@@ -37,12 +39,13 @@ public
