You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ca...@apache.org on 2016/02/03 15:46:15 UTC
[1/6] cassandra git commit: ninja-fix propagate usage
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 5f1e4bcad -> b9bdd9ec6
refs/heads/cassandra-3.3 de24ee94f -> 5669c6967
refs/heads/trunk 940ae5168 -> c164e51e7
ninja-fix propagate usage
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b9bdd9ec
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b9bdd9ec
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b9bdd9ec
Branch: refs/heads/cassandra-3.0
Commit: b9bdd9ec648ad42d88b1377fe0e1e4ff3d162a91
Parents: 5f1e4bc
Author: Carl Yeksigian <ca...@apache.org>
Authored: Wed Feb 3 09:42:18 2016 -0500
Committer: Carl Yeksigian <ca...@apache.org>
Committed: Wed Feb 3 09:42:18 2016 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/Mutation.java | 2 +-
src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java | 2 +-
src/java/org/apache/cassandra/service/paxos/PaxosState.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9bdd9ec/src/java/org/apache/cassandra/db/Mutation.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/Mutation.java b/src/java/org/apache/cassandra/db/Mutation.java
index 9a26456..c6ad9b8 100644
--- a/src/java/org/apache/cassandra/db/Mutation.java
+++ b/src/java/org/apache/cassandra/db/Mutation.java
@@ -218,7 +218,7 @@ public class Mutation implements IMutation
}
catch (ExecutionException e)
{
- Throwables.propagate(e.getCause());
+ throw Throwables.propagate(e.getCause());
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9bdd9ec/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
index 33750f8..7169b2f 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
@@ -611,7 +611,7 @@ public class CommitLogReplayer
}
catch (ExecutionException e)
{
- Throwables.propagate(e.getCause());
+ throw Throwables.propagate(e.getCause());
}
keyspacesRecovered.add(keyspace);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9bdd9ec/src/java/org/apache/cassandra/service/paxos/PaxosState.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/paxos/PaxosState.java b/src/java/org/apache/cassandra/service/paxos/PaxosState.java
index d4fed51..0b3af8f 100644
--- a/src/java/org/apache/cassandra/service/paxos/PaxosState.java
+++ b/src/java/org/apache/cassandra/service/paxos/PaxosState.java
@@ -146,7 +146,7 @@ public class PaxosState
}
catch (ExecutionException e)
{
- Throwables.propagate(e.getCause());
+ throw Throwables.propagate(e.getCause());
}
}
else
[3/6] cassandra git commit: ninja-fix propagate usage
Posted by ca...@apache.org.
ninja-fix propagate usage
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b9bdd9ec
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b9bdd9ec
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b9bdd9ec
Branch: refs/heads/trunk
Commit: b9bdd9ec648ad42d88b1377fe0e1e4ff3d162a91
Parents: 5f1e4bc
Author: Carl Yeksigian <ca...@apache.org>
Authored: Wed Feb 3 09:42:18 2016 -0500
Committer: Carl Yeksigian <ca...@apache.org>
Committed: Wed Feb 3 09:42:18 2016 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/Mutation.java | 2 +-
src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java | 2 +-
src/java/org/apache/cassandra/service/paxos/PaxosState.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9bdd9ec/src/java/org/apache/cassandra/db/Mutation.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/Mutation.java b/src/java/org/apache/cassandra/db/Mutation.java
index 9a26456..c6ad9b8 100644
--- a/src/java/org/apache/cassandra/db/Mutation.java
+++ b/src/java/org/apache/cassandra/db/Mutation.java
@@ -218,7 +218,7 @@ public class Mutation implements IMutation
}
catch (ExecutionException e)
{
- Throwables.propagate(e.getCause());
+ throw Throwables.propagate(e.getCause());
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9bdd9ec/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
index 33750f8..7169b2f 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
@@ -611,7 +611,7 @@ public class CommitLogReplayer
}
catch (ExecutionException e)
{
- Throwables.propagate(e.getCause());
+ throw Throwables.propagate(e.getCause());
}
keyspacesRecovered.add(keyspace);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9bdd9ec/src/java/org/apache/cassandra/service/paxos/PaxosState.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/paxos/PaxosState.java b/src/java/org/apache/cassandra/service/paxos/PaxosState.java
index d4fed51..0b3af8f 100644
--- a/src/java/org/apache/cassandra/service/paxos/PaxosState.java
+++ b/src/java/org/apache/cassandra/service/paxos/PaxosState.java
@@ -146,7 +146,7 @@ public class PaxosState
}
catch (ExecutionException e)
{
- Throwables.propagate(e.getCause());
+ throw Throwables.propagate(e.getCause());
}
}
else
[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.3
Posted by ca...@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/5669c696
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5669c696
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5669c696
Branch: refs/heads/trunk
Commit: 5669c6967bbdd540f27aeebf5a2c258bc4defbe3
Parents: de24ee9 b9bdd9e
Author: Carl Yeksigian <ca...@apache.org>
Authored: Wed Feb 3 09:44:01 2016 -0500
Committer: Carl Yeksigian <ca...@apache.org>
Committed: Wed Feb 3 09:44:01 2016 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/Mutation.java | 2 +-
src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java | 2 +-
src/java/org/apache/cassandra/service/paxos/PaxosState.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5669c696/src/java/org/apache/cassandra/db/Mutation.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5669c696/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
index 985a036,7169b2f..e0518a9
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
@@@ -91,74 -85,6 +91,74 @@@ public class CommitLogReplaye
private final ReplayFilter replayFilter;
private final CommitLogArchiver archiver;
+ /*
+ * Wrapper around initiating mutations read from the log to make it possible
+ * to spy on initiated mutations for test
+ */
+ @VisibleForTesting
+ public static class MutationInitiator
+ {
+ protected Future<Integer> initiateMutation(final Mutation mutation,
+ final long segmentId,
+ final int serializedSize,
+ final long entryLocation,
+ final CommitLogReplayer clr)
+ {
+ Runnable runnable = new WrappedRunnable()
+ {
+ public void runMayThrow()
+ {
+ if (Schema.instance.getKSMetaData(mutation.getKeyspaceName()) == null)
+ return;
+ if (clr.pointInTimeExceeded(mutation))
+ return;
+
+ final Keyspace keyspace = Keyspace.open(mutation.getKeyspaceName());
+
+ // Rebuild the mutation, omitting column families that
+ // a) the user has requested that we ignore,
+ // b) have already been flushed,
+ // or c) are part of a cf that was dropped.
+ // Keep in mind that the cf.name() is suspect. do every thing based on the cfid instead.
+ Mutation newMutation = null;
+ for (PartitionUpdate update : clr.replayFilter.filter(mutation))
+ {
+ if (Schema.instance.getCF(update.metadata().cfId) == null)
+ continue; // dropped
+
+ ReplayPosition rp = clr.cfPositions.get(update.metadata().cfId);
+
+ // replay if current segment is newer than last flushed one or,
+ // if it is the last known segment, if we are after the replay position
+ if (segmentId > rp.segment || (segmentId == rp.segment && entryLocation > rp.position))
+ {
+ if (newMutation == null)
+ newMutation = new Mutation(mutation.getKeyspaceName(), mutation.key());
+ newMutation.add(update);
+ clr.replayedCount.incrementAndGet();
+ }
+ }
+ if (newMutation != null)
+ {
+ assert !newMutation.isEmpty();
+
+ try
+ {
+ Uninterruptibles.getUninterruptibly(Keyspace.open(newMutation.getKeyspaceName()).applyFromCommitLog(newMutation));
+ }
+ catch (ExecutionException e)
+ {
- Throwables.propagate(e.getCause());
++ throw Throwables.propagate(e.getCause());
+ }
+
+ clr.keyspacesRecovered.add(keyspace);
+ }
+ }
+ };
+ return StageManager.getStage(Stage.MUTATION).submit(runnable, serializedSize);
+ }
+ }
+
CommitLogReplayer(CommitLog commitLog, ReplayPosition globalPosition, Map<UUID, ReplayPosition> cfPositions, ReplayFilter replayFilter)
{
this.keyspacesRecovered = new NonBlockingHashSet<Keyspace>();
[6/6] cassandra git commit: Merge branch 'cassandra-3.3' into trunk
Posted by ca...@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/c164e51e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c164e51e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c164e51e
Branch: refs/heads/trunk
Commit: c164e51e77b6a2ad72dac30eef39ad4e819391c9
Parents: 940ae51 5669c69
Author: Carl Yeksigian <ca...@apache.org>
Authored: Wed Feb 3 09:44:17 2016 -0500
Committer: Carl Yeksigian <ca...@apache.org>
Committed: Wed Feb 3 09:44:17 2016 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/Mutation.java | 2 +-
src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java | 2 +-
src/java/org/apache/cassandra/service/paxos/PaxosState.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c164e51e/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
----------------------------------------------------------------------
[2/6] cassandra git commit: ninja-fix propagate usage
Posted by ca...@apache.org.
ninja-fix propagate usage
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b9bdd9ec
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b9bdd9ec
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b9bdd9ec
Branch: refs/heads/cassandra-3.3
Commit: b9bdd9ec648ad42d88b1377fe0e1e4ff3d162a91
Parents: 5f1e4bc
Author: Carl Yeksigian <ca...@apache.org>
Authored: Wed Feb 3 09:42:18 2016 -0500
Committer: Carl Yeksigian <ca...@apache.org>
Committed: Wed Feb 3 09:42:18 2016 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/Mutation.java | 2 +-
src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java | 2 +-
src/java/org/apache/cassandra/service/paxos/PaxosState.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9bdd9ec/src/java/org/apache/cassandra/db/Mutation.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/Mutation.java b/src/java/org/apache/cassandra/db/Mutation.java
index 9a26456..c6ad9b8 100644
--- a/src/java/org/apache/cassandra/db/Mutation.java
+++ b/src/java/org/apache/cassandra/db/Mutation.java
@@ -218,7 +218,7 @@ public class Mutation implements IMutation
}
catch (ExecutionException e)
{
- Throwables.propagate(e.getCause());
+ throw Throwables.propagate(e.getCause());
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9bdd9ec/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
index 33750f8..7169b2f 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
@@ -611,7 +611,7 @@ public class CommitLogReplayer
}
catch (ExecutionException e)
{
- Throwables.propagate(e.getCause());
+ throw Throwables.propagate(e.getCause());
}
keyspacesRecovered.add(keyspace);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9bdd9ec/src/java/org/apache/cassandra/service/paxos/PaxosState.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/paxos/PaxosState.java b/src/java/org/apache/cassandra/service/paxos/PaxosState.java
index d4fed51..0b3af8f 100644
--- a/src/java/org/apache/cassandra/service/paxos/PaxosState.java
+++ b/src/java/org/apache/cassandra/service/paxos/PaxosState.java
@@ -146,7 +146,7 @@ public class PaxosState
}
catch (ExecutionException e)
{
- Throwables.propagate(e.getCause());
+ throw Throwables.propagate(e.getCause());
}
}
else
[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.3
Posted by ca...@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/5669c696
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5669c696
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5669c696
Branch: refs/heads/cassandra-3.3
Commit: 5669c6967bbdd540f27aeebf5a2c258bc4defbe3
Parents: de24ee9 b9bdd9e
Author: Carl Yeksigian <ca...@apache.org>
Authored: Wed Feb 3 09:44:01 2016 -0500
Committer: Carl Yeksigian <ca...@apache.org>
Committed: Wed Feb 3 09:44:01 2016 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/Mutation.java | 2 +-
src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java | 2 +-
src/java/org/apache/cassandra/service/paxos/PaxosState.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5669c696/src/java/org/apache/cassandra/db/Mutation.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5669c696/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
index 985a036,7169b2f..e0518a9
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
@@@ -91,74 -85,6 +91,74 @@@ public class CommitLogReplaye
private final ReplayFilter replayFilter;
private final CommitLogArchiver archiver;
+ /*
+ * Wrapper around initiating mutations read from the log to make it possible
+ * to spy on initiated mutations for test
+ */
+ @VisibleForTesting
+ public static class MutationInitiator
+ {
+ protected Future<Integer> initiateMutation(final Mutation mutation,
+ final long segmentId,
+ final int serializedSize,
+ final long entryLocation,
+ final CommitLogReplayer clr)
+ {
+ Runnable runnable = new WrappedRunnable()
+ {
+ public void runMayThrow()
+ {
+ if (Schema.instance.getKSMetaData(mutation.getKeyspaceName()) == null)
+ return;
+ if (clr.pointInTimeExceeded(mutation))
+ return;
+
+ final Keyspace keyspace = Keyspace.open(mutation.getKeyspaceName());
+
+ // Rebuild the mutation, omitting column families that
+ // a) the user has requested that we ignore,
+ // b) have already been flushed,
+ // or c) are part of a cf that was dropped.
+ // Keep in mind that the cf.name() is suspect. do every thing based on the cfid instead.
+ Mutation newMutation = null;
+ for (PartitionUpdate update : clr.replayFilter.filter(mutation))
+ {
+ if (Schema.instance.getCF(update.metadata().cfId) == null)
+ continue; // dropped
+
+ ReplayPosition rp = clr.cfPositions.get(update.metadata().cfId);
+
+ // replay if current segment is newer than last flushed one or,
+ // if it is the last known segment, if we are after the replay position
+ if (segmentId > rp.segment || (segmentId == rp.segment && entryLocation > rp.position))
+ {
+ if (newMutation == null)
+ newMutation = new Mutation(mutation.getKeyspaceName(), mutation.key());
+ newMutation.add(update);
+ clr.replayedCount.incrementAndGet();
+ }
+ }
+ if (newMutation != null)
+ {
+ assert !newMutation.isEmpty();
+
+ try
+ {
+ Uninterruptibles.getUninterruptibly(Keyspace.open(newMutation.getKeyspaceName()).applyFromCommitLog(newMutation));
+ }
+ catch (ExecutionException e)
+ {
- Throwables.propagate(e.getCause());
++ throw Throwables.propagate(e.getCause());
+ }
+
+ clr.keyspacesRecovered.add(keyspace);
+ }
+ }
+ };
+ return StageManager.getStage(Stage.MUTATION).submit(runnable, serializedSize);
+ }
+ }
+
CommitLogReplayer(CommitLog commitLog, ReplayPosition globalPosition, Map<UUID, ReplayPosition> cfPositions, ReplayFilter replayFilter)
{
this.keyspacesRecovered = new NonBlockingHashSet<Keyspace>();