You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2016/01/15 16:07:54 UTC
[1/6] cassandra git commit: Remove checksum files after replaying
hints
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 7aa4dc525 -> a02997696
refs/heads/cassandra-3.3 d78192322 -> 597729d9d
refs/heads/trunk 428806165 -> 0c82f977a
Remove checksum files after replaying hints
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-10947
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a0299769
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a0299769
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a0299769
Branch: refs/heads/cassandra-3.0
Commit: a029976965984cf6e6bb3fab5e6eab78e3942cc3
Parents: 7aa4dc5
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu Jan 14 15:27:49 2016 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Jan 15 15:05:13 2016 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/hints/HintsDispatchExecutor.java | 3 +--
src/java/org/apache/cassandra/hints/HintsStore.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0299769/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index a088cfe..478fe08 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.3
+ * Remove checksum files after replaying hints (CASSANDRA-10947)
* Support passing base table metadata to custom 2i validation (CASSANDRA-10924)
* Ensure stale index entries are purged during reads (CASSANDRA-11013)
* Fix AssertionError when removing from list using UPDATE (CASSANDRA-10954)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0299769/src/java/org/apache/cassandra/hints/HintsDispatchExecutor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hints/HintsDispatchExecutor.java b/src/java/org/apache/cassandra/hints/HintsDispatchExecutor.java
index 1dadf20..7782d5d 100644
--- a/src/java/org/apache/cassandra/hints/HintsDispatchExecutor.java
+++ b/src/java/org/apache/cassandra/hints/HintsDispatchExecutor.java
@@ -246,8 +246,7 @@ final class HintsDispatchExecutor
if (dispatcher.dispatch())
{
- if (!file.delete())
- logger.error("Failed to delete hints file {}", descriptor.fileName());
+ store.delete(descriptor);
store.cleanUp(descriptor);
logger.info("Finished hinted handoff of file {} to endpoint {}", descriptor.fileName(), hostId);
return true;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0299769/src/java/org/apache/cassandra/hints/HintsStore.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hints/HintsStore.java b/src/java/org/apache/cassandra/hints/HintsStore.java
index 0fe582f..c066331 100644
--- a/src/java/org/apache/cassandra/hints/HintsStore.java
+++ b/src/java/org/apache/cassandra/hints/HintsStore.java
@@ -119,7 +119,7 @@ final class HintsStore
}
}
- private void delete(HintsDescriptor descriptor)
+ void delete(HintsDescriptor descriptor)
{
File hintsFile = new File(hintsDirectory, descriptor.fileName());
if (hintsFile.delete())
[6/6] cassandra git commit: Merge branch 'cassandra-3.3' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-3.3' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0c82f977
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0c82f977
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0c82f977
Branch: refs/heads/trunk
Commit: 0c82f977a4e352b7a263badc9cb8a5889d6fff5b
Parents: 4288061 597729d
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Fri Jan 15 15:07:23 2016 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Jan 15 15:07:23 2016 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/hints/HintsDispatchExecutor.java | 3 +--
src/java/org/apache/cassandra/hints/HintsStore.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0c82f977/CHANGES.txt
----------------------------------------------------------------------
[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.3
Posted by al...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.3
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/597729d9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/597729d9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/597729d9
Branch: refs/heads/cassandra-3.3
Commit: 597729d9d7ac6ac5f278dbb01b71e0ce977edd4f
Parents: d781923 a029976
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Fri Jan 15 15:06:51 2016 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Jan 15 15:06:51 2016 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/hints/HintsDispatchExecutor.java | 3 +--
src/java/org/apache/cassandra/hints/HintsStore.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/597729d9/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 950aaaf,478fe08..c7a5c23
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,7 +1,11 @@@
-3.0.3
+3.3
+ * Avoid bootstrap hanging when existing nodes have no data to stream (CASSANDRA-11010)
+Merged from 3.0:
+ * Remove checksum files after replaying hints (CASSANDRA-10947)
* Support passing base table metadata to custom 2i validation (CASSANDRA-10924)
* Ensure stale index entries are purged during reads (CASSANDRA-11013)
+ * (cqlsh) Also apply --connect-timeout to control connection
+ timeout (CASSANDRA-10959)
* Fix AssertionError when removing from list using UPDATE (CASSANDRA-10954)
* Fix UnsupportedOperationException when reading old sstable with range
tombstone (CASSANDRA-10743)
[3/6] cassandra git commit: Remove checksum files after replaying
hints
Posted by al...@apache.org.
Remove checksum files after replaying hints
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-10947
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a0299769
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a0299769
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a0299769
Branch: refs/heads/trunk
Commit: a029976965984cf6e6bb3fab5e6eab78e3942cc3
Parents: 7aa4dc5
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu Jan 14 15:27:49 2016 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Jan 15 15:05:13 2016 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/hints/HintsDispatchExecutor.java | 3 +--
src/java/org/apache/cassandra/hints/HintsStore.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0299769/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index a088cfe..478fe08 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.3
+ * Remove checksum files after replaying hints (CASSANDRA-10947)
* Support passing base table metadata to custom 2i validation (CASSANDRA-10924)
* Ensure stale index entries are purged during reads (CASSANDRA-11013)
* Fix AssertionError when removing from list using UPDATE (CASSANDRA-10954)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0299769/src/java/org/apache/cassandra/hints/HintsDispatchExecutor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hints/HintsDispatchExecutor.java b/src/java/org/apache/cassandra/hints/HintsDispatchExecutor.java
index 1dadf20..7782d5d 100644
--- a/src/java/org/apache/cassandra/hints/HintsDispatchExecutor.java
+++ b/src/java/org/apache/cassandra/hints/HintsDispatchExecutor.java
@@ -246,8 +246,7 @@ final class HintsDispatchExecutor
if (dispatcher.dispatch())
{
- if (!file.delete())
- logger.error("Failed to delete hints file {}", descriptor.fileName());
+ store.delete(descriptor);
store.cleanUp(descriptor);
logger.info("Finished hinted handoff of file {} to endpoint {}", descriptor.fileName(), hostId);
return true;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0299769/src/java/org/apache/cassandra/hints/HintsStore.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hints/HintsStore.java b/src/java/org/apache/cassandra/hints/HintsStore.java
index 0fe582f..c066331 100644
--- a/src/java/org/apache/cassandra/hints/HintsStore.java
+++ b/src/java/org/apache/cassandra/hints/HintsStore.java
@@ -119,7 +119,7 @@ final class HintsStore
}
}
- private void delete(HintsDescriptor descriptor)
+ void delete(HintsDescriptor descriptor)
{
File hintsFile = new File(hintsDirectory, descriptor.fileName());
if (hintsFile.delete())
[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.3
Posted by al...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.3
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/597729d9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/597729d9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/597729d9
Branch: refs/heads/trunk
Commit: 597729d9d7ac6ac5f278dbb01b71e0ce977edd4f
Parents: d781923 a029976
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Fri Jan 15 15:06:51 2016 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Jan 15 15:06:51 2016 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/hints/HintsDispatchExecutor.java | 3 +--
src/java/org/apache/cassandra/hints/HintsStore.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/597729d9/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 950aaaf,478fe08..c7a5c23
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,7 +1,11 @@@
-3.0.3
+3.3
+ * Avoid bootstrap hanging when existing nodes have no data to stream (CASSANDRA-11010)
+Merged from 3.0:
+ * Remove checksum files after replaying hints (CASSANDRA-10947)
* Support passing base table metadata to custom 2i validation (CASSANDRA-10924)
* Ensure stale index entries are purged during reads (CASSANDRA-11013)
+ * (cqlsh) Also apply --connect-timeout to control connection
+ timeout (CASSANDRA-10959)
* Fix AssertionError when removing from list using UPDATE (CASSANDRA-10954)
* Fix UnsupportedOperationException when reading old sstable with range
tombstone (CASSANDRA-10743)
[2/6] cassandra git commit: Remove checksum files after replaying
hints
Posted by al...@apache.org.
Remove checksum files after replaying hints
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-10947
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a0299769
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a0299769
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a0299769
Branch: refs/heads/cassandra-3.3
Commit: a029976965984cf6e6bb3fab5e6eab78e3942cc3
Parents: 7aa4dc5
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu Jan 14 15:27:49 2016 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Jan 15 15:05:13 2016 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/hints/HintsDispatchExecutor.java | 3 +--
src/java/org/apache/cassandra/hints/HintsStore.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0299769/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index a088cfe..478fe08 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.3
+ * Remove checksum files after replaying hints (CASSANDRA-10947)
* Support passing base table metadata to custom 2i validation (CASSANDRA-10924)
* Ensure stale index entries are purged during reads (CASSANDRA-11013)
* Fix AssertionError when removing from list using UPDATE (CASSANDRA-10954)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0299769/src/java/org/apache/cassandra/hints/HintsDispatchExecutor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hints/HintsDispatchExecutor.java b/src/java/org/apache/cassandra/hints/HintsDispatchExecutor.java
index 1dadf20..7782d5d 100644
--- a/src/java/org/apache/cassandra/hints/HintsDispatchExecutor.java
+++ b/src/java/org/apache/cassandra/hints/HintsDispatchExecutor.java
@@ -246,8 +246,7 @@ final class HintsDispatchExecutor
if (dispatcher.dispatch())
{
- if (!file.delete())
- logger.error("Failed to delete hints file {}", descriptor.fileName());
+ store.delete(descriptor);
store.cleanUp(descriptor);
logger.info("Finished hinted handoff of file {} to endpoint {}", descriptor.fileName(), hostId);
return true;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0299769/src/java/org/apache/cassandra/hints/HintsStore.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hints/HintsStore.java b/src/java/org/apache/cassandra/hints/HintsStore.java
index 0fe582f..c066331 100644
--- a/src/java/org/apache/cassandra/hints/HintsStore.java
+++ b/src/java/org/apache/cassandra/hints/HintsStore.java
@@ -119,7 +119,7 @@ final class HintsStore
}
}
- private void delete(HintsDescriptor descriptor)
+ void delete(HintsDescriptor descriptor)
{
File hintsFile = new File(hintsDirectory, descriptor.fileName());
if (hintsFile.delete())