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 2014/09/13 17:28:25 UTC
[1/2] git commit: Dont try to set repairedAt on old sstables
Repository: cassandra
Updated Branches:
refs/heads/trunk e5d1528e5 -> 5fc486a1c
Dont try to set repairedAt on old sstables
Patch by marcuse; reviewed by jbellis for CASSANDRA-7913
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/25eb8309
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/25eb8309
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/25eb8309
Branch: refs/heads/trunk
Commit: 25eb83091e03bb3ca9393fdec220727ac3e340ab
Parents: f168fda
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Sep 11 16:28:39 2014 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Sat Sep 13 17:27:32 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/tools/SSTableRepairedAtSetter.java | 15 +++++++++++----
2 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/25eb8309/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 7030570..fdf6fbe 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.1
+ * Don't try to set repairedAt on old sstables (CASSANDRA-7913)
* Add metrics for tracking PreparedStatement use (CASSANDRA-7719)
* (cqlsh) tab-completion for triggers (CASSANDRA-7824)
* (cqlsh) Support for query paging (CASSANDRA-7514)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/25eb8309/src/java/org/apache/cassandra/tools/SSTableRepairedAtSetter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/SSTableRepairedAtSetter.java b/src/java/org/apache/cassandra/tools/SSTableRepairedAtSetter.java
index 623e71b..4dec32c 100644
--- a/src/java/org/apache/cassandra/tools/SSTableRepairedAtSetter.java
+++ b/src/java/org/apache/cassandra/tools/SSTableRepairedAtSetter.java
@@ -78,14 +78,21 @@ public class SSTableRepairedAtSetter
String fname = args[2];
Descriptor descriptor = Descriptor.fromFilename(fname);
- if (setIsRepaired)
+ if (descriptor.version.hasRepairedAt)
{
- FileTime f = Files.getLastModifiedTime(new File(descriptor.filenameFor(Component.DATA)).toPath());
- descriptor.getMetadataSerializer().mutateRepairedAt(descriptor, f.toMillis());
+ if (setIsRepaired)
+ {
+ FileTime f = Files.getLastModifiedTime(new File(descriptor.filenameFor(Component.DATA)).toPath());
+ descriptor.getMetadataSerializer().mutateRepairedAt(descriptor, f.toMillis());
+ }
+ else
+ {
+ descriptor.getMetadataSerializer().mutateRepairedAt(descriptor, ActiveRepairService.UNREPAIRED_SSTABLE);
+ }
}
else
{
- descriptor.getMetadataSerializer().mutateRepairedAt(descriptor, ActiveRepairService.UNREPAIRED_SSTABLE);
+ out.println("SSTable "+fname+" does not have repaired property, run upgradesstables");
}
}
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by ma...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5fc486a1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5fc486a1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5fc486a1
Branch: refs/heads/trunk
Commit: 5fc486a1c6a05ba16953c66a17f01ea5bad978e5
Parents: e5d1528 25eb830
Author: Marcus Eriksson <ma...@apache.org>
Authored: Sat Sep 13 17:27:53 2014 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Sat Sep 13 17:27:53 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/tools/SSTableRepairedAtSetter.java | 15 +++++++++++----
2 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fc486a1/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a05b91b,fdf6fbe..ec32ee6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,5 +1,26 @@@
+3.0
+ * Support Java source code for user-defined functions (CASSANDRA-7562)
+ * Require arg types to disambiguate UDF drops (CASSANDRA-7812)
+ * Do anticompaction in groups (CASSANDRA-6851)
+ * Verify that UDF class methods are static (CASSANDRA-7781)
+ * Support pure user-defined functions (CASSANDRA-7395, 7740)
+ * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
+ * Move sstable RandomAccessReader to nio2, which allows using the
+ FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
+ * Remove CQL2 (CASSANDRA-5918)
+ * Add Thrift get_multi_slice call (CASSANDRA-6757)
+ * Optimize fetching multiple cells by name (CASSANDRA-6933)
+ * Allow compilation in java 8 (CASSANDRA-7028)
+ * Make incremental repair default (CASSANDRA-7250)
+ * Enable code coverage thru JaCoCo (CASSANDRA-7226)
+ * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369)
+ * Shorten SSTable path (CASSANDRA-6962)
+ * Use unsafe mutations for most unit tests (CASSANDRA-6969)
+ * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
+
+
2.1.1
+ * Don't try to set repairedAt on old sstables (CASSANDRA-7913)
* Add metrics for tracking PreparedStatement use (CASSANDRA-7719)
* (cqlsh) tab-completion for triggers (CASSANDRA-7824)
* (cqlsh) Support for query paging (CASSANDRA-7514)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fc486a1/src/java/org/apache/cassandra/tools/SSTableRepairedAtSetter.java
----------------------------------------------------------------------