You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jj...@apache.org on 2017/04/18 20:28:24 UTC
[1/6] cassandra git commit: Handling partially written hint files
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 71d4f66d7 -> 3110d27dd
refs/heads/cassandra-3.11 be49029c1 -> 65c1fddbc
refs/heads/trunk 8f5f54fb1 -> e52420624
Handling partially written hint files
Patch by Garvit Juniwal; Reviewed by Aleksey Yeschenko for CASSANDRA-12728
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3110d27d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3110d27d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3110d27d
Branch: refs/heads/cassandra-3.0
Commit: 3110d27dde2d518297e118c2f1f6b6bccfed7899
Parents: 71d4f66
Author: Jeff Jirsa <je...@jeffjirsa.net>
Authored: Tue Apr 4 11:31:29 2017 -0700
Committer: Jeff Jirsa <je...@jeffjirsa.net>
Committed: Tue Apr 18 13:25:54 2017 -0700
----------------------------------------------------------------------
CHANGES.txt | 2 +-
src/java/org/apache/cassandra/hints/HintsReader.java | 11 +++++++++++
2 files changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3110d27d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e46abcd..918c46b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
3.0.14
- *
+ * Handling partially written hint files (CASSANDRA-12728)
3.0.13
* Make reading of range tombstones more reliable (CASSANDRA-12811)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3110d27d/src/java/org/apache/cassandra/hints/HintsReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hints/HintsReader.java b/src/java/org/apache/cassandra/hints/HintsReader.java
index d88c4f5..8104051 100644
--- a/src/java/org/apache/cassandra/hints/HintsReader.java
+++ b/src/java/org/apache/cassandra/hints/HintsReader.java
@@ -17,6 +17,7 @@
*/
package org.apache.cassandra.hints;
+import java.io.EOFException;
import java.io.File;
import java.io.IOException;
import java.nio.ByteBuffer;
@@ -188,6 +189,11 @@ class HintsReader implements AutoCloseable, Iterable<HintsReader.Page>
{
hint = computeNextInternal();
}
+ catch (EOFException e)
+ {
+ logger.warn("Unexpected EOF replaying hints ({}), likely due to unflushed hint file on shutdown; continuing", descriptor.fileName(), e);
+ return endOfData();
+ }
catch (IOException e)
{
throw new FSReadError(e, file);
@@ -280,6 +286,11 @@ class HintsReader implements AutoCloseable, Iterable<HintsReader.Page>
{
buffer = computeNextInternal();
}
+ catch (EOFException e)
+ {
+ logger.warn("Unexpected EOF replaying hints ({}), likely due to unflushed hint file on shutdown; continuing", descriptor.fileName(), e);
+ return endOfData();
+ }
catch (IOException e)
{
throw new FSReadError(e, file);
[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by jj...@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/65c1fddb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/65c1fddb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/65c1fddb
Branch: refs/heads/trunk
Commit: 65c1fddbcc2d7fff6f069c996306e04b6697f737
Parents: be49029 3110d27
Author: Jeff Jirsa <je...@jeffjirsa.net>
Authored: Tue Apr 18 13:26:07 2017 -0700
Committer: Jeff Jirsa <je...@jeffjirsa.net>
Committed: Tue Apr 18 13:26:28 2017 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/hints/HintsReader.java | 11 +++++++++++
2 files changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/65c1fddb/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 5516bbd,918c46b..19d8162
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,31 -1,7 +1,32 @@@
-3.0.14
- * Handling partially written hint files (CASSANDRA-12728)
-
-3.0.13
+3.11.0
+ * V5 protocol flags decoding broken (CASSANDRA-13443)
+ * Use write lock not read lock for removing sstables from compaction strategies. (CASSANDRA-13422)
+ * Use corePoolSize equal to maxPoolSize in JMXEnabledThreadPoolExecutors (CASSANDRA-13329)
+ * Avoid rebuilding SASI indexes containing no values (CASSANDRA-12962)
+ * Add charset to Analyser input stream (CASSANDRA-13151)
+ * Fix testLimitSSTables flake caused by concurrent flush (CASSANDRA-12820)
+ * cdc column addition strikes again (CASSANDRA-13382)
+ * Fix static column indexes (CASSANDRA-13277)
+ * DataOutputBuffer.asNewBuffer broken (CASSANDRA-13298)
+ * unittest CipherFactoryTest failed on MacOS (CASSANDRA-13370)
+ * Forbid SELECT restrictions and CREATE INDEX over non-frozen UDT columns (CASSANDRA-13247)
+ * Default logging we ship will incorrectly print "?:?" for "%F:%L" pattern (CASSANDRA-13317)
+ * Possible AssertionError in UnfilteredRowIteratorWithLowerBound (CASSANDRA-13366)
+ * Support unaligned memory access for AArch64 (CASSANDRA-13326)
+ * Improve SASI range iterator efficiency on intersection with an empty range (CASSANDRA-12915).
+ * Fix equality comparisons of columns using the duration type (CASSANDRA-13174)
+ * Obfuscate password in stress-graphs (CASSANDRA-12233)
+ * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034)
+ * nodetool stopdaemon errors out (CASSANDRA-13030)
+ * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954)
+ * Fix primary index calculation for SASI (CASSANDRA-12910)
+ * More fixes to the TokenAllocator (CASSANDRA-12990)
+ * NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983)
+ * Address message coalescing regression (CASSANDRA-12676)
+ * Delete illegal character from StandardTokenizerImpl.jflex (CASSANDRA-13417)
+Merged from 3.0:
++ * Handling partially written hint files (CASSANDRA-12728)
+ * Fix NPE issue in StorageService (CASSANDRA-13060)
* Make reading of range tombstones more reliable (CASSANDRA-12811)
* Fix startup problems due to schema tables not completely flushed (CASSANDRA-12213)
* Fix view builder bug that can filter out data on restart (CASSANDRA-13405)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/65c1fddb/src/java/org/apache/cassandra/hints/HintsReader.java
----------------------------------------------------------------------
[2/6] cassandra git commit: Handling partially written hint files
Posted by jj...@apache.org.
Handling partially written hint files
Patch by Garvit Juniwal; Reviewed by Aleksey Yeschenko for CASSANDRA-12728
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3110d27d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3110d27d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3110d27d
Branch: refs/heads/cassandra-3.11
Commit: 3110d27dde2d518297e118c2f1f6b6bccfed7899
Parents: 71d4f66
Author: Jeff Jirsa <je...@jeffjirsa.net>
Authored: Tue Apr 4 11:31:29 2017 -0700
Committer: Jeff Jirsa <je...@jeffjirsa.net>
Committed: Tue Apr 18 13:25:54 2017 -0700
----------------------------------------------------------------------
CHANGES.txt | 2 +-
src/java/org/apache/cassandra/hints/HintsReader.java | 11 +++++++++++
2 files changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3110d27d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e46abcd..918c46b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
3.0.14
- *
+ * Handling partially written hint files (CASSANDRA-12728)
3.0.13
* Make reading of range tombstones more reliable (CASSANDRA-12811)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3110d27d/src/java/org/apache/cassandra/hints/HintsReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hints/HintsReader.java b/src/java/org/apache/cassandra/hints/HintsReader.java
index d88c4f5..8104051 100644
--- a/src/java/org/apache/cassandra/hints/HintsReader.java
+++ b/src/java/org/apache/cassandra/hints/HintsReader.java
@@ -17,6 +17,7 @@
*/
package org.apache.cassandra.hints;
+import java.io.EOFException;
import java.io.File;
import java.io.IOException;
import java.nio.ByteBuffer;
@@ -188,6 +189,11 @@ class HintsReader implements AutoCloseable, Iterable<HintsReader.Page>
{
hint = computeNextInternal();
}
+ catch (EOFException e)
+ {
+ logger.warn("Unexpected EOF replaying hints ({}), likely due to unflushed hint file on shutdown; continuing", descriptor.fileName(), e);
+ return endOfData();
+ }
catch (IOException e)
{
throw new FSReadError(e, file);
@@ -280,6 +286,11 @@ class HintsReader implements AutoCloseable, Iterable<HintsReader.Page>
{
buffer = computeNextInternal();
}
+ catch (EOFException e)
+ {
+ logger.warn("Unexpected EOF replaying hints ({}), likely due to unflushed hint file on shutdown; continuing", descriptor.fileName(), e);
+ return endOfData();
+ }
catch (IOException e)
{
throw new FSReadError(e, file);
[3/6] cassandra git commit: Handling partially written hint files
Posted by jj...@apache.org.
Handling partially written hint files
Patch by Garvit Juniwal; Reviewed by Aleksey Yeschenko for CASSANDRA-12728
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3110d27d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3110d27d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3110d27d
Branch: refs/heads/trunk
Commit: 3110d27dde2d518297e118c2f1f6b6bccfed7899
Parents: 71d4f66
Author: Jeff Jirsa <je...@jeffjirsa.net>
Authored: Tue Apr 4 11:31:29 2017 -0700
Committer: Jeff Jirsa <je...@jeffjirsa.net>
Committed: Tue Apr 18 13:25:54 2017 -0700
----------------------------------------------------------------------
CHANGES.txt | 2 +-
src/java/org/apache/cassandra/hints/HintsReader.java | 11 +++++++++++
2 files changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3110d27d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e46abcd..918c46b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
3.0.14
- *
+ * Handling partially written hint files (CASSANDRA-12728)
3.0.13
* Make reading of range tombstones more reliable (CASSANDRA-12811)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3110d27d/src/java/org/apache/cassandra/hints/HintsReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hints/HintsReader.java b/src/java/org/apache/cassandra/hints/HintsReader.java
index d88c4f5..8104051 100644
--- a/src/java/org/apache/cassandra/hints/HintsReader.java
+++ b/src/java/org/apache/cassandra/hints/HintsReader.java
@@ -17,6 +17,7 @@
*/
package org.apache.cassandra.hints;
+import java.io.EOFException;
import java.io.File;
import java.io.IOException;
import java.nio.ByteBuffer;
@@ -188,6 +189,11 @@ class HintsReader implements AutoCloseable, Iterable<HintsReader.Page>
{
hint = computeNextInternal();
}
+ catch (EOFException e)
+ {
+ logger.warn("Unexpected EOF replaying hints ({}), likely due to unflushed hint file on shutdown; continuing", descriptor.fileName(), e);
+ return endOfData();
+ }
catch (IOException e)
{
throw new FSReadError(e, file);
@@ -280,6 +286,11 @@ class HintsReader implements AutoCloseable, Iterable<HintsReader.Page>
{
buffer = computeNextInternal();
}
+ catch (EOFException e)
+ {
+ logger.warn("Unexpected EOF replaying hints ({}), likely due to unflushed hint file on shutdown; continuing", descriptor.fileName(), e);
+ return endOfData();
+ }
catch (IOException e)
{
throw new FSReadError(e, file);
[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by jj...@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/65c1fddb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/65c1fddb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/65c1fddb
Branch: refs/heads/cassandra-3.11
Commit: 65c1fddbcc2d7fff6f069c996306e04b6697f737
Parents: be49029 3110d27
Author: Jeff Jirsa <je...@jeffjirsa.net>
Authored: Tue Apr 18 13:26:07 2017 -0700
Committer: Jeff Jirsa <je...@jeffjirsa.net>
Committed: Tue Apr 18 13:26:28 2017 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/hints/HintsReader.java | 11 +++++++++++
2 files changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/65c1fddb/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 5516bbd,918c46b..19d8162
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,31 -1,7 +1,32 @@@
-3.0.14
- * Handling partially written hint files (CASSANDRA-12728)
-
-3.0.13
+3.11.0
+ * V5 protocol flags decoding broken (CASSANDRA-13443)
+ * Use write lock not read lock for removing sstables from compaction strategies. (CASSANDRA-13422)
+ * Use corePoolSize equal to maxPoolSize in JMXEnabledThreadPoolExecutors (CASSANDRA-13329)
+ * Avoid rebuilding SASI indexes containing no values (CASSANDRA-12962)
+ * Add charset to Analyser input stream (CASSANDRA-13151)
+ * Fix testLimitSSTables flake caused by concurrent flush (CASSANDRA-12820)
+ * cdc column addition strikes again (CASSANDRA-13382)
+ * Fix static column indexes (CASSANDRA-13277)
+ * DataOutputBuffer.asNewBuffer broken (CASSANDRA-13298)
+ * unittest CipherFactoryTest failed on MacOS (CASSANDRA-13370)
+ * Forbid SELECT restrictions and CREATE INDEX over non-frozen UDT columns (CASSANDRA-13247)
+ * Default logging we ship will incorrectly print "?:?" for "%F:%L" pattern (CASSANDRA-13317)
+ * Possible AssertionError in UnfilteredRowIteratorWithLowerBound (CASSANDRA-13366)
+ * Support unaligned memory access for AArch64 (CASSANDRA-13326)
+ * Improve SASI range iterator efficiency on intersection with an empty range (CASSANDRA-12915).
+ * Fix equality comparisons of columns using the duration type (CASSANDRA-13174)
+ * Obfuscate password in stress-graphs (CASSANDRA-12233)
+ * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034)
+ * nodetool stopdaemon errors out (CASSANDRA-13030)
+ * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954)
+ * Fix primary index calculation for SASI (CASSANDRA-12910)
+ * More fixes to the TokenAllocator (CASSANDRA-12990)
+ * NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983)
+ * Address message coalescing regression (CASSANDRA-12676)
+ * Delete illegal character from StandardTokenizerImpl.jflex (CASSANDRA-13417)
+Merged from 3.0:
++ * Handling partially written hint files (CASSANDRA-12728)
+ * Fix NPE issue in StorageService (CASSANDRA-13060)
* Make reading of range tombstones more reliable (CASSANDRA-12811)
* Fix startup problems due to schema tables not completely flushed (CASSANDRA-12213)
* Fix view builder bug that can filter out data on restart (CASSANDRA-13405)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/65c1fddb/src/java/org/apache/cassandra/hints/HintsReader.java
----------------------------------------------------------------------
[6/6] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Posted by jj...@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/e5242062
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e5242062
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e5242062
Branch: refs/heads/trunk
Commit: e524206246bca48fe94064c8dd8f804fd81d77c0
Parents: 8f5f54f 65c1fdd
Author: Jeff Jirsa <je...@jeffjirsa.net>
Authored: Tue Apr 18 13:26:39 2017 -0700
Committer: Jeff Jirsa <je...@jeffjirsa.net>
Committed: Tue Apr 18 13:27:15 2017 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/hints/HintsReader.java | 11 +++++++++++
2 files changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5242062/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5242062/src/java/org/apache/cassandra/hints/HintsReader.java
----------------------------------------------------------------------