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 2018/06/07 15:45:17 UTC
[01/10] cassandra git commit: Fix flaky BlacklistingCompactionsTest
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 81b6c9e99 -> fc7a69b65
refs/heads/cassandra-3.0 b8fb29a6b -> cce9ab236
refs/heads/cassandra-3.11 7bb88deb4 -> b1748198e
refs/heads/trunk 84fb7fa6f -> 800f0b394
Fix flaky BlacklistingCompactionsTest
Patch by marcuse; reviewed by Jay Zhuang for CASSANDRA-14238
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fc7a69b6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fc7a69b6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fc7a69b6
Branch: refs/heads/cassandra-2.2
Commit: fc7a69b65399597a2bf9c6025f035f8fe26724c7
Parents: 81b6c9e
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu May 31 16:27:46 2018 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Thu Jun 7 08:35:42 2018 -0700
----------------------------------------------------------------------
.../cassandra/db/compaction/BlacklistingCompactionsTest.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc7a69b6/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java b/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java
index 2b6a62a..c482116 100644
--- a/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java
@@ -48,6 +48,8 @@ public class BlacklistingCompactionsTest
{
private static final String KEYSPACE1 = "BlacklistingCompactionsTest";
private static final String CF_STANDARD1 = "Standard1";
+ // seed hardcoded to one we know works:
+ private static final Random random = new Random(1);
@After
public void leakDetect() throws InterruptedException
@@ -142,7 +144,7 @@ public class BlacklistingCompactionsTest
raf = new RandomAccessFile(sstable.getFilename(), "rw");
assertNotNull(raf);
assertTrue(raf.length() > 20);
- raf.seek(new Random().nextInt((int)(raf.length() - 20)));
+ raf.seek(random.nextInt((int)(raf.length() - 20)));
// We want to write something large enough that the corruption cannot get undetected
// (even without compression)
byte[] corruption = new byte[20];
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[06/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by ma...@apache.org.
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/cce9ab23
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cce9ab23
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cce9ab23
Branch: refs/heads/cassandra-3.0
Commit: cce9ab2362d5c32d503eea2cbfd192685161203b
Parents: b8fb29a fc7a69b
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Jun 7 08:39:56 2018 -0700
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Thu Jun 7 08:39:56 2018 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[10/10] 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/800f0b39
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/800f0b39
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/800f0b39
Branch: refs/heads/trunk
Commit: 800f0b3948aa0a9095f78ed29d8d9cbc23a57581
Parents: 84fb7fa b174819
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Jun 7 08:40:20 2018 -0700
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Thu Jun 7 08:40:20 2018 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[07/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by ma...@apache.org.
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/cce9ab23
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cce9ab23
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cce9ab23
Branch: refs/heads/trunk
Commit: cce9ab2362d5c32d503eea2cbfd192685161203b
Parents: b8fb29a fc7a69b
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Jun 7 08:39:56 2018 -0700
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Thu Jun 7 08:39:56 2018 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[02/10] cassandra git commit: Fix flaky BlacklistingCompactionsTest
Posted by ma...@apache.org.
Fix flaky BlacklistingCompactionsTest
Patch by marcuse; reviewed by Jay Zhuang for CASSANDRA-14238
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fc7a69b6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fc7a69b6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fc7a69b6
Branch: refs/heads/cassandra-3.0
Commit: fc7a69b65399597a2bf9c6025f035f8fe26724c7
Parents: 81b6c9e
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu May 31 16:27:46 2018 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Thu Jun 7 08:35:42 2018 -0700
----------------------------------------------------------------------
.../cassandra/db/compaction/BlacklistingCompactionsTest.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc7a69b6/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java b/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java
index 2b6a62a..c482116 100644
--- a/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java
@@ -48,6 +48,8 @@ public class BlacklistingCompactionsTest
{
private static final String KEYSPACE1 = "BlacklistingCompactionsTest";
private static final String CF_STANDARD1 = "Standard1";
+ // seed hardcoded to one we know works:
+ private static final Random random = new Random(1);
@After
public void leakDetect() throws InterruptedException
@@ -142,7 +144,7 @@ public class BlacklistingCompactionsTest
raf = new RandomAccessFile(sstable.getFilename(), "rw");
assertNotNull(raf);
assertTrue(raf.length() > 20);
- raf.seek(new Random().nextInt((int)(raf.length() - 20)));
+ raf.seek(random.nextInt((int)(raf.length() - 20)));
// We want to write something large enough that the corruption cannot get undetected
// (even without compression)
byte[] corruption = new byte[20];
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[05/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by ma...@apache.org.
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/cce9ab23
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cce9ab23
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cce9ab23
Branch: refs/heads/cassandra-3.11
Commit: cce9ab2362d5c32d503eea2cbfd192685161203b
Parents: b8fb29a fc7a69b
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Jun 7 08:39:56 2018 -0700
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Thu Jun 7 08:39:56 2018 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[04/10] cassandra git commit: Fix flaky BlacklistingCompactionsTest
Posted by ma...@apache.org.
Fix flaky BlacklistingCompactionsTest
Patch by marcuse; reviewed by Jay Zhuang for CASSANDRA-14238
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fc7a69b6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fc7a69b6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fc7a69b6
Branch: refs/heads/trunk
Commit: fc7a69b65399597a2bf9c6025f035f8fe26724c7
Parents: 81b6c9e
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu May 31 16:27:46 2018 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Thu Jun 7 08:35:42 2018 -0700
----------------------------------------------------------------------
.../cassandra/db/compaction/BlacklistingCompactionsTest.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc7a69b6/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java b/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java
index 2b6a62a..c482116 100644
--- a/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java
@@ -48,6 +48,8 @@ public class BlacklistingCompactionsTest
{
private static final String KEYSPACE1 = "BlacklistingCompactionsTest";
private static final String CF_STANDARD1 = "Standard1";
+ // seed hardcoded to one we know works:
+ private static final Random random = new Random(1);
@After
public void leakDetect() throws InterruptedException
@@ -142,7 +144,7 @@ public class BlacklistingCompactionsTest
raf = new RandomAccessFile(sstable.getFilename(), "rw");
assertNotNull(raf);
assertTrue(raf.length() > 20);
- raf.seek(new Random().nextInt((int)(raf.length() - 20)));
+ raf.seek(random.nextInt((int)(raf.length() - 20)));
// We want to write something large enough that the corruption cannot get undetected
// (even without compression)
byte[] corruption = new byte[20];
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[03/10] cassandra git commit: Fix flaky BlacklistingCompactionsTest
Posted by ma...@apache.org.
Fix flaky BlacklistingCompactionsTest
Patch by marcuse; reviewed by Jay Zhuang for CASSANDRA-14238
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fc7a69b6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fc7a69b6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fc7a69b6
Branch: refs/heads/cassandra-3.11
Commit: fc7a69b65399597a2bf9c6025f035f8fe26724c7
Parents: 81b6c9e
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu May 31 16:27:46 2018 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Thu Jun 7 08:35:42 2018 -0700
----------------------------------------------------------------------
.../cassandra/db/compaction/BlacklistingCompactionsTest.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc7a69b6/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java b/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java
index 2b6a62a..c482116 100644
--- a/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java
@@ -48,6 +48,8 @@ public class BlacklistingCompactionsTest
{
private static final String KEYSPACE1 = "BlacklistingCompactionsTest";
private static final String CF_STANDARD1 = "Standard1";
+ // seed hardcoded to one we know works:
+ private static final Random random = new Random(1);
@After
public void leakDetect() throws InterruptedException
@@ -142,7 +144,7 @@ public class BlacklistingCompactionsTest
raf = new RandomAccessFile(sstable.getFilename(), "rw");
assertNotNull(raf);
assertTrue(raf.length() > 20);
- raf.seek(new Random().nextInt((int)(raf.length() - 20)));
+ raf.seek(random.nextInt((int)(raf.length() - 20)));
// We want to write something large enough that the corruption cannot get undetected
// (even without compression)
byte[] corruption = new byte[20];
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[08/10] 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/b1748198
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b1748198
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b1748198
Branch: refs/heads/cassandra-3.11
Commit: b1748198eb278f9965da0196317803e8e3eda7a7
Parents: 7bb88de cce9ab2
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Jun 7 08:40:10 2018 -0700
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Thu Jun 7 08:40:10 2018 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[09/10] 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/b1748198
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b1748198
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b1748198
Branch: refs/heads/trunk
Commit: b1748198eb278f9965da0196317803e8e3eda7a7
Parents: 7bb88de cce9ab2
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Jun 7 08:40:10 2018 -0700
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Thu Jun 7 08:40:10 2018 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org